php-blog-cvs Mailing List for Serendipity PHP Weblog System (Page 525)

A reliable, secure & extensible PHP blog | Not mainstream since 2002

Brought to you by: garvinhicking, jhermanns

php-blog-cvs — Serendipity commit list

You can subscribe to this list here.

2003	Jan	Feb	Mar (179)	Apr (56)	May (53)	Jun (65)	Jul (70)	Aug (89)	Sep (50)	Oct (38)	Nov (12)	Dec (12)
2004	Jan (57)	Feb (226)	Mar (172)	Apr (194)	May (120)	Jun (162)	Jul (297)	Aug (156)	Sep (312)	Oct (180)	Nov (358)	Dec (362)
2005	Jan (275)	Feb (224)	Mar (202)	Apr (157)	May (133)	Jun (115)	Jul (211)	Aug (257)	Sep (135)	Oct (116)	Nov (106)	Dec (81)
2006	Jan (74)	Feb (94)	Mar (59)	Apr (125)	May (50)	Jun (71)	Jul (45)	Aug (80)	Sep (3)	Oct (44)	Nov (50)	Dec (38)
2007	Jan (46)	Feb (33)	Mar (24)	Apr (28)	May (19)	Jun (37)	Jul (66)	Aug (73)	Sep (87)	Oct (33)	Nov (39)	Dec (37)
2008	Jan (20)	Feb (54)	Mar (47)	Apr (68)	May (10)	Jun (13)	Jul (13)	Aug (25)	Sep (11)	Oct (22)	Nov (22)	Dec (34)
2009	Jan (34)	Feb (35)	Mar (11)	Apr (10)	May (15)	Jun (18)	Jul (28)	Aug (22)	Sep (9)	Oct (12)	Nov (6)	Dec (32)
2010	Jan (11)	Feb (7)	Mar (9)	Apr (3)	May (16)	Jun (1)	Jul (2)	Aug (25)	Sep (9)	Oct (8)	Nov (4)	Dec (8)
2011	Jan (17)	Feb (1)	Mar (6)	Apr (7)	May (5)	Jun (2)	Jul (12)	Aug (3)	Sep (18)	Oct (3)	Nov (2)	Dec
2012	Jan (92)	Feb (74)	Mar (64)	Apr (55)	May (44)	Jun (91)	Jul (35)	Aug (42)	Sep (32)	Oct (56)	Nov (42)	Dec (81)
2013	Jan (117)	Feb (130)	Mar (33)	Apr (36)	May (155)	Jun (241)	Jul (113)	Aug (70)	Sep (50)	Oct (55)	Nov (34)	Dec (36)
2014	Jan (94)	Feb (67)	Mar (177)	Apr (67)	May (147)	Jun (137)	Jul (58)	Aug (56)	Sep (62)	Oct (35)	Nov (118)	Dec (53)
2015	Jan (204)	Feb (165)	Mar (275)	Apr (42)	May (58)	Jun (91)	Jul (81)	Aug (62)	Sep (23)	Oct (63)	Nov (29)	Dec (110)
2016	Jan (82)	Feb (55)	Mar (48)	Apr (92)	May (77)	Jun (41)	Jul (27)	Aug (41)	Sep (101)	Oct (84)	Nov (12)	Dec (18)
2017	Jan (44)	Feb (40)	Mar (23)	Apr (79)	May (27)	Jun (12)	Jul (20)	Aug (14)	Sep (3)	Oct (9)	Nov (4)	Dec (9)
2018	Jan (5)	Feb (23)	Mar (150)	Apr (114)	May (63)	Jun (25)	Jul (23)	Aug (54)	Sep (43)	Oct (10)	Nov (9)	Dec (1)
2019	Jan (1)	Feb (27)	Mar (27)	Apr (64)	May (21)	Jun (17)	Jul (12)	Aug (81)	Sep (15)	Oct (25)	Nov (15)	Dec (13)
2020	Jan (5)	Feb (4)	Mar (95)	Apr (59)	May (53)	Jun (22)	Jul (3)	Aug (13)	Sep (10)	Oct (4)	Nov (3)	Dec (1)
2021	Jan (20)	Feb (32)	Mar (34)	Apr (22)	May (58)	Jun (43)	Jul (35)	Aug (2)	Sep (14)	Oct (1)	Nov (2)	Dec
2022	Jan (2)	Feb (6)	Mar (4)	Apr	May (5)	Jun (4)	Jul (3)	Aug (5)	Sep (6)	Oct (3)	Nov (38)	Dec (15)
2023	Jan (26)	Feb (12)	Mar (3)	Apr (9)	May (2)	Jun (5)	Jul (8)	Aug	Sep (39)	Oct (11)	Nov (3)	Dec (3)
2024	Jan (19)	Feb (20)	Mar (15)	Apr (12)	May (2)	Jun (12)	Jul (4)	Aug (9)	Sep	Oct	Nov	Dec
2025	Jan (72)	Feb (80)	Mar (92)	Apr (35)	May (19)	Jun (25)	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 523 524 525 526 527 .. 552 > >> (Page 525 of 552)

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.2,1.3 serendipity_lang_en.inc.php,1.2,1.3 serendipity_lang_es.inc.php,1.2,1.3

From: <gar...@pr...> - 2004-02-02 09:40:30

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

Modified Files:
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php 
Log Message:
Detect if ErrorDocument works


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_lang_de.inc.php	29 Jan 2004 12:08:28 -0000	1.2
+++ serendipity_lang_de.inc.php	2 Feb 2004 09:38:22 -0000	1.3
@@ -321,6 +321,7 @@
 @define('PING_WEBLOGS', 'Einträge ankündigen (via XML-RPC ping) bei:');
 @define('SENDING_PING', 'Sende XML-RPC ping zu %s');
 @define('EDIT_ENTRY', 'Eintrag bearbeiten');
+@define('HTACCESS_ERROR', 'Um die Webserverkonfiguration zu testen benötigt serendipity die Möglichkeit, die Datei ".htaccess" zu erstellen. Das aufgrund von rechteproblemen nicht möglich. Bitte passen sie die Rechte wie folgt an: <br />&nbsp;&nbsp;%s<br />und laden Sie diese Seite neu.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_lang_en.inc.php	29 Jan 2004 12:08:28 -0000	1.2
+++ serendipity_lang_en.inc.php	2 Feb 2004 09:38:22 -0000	1.3
@@ -321,6 +321,7 @@
 @define('PING_WEBLOGS', 'Announce entries (via XML-RPC ping) to:');
 @define('SENDING_PING', 'Sending XML-RPC ping to host %s');
 @define('EDIT_ENTRY', 'Edit entry');
+@define('HTACCESS_ERROR', 'To check your local webserver installation, serendipity needs to be able to write the file ".htaccess". This was not possible because of permission errors. Please adjust the permissions like this: <br />&nbsp;&nbsp;%s<br />and reload this page.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_lang_es.inc.php	29 Jan 2004 12:08:28 -0000	1.2
+++ serendipity_lang_es.inc.php	2 Feb 2004 09:38:22 -0000	1.3
@@ -300,5 +300,7 @@
 @define('PREVIOUS_PAGE', 'Pagina previa');
 @define('NEXT_PAGE', 'Pagina siguiente');
 @define('ALL_CATEGORIES', 'Todas las categorías');
+@define('HTACCESS_ERROR', 'To check your local webserver installation, serendipity needs to be able to write the file ".htaccess". This was not possible because of permission errors. Please adjust the permissions like this: <br />&nbsp;&nbsp;%s<br />and reload this page.');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity NEWS,1.56,1.57 comment.php,1.27,1.28

From: <gar...@pr...> - 2004-02-02 08:41:43

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

Modified Files:
	NEWS comment.php 
Log Message:
Redirection after entering a comment


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- NEWS	31 Jan 2004 17:07:07 -0000	1.56
+++ NEWS	2 Feb 2004 08:39:40 -0000	1.57
@@ -2,7 +2,7 @@
 
 Version 0.5.1 ()
 ------------------------------------
-
+    * Redirection after a comment has been added to prevent users refreshing a page and double-submitting. (garvinhicking)
 
 Version 0.5 (January 31, 2004)
 ------------------------------------

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- comment.php	23 Jan 2004 05:50:19 -0000	1.27
+++ comment.php	2 Feb 2004 08:39:40 -0000	1.28
@@ -52,24 +52,32 @@
     }
 } else {
     $id = $serendipity['GET']['entry_id'];
+    $html_header = '';
 
     if ($serendipity['XHTML11']) {
-        echo '<?xml version="1.0" encoding="iso-8859-1" ?>' . "\n";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<?php
+        $html_header .= '<?xml version="1.0" encoding="iso-8859-1" ?>' . "\n";
+        $html_header .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">' . "\n";
     }
-?>
-<html<?php echo ($serendipity['XHTML11'] ? ' xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" dir="ltr"' : ''); ?>>
+
+    $html_header .= '<html' . ($serendipity['XHTML11'] ? ' xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" dir="ltr"' : '') . '>
 <head>
-    <title><?php echo COMMENTS; ?></title>
-    <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php?mode=comments" />
+    <title>' . COMMENTS . '</title>
+    <link rel="stylesheet" type="text/css" href="' .  $serendipity['serendipityHTTPPath'] . 'serendipity.css.php?mode=comments" />
 </head>
 <body>
+';
+    if (isset($_GET['success']) && $_GET['success'] == 'true') {
+        echo $html_header;
+        printf(
+          COMMENT_ADDED,
 
-<?php
-    if (!isset($serendipity['POST']['comment'])) {
+          '<a href="' . $_GET['url'] . '">',
+          '</a>',
+          '<a href="#" onclick="self.close()">',
+          '</a>'
+        );
+    } else if (!isset($serendipity['POST']['comment'])) {
+        echo $html_header;
         if ($serendipity['GET']['type'] == 'trackbacks') {
             $tbu = $serendipity['baseURL'] . 'comment.php?type=trackback&amp;entry_id=' . $serendipity['GET']['entry_id'];
             $query = 'SELECT title FROM ' . $serendipity['dbPrefix'] . 'entries WHERE id = ' . $serendipity['GET']['entry_id'];
@@ -115,15 +123,10 @@
         $comment['subscribe'] = $serendipity['POST']['subscribe'];
         if ( !empty($comment['comment']) ) {
             if (serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL')) {
-                printf(
-                  COMMENT_ADDED,
-
-                  '<a href="' . $_SERVER['HTTP_REFERER'] . '">',
-                  '</a>',
-                  '<a href="#" onclick="self.close()">',
-                  '</a>'
-                );
+                header('Location: ' . $serendipity['baseURL'] . 'comment.php?success=true&url=' . urlencode($_SERVER['HTTP_REFERER']));
+                exit;
             } else {
+                echo $html_header;
                 printf(
                   COMMENT_NOT_ADDED,
 
@@ -134,6 +137,7 @@
                 );
             }
         } else {
+            echo $html_header;
             printf(
               EMPTY_COMMENT,

[php-blog-cvs] serendipity serendipity_config.inc.php,1.47,1.48

From: <tom...@pr...> - 2004-01-31 17:09:25

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
0.51-CVS => 0.5.1-CVS


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- serendipity_config.inc.php	31 Jan 2004 17:03:48 -0000	1.47
+++ serendipity_config.inc.php	31 Jan 2004 17:07:41 -0000	1.48
@@ -11,7 +11,7 @@
 include_once('compat.php');
 ini_set('session.use_trans_sid', 0);
 
-$serendipity['version']    = '0.51-CVS';
+$serendipity['version']    = '0.5.1-CVS';
 $serendipity['production'] = 1;
 $serendipity['rewrite']    = 'none';

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

From: <tom...@pr...> - 2004-01-31 17:08:51

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

Modified Files:
	NEWS 
Log Message:
Yeah but let's call it 0.5.1 (atleast for now), for my sake :)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- NEWS	31 Jan 2004 17:03:48 -0000	1.55
+++ NEWS	31 Jan 2004 17:07:07 -0000	1.56
@@ -1,6 +1,6 @@
 # $Id$
 
-Version 0.51 ()
+Version 0.5.1 ()
 ------------------------------------

[php-blog-cvs] serendipity serendipity_config.inc.php,1.46,1.46.2.1

From: <gar...@pr...> - 2004-01-31 17:07:41

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

Modified Files:
      Tag: branch-0-5
	serendipity_config.inc.php 
Log Message:
set release version of branch to 0.5


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.46
retrieving revision 1.46.2.1
diff -u -d -r1.46 -r1.46.2.1
--- serendipity_config.inc.php	23 Jan 2004 05:50:20 -0000	1.46
+++ serendipity_config.inc.php	31 Jan 2004 17:05:58 -0000	1.46.2.1
@@ -11,7 +11,7 @@
 include_once('compat.php');
 ini_set('session.use_trans_sid', 0);
 
-$serendipity['version']    = '0.5-CVS';
+$serendipity['version']    = '0.5';
 $serendipity['production'] = 1;
 $serendipity['rewrite']    = 'none';

[php-blog-cvs] serendipity NEWS,1.54,1.55 serendipity_config.inc.php,1.46,1.47

From: <gar...@pr...> - 2004-01-31 17:05:31

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

Modified Files:
	NEWS serendipity_config.inc.php 
Log Message:
Bump HEAD-version to 0.51 (for Tom's sake ;)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- NEWS	31 Jan 2004 15:41:13 -0000	1.54
+++ NEWS	31 Jan 2004 17:03:48 -0000	1.55
@@ -1,5 +1,9 @@
 # $Id$
 
+Version 0.51 ()
+------------------------------------
+
+
 Version 0.5 (January 31, 2004)
 ------------------------------------
     * Fixed RSS feed to only show comments when they are associated with an entry_id (garvinhicking)

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- serendipity_config.inc.php	23 Jan 2004 05:50:20 -0000	1.46
+++ serendipity_config.inc.php	31 Jan 2004 17:03:48 -0000	1.47
@@ -11,7 +11,7 @@
 include_once('compat.php');
 ini_set('session.use_trans_sid', 0);
 
-$serendipity['version']    = '0.5-CVS';
+$serendipity['version']    = '0.51-CVS';
 $serendipity['production'] = 1;
 $serendipity['rewrite']    = 'none';

[php-blog-cvs] serendipity NEWS,1.53,1.54

From: <gar...@pr...> - 2004-01-31 15:42:58

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

Modified Files:
	NEWS 
Log Message:
Prepare release (as discussed with Jannis: We need a new release because of that htacces/mod_rewrite stuff)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- NEWS	30 Jan 2004 12:53:29 -0000	1.53
+++ NEWS	31 Jan 2004 15:41:13 -0000	1.54
@@ -1,6 +1,6 @@
 # $Id$
 
-Version 0.5 ()
+Version 0.5 (January 31, 2004)
 ------------------------------------
     * Fixed RSS feed to only show comments when they are associated with an entry_id (garvinhicking)
     * Fixed page counter to count pages depending on the entries per page, and not hardcoded 15 entries (garvinhicking)

[php-blog-cvs] serendipity serendipity_config_local.tpl,1.27,1.28 serendipity_functions.inc.php,1.189,1.190 NEWS,1.50,1.51

From: <gar...@pr...> - 2004-01-31 06:49:50

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

Modified Files:
	serendipity_config_local.tpl serendipity_functions.inc.php 
	NEWS 
Log Message:
Added Yahoo! blog to ping list

Reformat sent mail on comments. Originally the mail address of the user was
used as "From". As mailservers do not always allow sending mails from
domains we do not own, this could lead to lost mails. Now the From-Header is
filled with the mail adress of the blog, and the user mail adress is used as
"Reply-To".


Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_config_local.tpl	21 Jan 2004 18:38:36 -0000	1.27
+++ serendipity_config_local.tpl	29 Jan 2004 09:22:56 -0000	1.28
@@ -55,4 +55,5 @@
 $serendipity['announce_entries_technorati']   = '{technorati.com|announce_entries_technorati|bool|0}';    // Do you want new entries to be announced on technorati.com?
 $serendipity['announce_entries_weblogs']      = '{weblogs.com|announce_entries_weblogs|bool|0}';          // Do you want new entries to be announced on weblogs.com?
 $serendipity['announce_entries_bloggde']      = '{blogg.de|announce_entries_bloggde|bool|0}';             // Do you want new entries to be announced on blogg.de?
+$serendipity['announce_entries_yahoo']        = '{yahoo.com|announce_entries_yahoo|bool|0}';              // Do you want new entries to be announced on yahoo.com?
 ?>

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- serendipity_functions.inc.php	24 Jan 2004 19:25:59 -0000	1.189
+++ serendipity_functions.inc.php	29 Jan 2004 09:22:59 -0000	1.190
@@ -951,7 +951,7 @@
         }
 
         $name = empty($comment['author']) ? ANONYMOUS : $comment['author'];
-        $body = htmlentities($comment['body']);
+        $body = htmlentities(strip_tags($comment['body']));
 ?>
     <div class="serendipity_comment">
             <a <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="c<?php echo $comment['id']; ?>"></a>
@@ -1158,6 +1158,10 @@
 function serendipity_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment, $type = 'NORMAL') {
     global $serendipity;
 
+    if (empty($fromName)) {
+        $fromName = ANONYMOUS;
+    }
+    
     $entryURI = serendipity_archiveURL($id, $title);
 
     if ($type == 'TRACKBACK') {
@@ -1184,7 +1188,7 @@
               . "\n" . strip_tags($comment);
     }
 
-    return mail($to, $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} <$fromEmail>\r\n". $serendipity['mailheaders']);
+    return mail($to, $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} - $fromName <$to>\r\n". $serendipity['mailheaders'] . (!empty($fromEmail) ? "\r\nReply-To: $fromEmail" : ''));
 }
 
 function serendipity_fetchReferences($id)
@@ -2185,7 +2189,7 @@
                         <fieldset>
                             <legend><?php echo PING_WEBLOGS; ?></legend>
 <?php
-    $services = array('blogs' => 'blo.gs', 'blogrolling' => 'blogrolling.com', 'technorati' => 'technorati.com', 'weblogs' => 'weblogs.com', 'bloggde' => 'blogg.de');
+    $services = array('blogs' => 'blo.gs', 'blogrolling' => 'blogrolling.com', 'technorati' => 'technorati.com', 'weblogs' => 'weblogs.com', 'bloggde' => 'blogg.de', 'yahoo' => 'yahoo.com');
     foreach($services AS $service => $service_desc) {
         // Detect if the current checkbox needs to be saved. We use the field chk_timestamp to see,
         // if the form has already been submitted and individual changes shall be preserved
@@ -2599,6 +2603,13 @@
         );
     }
 
+    if ($serendipity['POST']['announce_entries_yahoo'] == 'true') {
+        $services[] = array(
+          'host' => 'api.my.yahoo.com',
+          'path' => '/RPC2'
+        );
+    }
+
     foreach ($services as $service => $details) {
         printf(SENDING_PING . '...<br />', $details['host']);
 

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- NEWS	23 Jan 2004 09:51:31 -0000	1.50
+++ NEWS	29 Jan 2004 09:23:03 -0000	1.51
@@ -2,6 +2,8 @@
 
 Version 0.5 ()
 ------------------------------------
+    * Fixed format of mail to not send invalid mails (garvinhicking)
+    * Added Yahoo! blog ping (garvinhicking)
     * Format trackbacks with link to the originating blog in comments plugin (garvinhicking)
     * The items of the comment-RSS feeds now have their GUID per comment, not per entry. This allows feedreaders to properly display updated to that feed. (garvinhicking)
     * Do not output our own trackbacks inside the comments plugin. Use anchors on the title-link to each comment. (garvinhicking)

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.1,1.2 serendipity_lang_en.inc.php,1.1,1.2 serendipity_lang_es.inc.php,1.1,1.2

From: <gar...@pr...> - 2004-01-31 03:33:29

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

Modified Files:
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php 
Log Message:
Support for Atom 0.3 feed


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_lang_de.inc.php	21 Jan 2004 18:28:25 -0000	1.1
+++ serendipity_lang_de.inc.php	29 Jan 2004 12:08:28 -0000	1.2
@@ -267,6 +267,7 @@
 @define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
 @define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
 @define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 Kommentar');
+@define('SYNDICATION_PLUGIN_ATOM03', 'ATOM 0.3 feed');
 @define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Feld "managingEditor"');
 @define('SYNDICATION_PLUGIN_WEBMASTER',  'Feld "webMaster"');
 @define('SYNDICATION_PLUGIN_BANNERURL', 'Bild für den RSS feed');

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_lang_en.inc.php	21 Jan 2004 18:28:25 -0000	1.1
+++ serendipity_lang_en.inc.php	29 Jan 2004 12:08:28 -0000	1.2
@@ -268,6 +268,7 @@
 @define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
 @define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
 @define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 comments');
+@define('SYNDICATION_PLUGIN_ATOM03', 'ATOM 0.3 feed');
 @define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Field "managingEditor"');
 @define('SYNDICATION_PLUGIN_WEBMASTER',  'Field "webMaster"');
 @define('SYNDICATION_PLUGIN_BANNERURL', 'Image for the RSS feed');

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_lang_es.inc.php	21 Jan 2004 18:28:25 -0000	1.1
+++ serendipity_lang_es.inc.php	29 Jan 2004 12:08:28 -0000	1.2
@@ -269,6 +269,7 @@
 @define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
 @define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
 @define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 comments');
+@define('SYNDICATION_PLUGIN_ATOM03', 'ATOM 0.3 feed');
 @define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Campo "managingEditor"');
 @define('SYNDICATION_PLUGIN_WEBMASTER',  'Campo "webMaster"');
 @define('SYNDICATION_PLUGIN_BANNERURL', 'Imagen para el RSS feed');

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.191,1.192

From: <gar...@pr...> - 2004-01-31 02:18:22

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Deactivate monospace font (discussed on the dev-list). We should implement
BBCode or something similar, but the current implementation does more harm
than good.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- serendipity_functions.inc.php	29 Jan 2004 12:08:28 -0000	1.191
+++ serendipity_functions.inc.php	29 Jan 2004 12:27:30 -0000	1.192
@@ -1427,9 +1427,9 @@
     //$ret = str_replace(chr(1),'\~',$ret);
 
     // monospace font
-    $ret = str_replace('\%',chr(1),$ret);
-    $ret = preg_replace_callback('/%([\S ]+?)%/', 'serendipity_format_tt', $ret);
-    $ret = str_replace(chr(1),'%',$ret);
+    //$ret = str_replace('\%',chr(1),$ret);
+    //$ret = preg_replace_callback('/%([\S ]+?)%/', 'serendipity_format_tt', $ret);
+    //$ret = str_replace(chr(1),'%',$ret);
 
     $ret = preg_replace('/\|([0-9a-fA-F]+?)\|([\S ]+?)\|/','<font color="\1">\2</font>',$ret);
     $ret = preg_replace('/\^([[:alnum:]]+?)\^/','<sup>\1</sup>',$ret);

[php-blog-cvs] serendipity NEWS,1.52,1.53 serendipity_functions.inc.php,1.192,1.193

From: <gar...@pr...> - 2004-01-31 00:20:04

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

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
Minor bugfixes: comments rss feed, page counter


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- NEWS	29 Jan 2004 12:08:28 -0000	1.52
+++ NEWS	30 Jan 2004 12:53:29 -0000	1.53
@@ -2,6 +2,8 @@
 
 Version 0.5 ()
 ------------------------------------
+    * Fixed RSS feed to only show comments when they are associated with an entry_id (garvinhicking)
+    * Fixed page counter to count pages depending on the entries per page, and not hardcoded 15 entries (garvinhicking)
     * Atom 0.3 feed supported (with xml-stylesheet display) (garvinhicking)
     * Fixed format of mail to not send invalid mails (garvinhicking)
     * Added Yahoo! blog ping (garvinhicking)

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- serendipity_functions.inc.php	29 Jan 2004 12:27:30 -0000	1.192
+++ serendipity_functions.inc.php	30 Jan 2004 12:53:29 -0000	1.193
@@ -470,6 +470,10 @@
     if ($fetchDrafts == 'false') {
         $drafts = "isdraft = 'false'";
     }
+    
+    if ($limit != '') {
+        $serendipity['fetchLimit'] = $limit;
+    }
 
     if (is_numeric($range)) {
         $year = (int)substr($range, 0, 4);
@@ -677,7 +681,7 @@
 
     $query        = serendipity_db_query($querystring);
     $totalEntries = $query[0][0];
-    $totalPages   = ceil($totalEntries / 15);
+    $totalPages   = ceil($totalEntries / ($serendipity['fetchLimit'] ? $serendipity['fetchLimit'] : 15));
 
     if (!isset($serendipity['GET']['page'])) {
         $serendipity['GET']['page'] = 1;
@@ -825,7 +829,7 @@
 
         if (!isset($serendipity['GET']['id']) &&
                (!isset($serendipity['GET']['hidefooter']) || $serendipity['GET']['hidefooter'] == false) &&
-               count($entries) <= 15) {
+               count($entries) <= ($serendipity['fetchLimit'] ? $serendipity['fetchLimit'] : 15)) {
             serendipity_printEntryFooter();
         }
     } else { // else short mode
@@ -899,7 +903,7 @@
                     {$serendipity['dbPrefix']}comments co
                     LEFT JOIN {$serendipity['dbPrefix']}entries e ON (co.entry_id = e.id)
                     LEFT JOIN {$serendipity['dbPrefix']}category c ON (e.categoryid = c.categoryid)
-                    WHERE co.type LIKE 'NORMAL' $and
+                    WHERE co.type LIKE 'NORMAL' AND co.entry_id != '' $and
                     ORDER BY
                         co.id " . ($order != '' ? $order : '') . "
                     $limit";

[php-blog-cvs] serendipity rss.php,1.17,1.18 serendipity_sidebar_items.php,1.36,1.37 serendipity_functions.inc.php,1.190,1.191 htaccess.rewrite.tpl,1.2,1.3 index.php,1.27,1.28 serendipity_genpage.inc.php,1.23,1.24 NEWS,1.51,1.52

From: <gar...@pr...> - 2004-01-31 00:08:30

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

Modified Files:
	rss.php serendipity_sidebar_items.php 
	serendipity_functions.inc.php htaccess.rewrite.tpl index.php 
	serendipity_genpage.inc.php NEWS 
Log Message:
Support for Atom 0.3 feed


Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- rss.php	21 Jan 2004 10:37:13 -0000	1.17
+++ rss.php	29 Jan 2004 12:08:28 -0000	1.18
@@ -2,9 +2,9 @@
 
 header('Content-Type: text/xml');
 include_once('serendipity_config.inc.php');
-$version = $_GET['version'];
+$version = strtolower($_GET['version']);
 if (empty($version)) {
-    $version = '2.0';
+    $version = serendipity_discover_rss($_GET['file'], $_GET['ext']);
 }
 
 $description     = $serendipity['blogDescription'];
@@ -53,6 +53,11 @@
 }
 
 echo '<?xml version="1.0" encoding="utf-8" ?>';
+
+if (strstr($version, 'atom')) {
+    echo "\n" . '<?xml-stylesheet href="' . serendipity_getTemplateFile('atom.css') . '" type="text/css" ?>';
+}
+
 echo "\n";
 switch ($version) {
 case '0.91':
@@ -83,12 +88,31 @@
     <description>$description</description>
     <dc:language>{$serendipity['lang']}</dc:language>
     <admin:errorReportsTo rdf:resource="mailto:{$serendipity['CONFIG']['email']}" />
-    <generator>Serendipity - http://www.s9y.org/</generator>
+    <generator>Serendipity {$serendipity['version']} - http://www.s9y.org/</generator>
     {$additional_fields['channel']}
     {$additional_fields['image']}
 
 HEAD;
 break;
+case 'atom0.3':
+    $modified = date('Y-m-d\TH:i:s\Z', $entries[0]['timestamp']);
+    print <<<HEAD
+<feed version="0.3"
+   xmlns="http://purl.org/atom/ns#">
+    <link href="{$serendipity['baseURL']}rss.php?version=atom0.3" rel="service.feed" title="$title" type="application/x.atom+xml" />
+    <link href="{$serendipity['baseURL']}"                        rel="alternate"    title="$title" type="text/html" />
+    <link href="{$serendipity['baseURL']}rss.php?version=2.0"     rel="alternate"    title="$title" type="application/rss+xml" />
+    <title mode="escaped" type="text/html">$title</title>
+    <tagline mode="escaped" type="text/html">$description</tagline>
+    <id>{$serendipity['baseURL']}</id>
+    <modified>$modified</modified>
+    <generator name="Serendipity" url="http://www.s9y.org/" version="{$serendipity['version']}">Serendipity {$serendipity['version']} - http://www.s9y.org/</generator>
+    <info mode="xml" type="text/html">
+        <div xmlns="http://www.w3.org/1999/xhtml">You are viewing an ATOM formatted XML site feed. Usually this file is inteded to be viewed in an aggregator or syndication software. If you want to know more about ATOM, please visist <a href="http://atomenabled.org/">Atomenabled.org</a></div>
+    </info>
+
+HEAD;
+break;
 default:
     die("Invalid RSS version specified\n");
 }
@@ -100,6 +124,9 @@
 case '2.0':
     print "</channel>\n";
     print "</rss>\n";
+    break;
+case 'atom0.3':
+    print "</feed>";
 }
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- serendipity_sidebar_items.php	7 Jan 2004 17:45:55 -0000	1.36
+++ serendipity_sidebar_items.php	29 Jan 2004 12:08:28 -0000	1.37
@@ -132,6 +132,7 @@
                                         'show_0.91',
                                         'show_2.0',
                                         'show_2.0c',
+                                        'show_atom0.3',
                                         'seperator',
                                         'field_managingEditor',
                                         'field_webMaster',
@@ -166,6 +167,12 @@
                 $propbag->add('description', '');
                 break;
 
+            case 'show_atom0.3':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        SYNDICATION_PLUGIN_ATOM03);
+                $propbag->add('description', '');
+                break;
+
             case 'seperator':
                 $propbag->add('type',        'seperator');
                 break;
@@ -240,6 +247,14 @@
 <?php
         }
 
+        if ($this->get_config('show_atom0.3') != 'false') {
+?>
+            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=atom0.3"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>xml.gif" border="0" alt="ATOM/XML" /></a>
+            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=atom0.3">ATOM 0.3 feed</a>
+            <br />
+<?php
+        }
+
         if ($this->get_config('show_2.0c') != 'false') {
 ?>
             <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&amp;type=comments"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>xml.gif" border="0" alt="XML" /></a>

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- serendipity_functions.inc.php	29 Jan 2004 09:22:59 -0000	1.190
+++ serendipity_functions.inc.php	29 Jan 2004 12:08:28 -0000	1.191
@@ -1204,7 +1204,7 @@
 function serendipity_printEntries_rss($entries, $version, $comments = false) {
     global $serendipity;
 
-    if ($version == '0.91' || $version == '2.0' && is_array($entries)) {
+    if (($version == '0.91' || $version == '2.0' || $version == 'atom0.3') && is_array($entries)) {
         foreach ($entries as $entry) {
             $guid = serendipity_archiveURL((isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']), $entry['title']);
             if ($comments == true) {
@@ -1215,7 +1215,7 @@
 
             // Embed a link to extended entry, if existing
             if ($entry['exflag']) {
-                $ext = '<br /><a href="' . $guid . '#extended" title="' . VIEW_EXTENDED_ENTRY . '">' . VIEW_EXTENDED_ENTRY . '</a>';
+                $ext = '<br /><a href="' . $guid . '#extended">' . VIEW_EXTENDED_ENTRY . '</a>';
             } else {
                 $ext = '';
             }
@@ -1223,28 +1223,57 @@
             // Do some relative -> absolute URI replacing magic. Replaces all HREF/SRC (<a>, <img>, ...) references to only the serendipitypath with the full baseURL URI
             // garvin: Could impose some problems. Closely watch this one.
             $entry['body'] = preg_replace('@(href|src)=("|\')(' . preg_quote($serendipity['serendipityHTTPPath']) . ')(.*)("|\')(.*)>@imsU', '\1=\2' . $serendipity['baseURL'] . '\4\2\6>', $entry['body']);
+            
+            // extract author information
+            if (empty($entry['email'])) {
+                $query = "select email from {$serendipity['dbPrefix']}authors where username='{$entry['username']}'";
+                $results = serendipity_db_query($query);
+                $entry['email'] = $results[0]['email'];
+            }
+
+            if ($version == 'atom0.3') {
+                /*********** ATOM 0.3 FEED *************/
+?>
+<entry>
+    <link href="<?php echo $guid; ?>" rel="alternate" title="<?php echo utf8_encode(htmlspecialchars($entry['title'])); ?>" type="text/html" />
+    <author>
+        <name><?php echo utf8_encode(htmlspecialchars($entry['email'])) . ' (' . utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></name>
+    </author>
+    
+    <issued><?php echo date('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></issued>
+    <created><?php echo date('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></created>
+    <modified><?php echo date('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></modified>
+
+    <id><?php echo $guid; ?></id>
+    <title mode="escaped" type="text/html"><?php echo utf8_encode(htmlspecialchars($entry['title'])); ?></title>
+    <content type="application/xhtml+xml" xml:base="<?php echo $serendipity['baseURL']; ?>" xml:space="preserve">
+        <div xmlns="http://www.w3.org/1999/xhtml">
+            <?php echo utf8_encode(nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'] . $ext)))); ?>
+        </div>
+    </content>
+</entry>
+<?php
+            } else {
+                /*********** BEGIN RSS 0.91/2.0 FEED *************/
 ?>
 <item>
     <title><?php echo utf8_encode(htmlspecialchars($entry['title'])); ?></title>
     <link><?php echo $guid; ?></link>
 <?php
-            if ($version == '2.0') {
-                // extract author information
-                if (empty($entry['email'])) {
-                    $query = "select email from {$serendipity['dbPrefix']}authors where username='{$entry['username']}'";
-                    $results = serendipity_db_query($query);
-                    $entry['email'] = $results[0]['email'];
-                }
+                /*********** END RSS 0.91/2.0 FEED *************/
+            
+                if ($version == '2.0') {
+                    /*********** RSS 2.0 FEED EXTRAS *************/
 ?>
     <category><?php echo utf8_encode(htmlspecialchars($entry['category_name'])); ?></category>
     <comments><?php echo $guid; ?></comments>
 <?php
-    if ($comments === false) {
+                    if ($comments === false) {
 ?>
     <slash:comments><?php echo $entry['comments']; ?></slash:comments>
     <wfw:commentRss><?php echo $serendipity['baseURL']; ?>rss.php?version=<?php echo $version; ?>&amp;type=comments&amp;cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:commentRss>
 <?php
-    }
+                    }
 ?>
     <author><?php echo utf8_encode(htmlspecialchars($entry['email'])) . ' (' . utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></author>
     <content:encoded>
@@ -1252,17 +1281,20 @@
     </content:encoded>
     <pubDate><?php echo date('r', $entry['timestamp']); ?></pubDate>
     <guid><?php echo $guid; ?></guid>
+</item>
 <?php
-            } else {
+                    /*********** END 2.0 FEED EXTRAS *************/
+                } else {
+                    /*********** BEGIN RSS 0.91 FEED EXTRAS *************/
 ?>
     <description>
         <?php echo utf8_encode(htmlspecialchars(nl2br($entry['body'] . $ext))); ?>
     </description>
-<?php
-            }
-?>
 </item>
 <?php
+                    /*********** END RSS 0.91 FEED EXTRAS *************/
+                }
+            }
         }
     } else if ($version == '1.0') {
     }
@@ -1431,7 +1463,7 @@
     $url      = 'http://' . $buffer[3];
 
     return sprintf(
-        '<a%shref="%sexit.php?url=%s%s" title="%s" onmouseOver="window.status=\'%s\';return true;" onmouseOut="window.status=\'\';return true;"',
+        '<a%shref="%sexit.php?url=%s%s" title="%s" onmouseover="window.status=\'%s\';return true;" onmouseout="window.status=\'\';return true;"',
         $buffer[1],
         $serendipity['baseURL'],
         base64_encode($url),
@@ -2658,6 +2690,24 @@
     return true;
 }
 
+function serendipity_discover_rss($name, $ext, $default = '2.0') {
+    if ($name == 'atom') {
+        $ver = 'atom0.3';
+    } else {
+        switch ($ext) {
+        case 'rss':
+            $ver = '0.91';
+            break;
+        case 'rss2':
+        default:
+            $ver = $default;
+            break;
+        }
+    }
+    
+    return $ver;
+}
+
 define("serendipity_FUNCTIONS_LOADED", true);
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: htaccess.rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.rewrite.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- htaccess.rewrite.tpl	20 Jan 2004 11:12:37 -0000	1.2
+++ htaccess.rewrite.tpl	29 Jan 2004 12:08:28 -0000	1.3
@@ -12,7 +12,7 @@
 RewriteRule ^entries serendipity_entries.php [L,QSA]
 RewriteRule ^archive {indexFile}?url=/archive [L,QSA]
 RewriteRule ^categories/(.*) {indexFile}?url=categories/$1 [L,QSA]
-RewriteRule ^(index|rss|b2rss|b2rdf)\.(rss|xml|rdf) rss.php?version=2.0
+RewriteRule ^(atom|index|rss|b2rss|b2rdf)\.(rss|xml|rdf|rss2) rss.php?file=$1&ext=$2
 RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html
 RewriteRule (.*\.html?) {indexFile}?url=/$1
 

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- index.php	18 Sep 2003 12:57:46 -0000	1.27
+++ index.php	29 Jan 2004 12:08:28 -0000	1.28
@@ -93,15 +93,8 @@
     print $data;
 } else if (preg_match('@/feeds/@', $uri)) {
     header('Content-Type: text/html; charset=utf-8');
-    if (preg_match('@/index.(rss|rdf|rss2)$@', $uri, $matches)) {
-        switch ($matches[1]) {
-        case 'rss':
-            $_GET['version'] = '0.91';
-            break;
-        case 'rss2':
-            $_GET['version'] = '2.0';
-            break;
-        }
+    if (preg_match('@/(index|atom|rss|b2rss|b2rdf).(rss|rdf|rss2|xml)$@', $uri, $matches)) {
+        $_GET['version'] = serendipity_discover_rss($matches[1], $matches[2]);
 
         ob_start();
         include_once('rss.php');

Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_genpage.inc.php	25 Jan 2004 00:52:29 -0000	1.23
+++ serendipity_genpage.inc.php	29 Jan 2004 12:08:28 -0000	1.24
@@ -18,7 +18,8 @@
     <title><?php echo htmlentities($serendipity['blogTitle']); ?></title>
     <meta name="Powered-By" content="Serendipity v.<?php echo $serendipity['version'] ?>" />
     <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" />
-    <link rel="alternate"  type="application/rss+xml" title="RSS" href="<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>feeds/index.rss" />
+    <link rel="alternate"  type="application/rss+xml" title="RSS" href="<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>feeds/index.rss2" />
+    <link rel="alternate"  type="application/x.atom+xml"  title="Atom"  href="<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>feeds/atom.xml" />
 <?php
         if (strtolower($serendipity['extCSS'])!='none') {
 ?>

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- NEWS	29 Jan 2004 09:23:03 -0000	1.51
+++ NEWS	29 Jan 2004 12:08:28 -0000	1.52
@@ -2,6 +2,7 @@
 
 Version 0.5 ()
 ------------------------------------
+    * Atom 0.3 feed supported (with xml-stylesheet display) (garvinhicking)
     * Fixed format of mail to not send invalid mails (garvinhicking)
     * Added Yahoo! blog ping (garvinhicking)
     * Format trackbacks with link to the originating blog in comments plugin (garvinhicking)

[php-blog-cvs] serendipity/templates/default atom.css,NONE,1.1

From: <gar...@pr...> - 2004-01-30 21:59:00

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

Added Files:
	atom.css 
Log Message:
Support for Atom 0.3 feed


--- NEW FILE: atom.css ---
/* Basic CSS taken from http://www.blogger.com/styles/atom.css */

feed {
  display:block;
  font-family:verdana, sans-serif;
  margin:2%;
  font-size:90%;
  color:#000000;
  background:#ffffff;
}

title {
  display:block;
  font-size:1.3em;
  color:inherit;
  background:inherit;
  font-weight:bold;
}

tagline, link {
  display:block;
  font-size:0.9em;
}

id, modified {
  display:none;
}

generator {
  display:block;
  font-size:0.9em;
}

info {
  display:block;
  margin:3em 4em 3em 4em;
  color:#CC3333;
  background:#FFFF66;
  border:solid #CCCC66 2px;
  text-align:center;
  padding:1.5em;
  font-family:mono;
  font-size:0.8em;
}

entry {
  display:block;
  color:inherit;
  background:inherit;
  padding:0;
  margin:1em 1em 4em 1em;
  
}

entry modified, entry name {
  display:inline;
  color:#999999;
  background:inherit;
  font-size:0.8em;
}

entry created, entry issued, entry id {
  display:none;
}

entry title {
  display:block;
  font-size:1em;
  font-weight:bold;
  color:inherit;
  background:inherit;
  padding:1em 1em 0em 1em;
  margin:0;
  border-top:solid 1px #dddddd;
}

content {
  display:block;
  font-size:0.9em;
  color:inherit;
  background:inherit;
  padding:1em;
  line-height:1.5em;
}

[php-blog-cvs] serendipity serendipity_genpage.inc.php,1.22,1.23 serendipity.js,1.3,NONE

From: <tom...@pr...> - 2004-01-25 00:53:08

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

Modified Files:
	serendipity_genpage.inc.php 
Removed Files:
	serendipity.js 
Log Message:
Remove references to serendipity.js
Remove serendipity.js - Not used for ANYTHING


Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_genpage.inc.php	7 Jan 2004 17:45:54 -0000	1.22
+++ serendipity_genpage.inc.php	25 Jan 2004 00:52:29 -0000	1.23
@@ -19,7 +19,6 @@
     <meta name="Powered-By" content="Serendipity v.<?php echo $serendipity['version'] ?>" />
     <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" />
     <link rel="alternate"  type="application/rss+xml" title="RSS" href="<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>feeds/index.rss" />
-    <script language="Javascript" type="text/javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.js"></script>
 <?php
         if (strtolower($serendipity['extCSS'])!='none') {
 ?>

--- serendipity.js DELETED ---

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.188,1.189

From: <tom...@pr...> - 2004-01-24 19:28:57

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Fixing Bugs item #883355 - Wrong ping-host for blogg.de


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- serendipity_functions.inc.php	23 Jan 2004 10:12:54 -0000	1.188
+++ serendipity_functions.inc.php	24 Jan 2004 19:25:59 -0000	1.189
@@ -2594,7 +2594,7 @@
 
     if ($serendipity['POST']['announce_entries_bloggde'] == 'true') {
         $services[] = array(
-          'host' => 'ping.blogg.de',
+          'host' => 'xmlrpc.blogg.de',
           'path' => '/'
         );
     }

[php-blog-cvs] [Fwd: Mail delivery failed: returning message to sender]

From: Joseph T. <jt...@dr...> - 2004-01-23 05:53:19

Here's a cvs commit that probably won't get through.  If it does, 
apologies for the repeat.

-------- Original Message --------
Return-Path: <>
X-Original-To: jt...@dr...
Delivered-To: jt...@dr...
Received: from mail.sourceforge.net (lists.sourceforge.net 
[66.35.250.206])	by mail.dragonstrider.com (Postfix) with ESMTP id 
8B0C6E3203	for <jt...@dr...>; Fri, 23 Jan 2004 00:51:23 
-0500 (EST)
Received: from exim by sc8-sf-mx2.sourceforge.net with local (Exim 
4.30)	id 1AjuDy-0002rk-9I	for jt...@us...; Thu, 22 Jan 
2004 21:51:22 -0800
X-Failed-Recipients: php...@us...
Auto-Submitted: auto-generated
From: Mail Delivery System <Mai...@li...>
To: jt...@us...
Subject: Mail delivery failed: returning message to sender
Message-Id: <E1A...@sc...>
Date: Thu, 22 Jan 2004 21:51:22 -0800
X-Spam-Level:
X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on 
www.dragonstrider.com
X-Spam-Status: No, hits=-4.8 required=5.2 tests=BAYES_00,HTML_MESSAGE 
autolearn=ham version=2.63

This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

   php...@us...
     Unrouteable address

------ This is a copy of the message, including all the headers. ------

Return-path: <jt...@us...>
Received: from sc8-pr-cvs1-f.sourceforge.net ([10.4.1.7] 
helo=sc8-pr-cvs1.sourceforge.net)
	by sc8-sf-mx2.sourceforge.net with esmtp (TLSv1:AES256-SHA:256)
	(Exim 4.30)
	id 1AjuDx-0002qW-VY
	for php...@us...; Thu, 22 Jan 2004 21:51:22 -0800
Received: from localhost.localdomain ([127.0.0.1] 
helo=projects.sourceforge.net)
	by sc8-pr-cvs1.sourceforge.net with esmtp (Exim 4.20)
	id 1AjuDc-0006FX-UE
	for php...@us...; Thu, 22 Jan 2004 21:51:00 -0800
From: jt...@us...
To: php...@us...
Subject: serendipity LICENSE,1.2,1.3 comment.php,1.26,1.27 
serendipity_config.inc.php,1.45,1.46 serendipity_db.inc.php,1.7,1.8 
serendipity_entries.php,1.20,1.21 serendipity_functions.inc.php,1.185,1.186
Message-Id: <E1A...@sc...>
Date: Thu, 22 Jan 2004 21:51:00 -0800
X-Spam-Score: 1.1 (+)
X-Spam-Report: Spam Filtering performed by sourceforge.net.
	See http://spamassassin.org/tag/ for more details.
	Report problems to http://sf.net/tracker/?func=add&group_id=1&atid=200001
	0.3 NO_REAL_NAME           From: does not include a real name
	0.8 HTML_30_40             BODY: Message is 30% to 40% HTML
	0.0 HTML_MESSAGE           BODY: HTML included in message

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

Modified Files:
	LICENSE comment.php serendipity_config.inc.php
	serendipity_db.inc.php serendipity_entries.php
	serendipity_functions.inc.php
Log Message:
Fixed bug regarding postgresql and boolean values.

Also added several copyright notices.



Index: LICENSE
===================================================================
RCS file: /cvsroot/php-blog/serendipity/LICENSE,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- LICENSE	31 Mar 2003 21:49:26 -0000	1.2
+++ LICENSE	23 Jan 2004 05:50:18 -0000	1.3
@@ -1,4 +1,4 @@
-Copyright (c) 2003, Jannis Hermanns
+Copyright (c) 2003-2004, Jannis Hermanns
  All rights reserved.

  Redistribution and use in source and binary forms, with or without 
modification,

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- comment.php	7 Jan 2004 17:45:38 -0000	1.26
+++ comment.php	23 Jan 2004 05:50:19 -0000	1.27
@@ -1,4 +1,6 @@
  <?php # $Id$
+# Copyright (c) 2003-2004, Jannis Hermanns
+# All rights reserved.  See LICENSE file for licensing details

  session_start();
  include_once('serendipity_config.inc.php');
@@ -97,7 +99,7 @@

              serendipity_printComments(serendipity_fetchComments($id), 
(isset($ca['allow_comments']) ? $ca['allow_comments'] : true));

-            if ($ca['allow_comments'] === true || $ca['allow_comments'] 
== 'true' || !is_array($ca)) {
+            if (serendipity_db_bool($ca['allow_comments']) || 
!is_array($ca)) {
  ?>

      <div class="serendipity_commentsTitle"><?php echo ADD_COMMENT; 
?></div>

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_config.inc.php	21 Jan 2004 18:28:25 -0000	1.45
+++ serendipity_config.inc.php	23 Jan 2004 05:50:20 -0000	1.46
@@ -1,4 +1,6 @@
  <?php # $Id$
+# Copyright (c) 2003-2004, Jannis Hermanns
+# All rights reserved.  See LICENSE file for licensing details

  define('IS_installed', 
file_exists((isset($serendipity['serendipityPath']) ? 
$serendipity['serendipityPath'] : '') . 
'serendipity_config_local.inc.php'));


Index: serendipity_db.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_db.inc.php	30 Sep 2003 21:22:00 -0000	1.7
+++ serendipity_db.inc.php	23 Jan 2004 05:50:21 -0000	1.8
@@ -1,4 +1,6 @@
  <?php # $Id$
+# Copyright (c) 2003-2004, Jannis Hermanns
+# All rights reserved.  See LICENSE file for licensing details

  @include_once($serendipity['serendipityHTTPPath'] 
."serendipity_db_{$serendipity['dbType']}.inc.php");

@@ -33,7 +35,7 @@
      global $serendipity;

      $names = implode(',', array_keys($values));
-
+
      $vals = '';
      foreach ($values as $k => $v) {
          if (strlen($vals))
@@ -44,5 +46,13 @@
      return serendipity_db_query("INSERT INTO 
{$serendipity['dbPrefix']}$table ($names) values ($vals)");
  }

+function serendipity_db_bool ($val)
+{
+    if(($val === true) || ($val == 'true') || ($val == 't'))
+        return true;
+    #elseif (($val === false || $val == 'false' || $val == 'f'))
+    else
+        return false;
+}
  /* vim: set sts=4 ts=4 expandtab : */
  ?>

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_entries.php	4 Jan 2004 02:30:47 -0000	1.20
+++ serendipity_entries.php	23 Jan 2004 05:50:21 -0000	1.21
@@ -1,4 +1,7 @@
  <?php # $Id$
+# Copyright (c) 2003-2004, Jannis Hermanns
+# All rights reserved.  See LICENSE file for licensing details
+

  session_start();
  if (file_exists('./serendipity_config_local.inc.php')) {

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- serendipity_functions.inc.php	21 Jan 2004 15:51:59 -0000	1.185
+++ serendipity_functions.inc.php	23 Jan 2004 05:50:21 -0000	1.186
@@ -1,4 +1,6 @@
  <?php # $Id$
+# Copyright (c) 2003-2004, Jannis Hermanns
+# All rights reserved.  See LICENSE file for licensing details

  include_once("${serendipity['serendipityPath']}serendipity_db.inc.php");
  include_once("${serendipity['serendipityPath']}compat.php");
@@ -751,7 +753,7 @@
  <?php
                  echo '                ' . POSTED_BY . ' ' . 
htmlentities($entry['username']) . ($entry['category_name'] ? ' ' . IN . 
' <a href="' . $serendipity['serendipityHTTPPath'] . 
($serendipity['rewrite'] == 'true' ? $serendipity['indexFile'] . '?/' : 
'') . 'categories/' . $entry['categoryid'] . '_' . 
serendipity_makeFilename($entry['category_name']) . '">' . 
$entry['category_name'] . '</a> ' : ' ') . AT . ' <a href="' . 
$entryLink . '">' . date('H:i', $entry['timestamp']) . '</a>'. "\n";

-                if ($entry['allow_comments'] === true || 
$entry['allow_comments'] == 'true' || !isset($entry['allow_comments']) 
|| $entry['comments'] > 0) {
+                if (serendipity_db_bool($entry['allow_comments']) || 
!isset($entry['allow_comments']) || $entry['comments'] > 0) {
                      if (!isset($serendipity['GET']['id'])) {
                          $label = $entry['comments'] == 1 ? COMMENT : 
COMMENTS;
                          echo ' | <a href="' . 
$serendipity['serendipityHTTPPath'] . 
'comment.php?serendipity[entry_id]=' . $entry['id'] . 
'&amp;serendipity[type]=comments"';
@@ -760,7 +762,7 @@
                      }
                  }

-                if ($entry['allow_comments'] === true || 
$entry['allow_comments'] == 'true' || !isset($entry['allow_comments']) 
|| $entry['trackbacks'] > 0) {
+                if (serendipity_db_bool($entry['allow_comments']) || 
!isset($entry['allow_comments']) || $entry['trackbacks'] > 0) {
                      $label = $entry['trackbacks'] == 1 ? TRACKBACK : 
TRACKBACKS;
                      echo ' | <a href="' . 
$serendipity['serendipityHTTPPath'] . 
'comment.php?serendipity[entry_id]=' . $entry['id'] . 
'&amp;serendipity[type]=trackbacks"';
                      echo '      onclick="window.open(this.href, 
\'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">';
@@ -799,7 +801,7 @@


                      echo 
serendipity_printComments(serendipity_fetchComments($entry['id']), 
(isset($entry['allow_comments']) ? $entry['allow_comments'] : true));
-                    if ($entry['allow_comments'] === true || 
$entry['allow_comments'] == 'true' || !isset($entry['allow_comments'])) {
+                    if (serendipity_db_bool($entry['allow_comments']) 
|| !isset($entry['allow_comments'])) {
  ?>
              <br />
              <div class="serendipity_commentsTitle"><?php echo 
ADD_COMMENT; ?></div>
@@ -984,7 +986,7 @@
      }

      if ($_SESSION['serendipityAuthedUser'] === true) {
-        if ($allow_comments === true || $allow_comments == 'true') {
+        if (serendipity_db_bool($allow_comments)) {
              echo '<div class="serendipity_comment_source">(<a href="' 
. $serendipity['baseURL'] . 
'comment.php?serendipity[switch]=disable&amp;serendipity[entry]=' . 
$comment['entry_id'] . '">' . COMMENTS_DISABLE . '</a>)</div>';
          } else {
              echo '<div class="serendipity_comment_source">(<a href="' 
. $serendipity['baseURL'] . 
'comment.php?serendipity[switch]=enable&amp;serendipity[entry]=' . 
$comment['entry_id'] . '">' . COMMENTS_ENABLE . '</a>)</div>';
@@ -1044,7 +1046,7 @@
      $query = "SELECT allow_comments FROM 
{$serendipity['dbPrefix']}entries WHERE id = '$id'";
      $ca    = serendipity_db_query($query, true);

-    if ($ca['allow_comments'] === true || $ca['allow_comments'] == 
'true' || !is_array($ca)) {
+    if (serendipity_db_bool($ca['allow_comments']) || !is_array($ca)) {
          $title         = 
serendipity_db_escape_string($commentInfo['title']);
          $comments      = $commentInfo['comment'];
          $commentsFixed = 
serendipity_db_escape_string($commentInfo['comment']);
@@ -2033,10 +2035,11 @@
          $draftP = ' selected="selected"';
      }

-    if (isset($entry['allow_comments']) && ($entry['allow_comments'] == 
'true' || $entry['allow_comments'] === true)) {
-        $allow_comments = ' checked="checked"';
-    } elseif ($entry['allow_comments'] != 'false' && 
$entry['allow_comments'] !== 'false' && 
($serendipity['allowCommentsDefault'] == 'true' || 
$serendipity['allowCommentsDefault'] === true)) {
+    if (isset($entry['allow_comments']) && 
(serendipity_db_bool($entry['allow_comments']))) {
          $allow_comments = ' checked="checked"';
+    # this elseif is redundant, I believe (jtate)
+    #} elseif ($entry['allow_comments'] != 'false' && 
$entry['allow_comments'] !== 'false' && 
($serendipity['allowCommentsDefault'] == 'true' || 
$serendipity['allowCommentsDefault'] === true)) {
+    #    $allow_comments = ' checked="checked"';
      } else {
          $allow_comments = '';
      }

[php-blog-cvs] serendipity serendipity_config_local.tpl,1.26,1.27

From: <tom...@us...> - 2004-01-21 18:38:39

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv12375

Modified Files:
	serendipity_config_local.tpl 
Log Message:
w00ps, debug :)


Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_config_local.tpl	21 Jan 2004 18:28:25 -0000	1.26
+++ serendipity_config_local.tpl	21 Jan 2004 18:38:36 -0000	1.27
@@ -49,7 +49,7 @@
 
 // Pinging of Weblog Services
 # Announcement of new weblog entries
-$serendipity['announce_entries']              = '{Announce Entries|announce_entries|bool|1}';             // Do you want new entries to be announced?
+$serendipity['announce_entries']              = '{Announce Entries|announce_entries|bool|0}';             // Do you want new entries to be announced?
 $serendipity['announce_entries_blogs']        = '{blo.gs|announce_entries_blogs|bool|0}';                 // Do you want new entries to be announced on blo.gs?
 $serendipity['announce_entries_blogrolling']  = '{blogrolling.com|announce_entries_blogrolling|bool|0}';  // Do you want new entries to be announced on blogrolling.com?
 $serendipity['announce_entries_technorati']   = '{technorati.com|announce_entries_technorati|bool|0}';    // Do you want new entries to be announced on technorati.com?

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,NONE,1.1 serendipity_lang_en.inc.php,NONE,1.1 serendipity_lang_es.inc.php,NONE,1.1

From: <tom...@us...> - 2004-01-21 18:28:30

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv9211/lang

Added Files:
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php 
Log Message:
* Added dropdown for languages in the installer
* Added "es" to auto-lang-detection
* Fixed bug with no default values during installation
* Added get_boolean function, check if a string is 'true' or 'false' and return boolean if so
* Moved languages to its own folder


--- NEW FILE: serendipity_lang_de.inc.php ---
<?php # $Id: serendipity_lang_de.inc.php,v 1.1 2004/01/21 18:28:25 tomsommer Exp $

##########################################################################
# serendipity - another blogger...                                       #
##########################################################################
#                                                                        #
# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
# http://www.jannis.to/programming/serendipity.html                      #
#                                                                        #
##########################################################################

// German language file
if (!isset($serendipity['months'])) {
    $serendipity['months']  = array('J...@ha...', 'Januar', 'Februar', 'M&auml;rz',
                        'April', 'Mai', 'Juni', 'Juli', 'August', 'September',
                        'Oktober', 'November', 'Dezember');
}

if (!isset($serendipity['weekDayAbb'])) {
    $serendipity['weekDayAbb'] = array('Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So');
}


@define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Verwaltungsoberfl&auml;che');
@define('HAVE_TO_BE_LOGGED_ON', 'Sie m&uuml;ssen angemeldet sein, um diese Seite zu sehen:');
@define('APPEARANCE', 'Aussehen');
@define('MANAGE_STYLES', 'Styles verwalten');
@define('CONFIGURE_PLUGINS', 'Plugins verwalten');
@define('ADMIN', 'Admin:');
@define('CONFIGURATION', 'Konfiguration');
@define('IMPORT_EXPORT_ENTRIES', 'Import/Export');
@define('BACK_TO_BLOG', 'Zur&uuml;ck zum Weblog');
@define('LOGOUT', 'Abmelden');
@define('LOGGEDOUT', 'Abgemeldet.');
@define('CREATE_NEW_CAT', 'Neue Kategorie');
@define('CREATE', 'Erstellen');
@define('EDIT_THIS_CAT', '"%s - %s" bearbeiten');
@define('SAVE', 'Speichern');
@define('NAME', 'Name');
@define('SEND_MAIL_TO', 'Mail schicken an');
@define('NEW_TRACKBACK_TO', 'Neues Trackback für');
@define('NEW_COMMENT_TO', 'Neuer Kommentar für');
@define('RECENT', 'Das neueste...');
@define('OLDER', '&Auml;lteres...');
@define('ANONYMOUS', 'Anonym');
@define('LINK_TO_COMMENT', 'Link zu Kommentar #');
@define('DESCRIPTION', 'Beschreibung');
@define('CLICK_CAT_TO_EDIT', 'Zum Bearbeiten auf eine Kategorie klicken');
@define('CREATE_NEW_CAT', 'Neue Kategorie');
@define('SELECT_IMAGE', 'Bitte w&auml;hlen Sie ein Bild');
@define('I_WANT_THUMB', 'Ich m&ouml;chte die Vorschau im Eintrag haben.');
@define('I_WANT_BIG_IMAGE', 'Ich m&ouml;chte das grosse Bild im Eintrag haben.');
@define('I_WANT_NO_LINK', 'Das Bild soll kein Link sein');
@define('I_WANT_IT_TO_LINK', 'Das Bild soll hierhin linken:');
@define('BACK', 'Zur&uuml;ck');
@define('FORWARD', 'Vorw&auml;rts');
@define('DONE', 'Fertig');
@define('CLICK_IMAGE_TO_INSERT', 'Auf ein Bild klicken um es einzuf&uuml;gen:');
@define('WELCOME_BACK', 'Willkommen zur&uuml;ck,');
@define('ADD_PLUGIN', 'Plugin hinzuf&uuml;gen');
@define('TITLE', 'Titel');
@define('PLUGIN', 'Plugin');
@define('DESCRIPTION', 'Beschreibung');
@define('PLACEMENT', 'Platzierung');
@define('DELETE', 'L&ouml;schen');
@define('SAVE', 'Speichern');
@define('SELECT_A_PLUGIN_TO_ADD', 'Neues Plugin ausw&auml;hlen');
@define('UP', 'HOCH');
@define('DOWN', 'RUNTER');
@define('ENTRIES', 'Eintr&auml;ge:');
@define('NEW_ENTRY', 'Neuer Eintrag');
@define('EDIT_ENTRIES', 'Eintr&auml;ge bearbeiten');
@define('DELETE_ENTRIES', 'Eintrag l&ouml;schen');
@define('CATEGORIES', 'Kategorien');
@define('EDIT_CATEGORIES', 'Kategorien bearbeiten');
@define('IMAGES', 'Bilder:');
@define('ADD_IMAGES', 'Bilder hochladen');
@define('WARNING_THIS_BLAHBLAH', "ACHTUNG:\\nDas kann jetzt lange dauern, wenn für viele Bilder noch keine Vorschau existiert.");
@define('CREATE_THUMBS', 'Vorschauen erneuern');
@define('MANAGE_IMAGES', 'Bilder verwalten');
@define('ADMIN_INTERFACE', 'Verwaltungsoberfl&auml;che');
@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Autorenoberfl&auml;che');
@define('AUTHOR_SUITE', 'Serendipity Autorenoberfl&auml;che');
@define('NAME', 'Name');
@define('EMAIL', 'Email');
@define('HOMEPAGE', 'Homepage');
@define('COMMENT', 'Kommentar');
@define('REMEMBER_INFO', 'Daten merken? ');
@define('SUBMIT_COMMENT', 'Kommentar abschicken');
@define('NO_ENTRIES_TO_PRINT', 'Keine Eintr&auml;ge vorhanden.');
@define('COMMENTS', 'Kommentare');
@define('ADD_COMMENT', 'Kommentar schreiben');
@define('NO_COMMENTS', 'Noch keine Kommentare.');
@define('POSTED_BY', 'Geschrieben von');
@define('TRACKBACK_FROM', 'Trackback von');
@define('ON', 'um');
@define('A_NEW_COMMENT_BLAHBLAH', 'In Ihrem Blog %s wurde ein neuer Kommentar zu Eintrag #%s eingetragen!');
@define('NO_CATEGORY', 'Keine Kategorie');
@define('ENTRY_BODY', 'Eintrag');
@define('EXTENDED_BODY', 'Erweiterter Eintrag');
@define('CATEGORY', 'Kategorie:');
@define('TEMPLATE_NAME', 'Template Name');
@define('CHOOSE_STYLESHEET', 'Bitte ein Stylesheet w&auml;hlen...');
@define('EDIT', 'Bearbeiten');
@define('MAKE_DEFAULT', 'Als Standard');
@define('CREATE_NEW_STYLESHEET', 'Neues Stylesheet');
@define('NO_ENTRIES_BLAHBLAH', 'F&uuml;r ihre Suche %s konnte kein Eintrag gefunden werden' . "\n");
@define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Ihre Suche nach %s ergab %s Treffer:');
@define('IMAGE', 'Bild');
@define('ERROR_FILE_NOT_EXISTS', ' Alte Datei existiert nicht!');
@define('ERROR_FILE_EXISTS', 'Fehler: Neuer Dateiname existiert schon, bitte einen anderen wählen.');
@define('ERROR_SOMETHING', 'Fehler: Irgendentwas stimmt nicht.');
@define('ADDING_IMAGE', 'Bild hinzuf&uuml;gen...');
@define('THUMB_CREATED_DONE', 'Vorschau erstellt.<br>Fertig.');
@define('ERROR_FILE_EXISTS_ALREADY', 'Fehler: Diese Datei existiert schon auf dem Server!');
@define('ERROR_UNKNOWNE_NOUPLOAD', 'Unbekannter Fehler aufgetreten, Datei nicht hochgeladen.');
@define('ADD_IMAGE_BLAHBLAH', '<b>Bild zur Sammlung hinzuf&uuml;gen:</b><p>Hier k&ouml;nnen Sie ein Bild hochladen, oder mir sagen, von wo ich es downloaden soll! Wenn das passende Bild fehlt, einfach bei Google danach suchen. Probieren Sie mal <a href="http://images.google.de" target="_blank">Googles Bildsuche</a>, die Resultate sind meistens brauchbar, aber auf jeden Fall witzig :)<p><b>Methode w&auml;hlen:</b><br>');
@define('ENTER_IMAGE_URL', 'Bildurl zum Download angeben:');
@define('ENTER_IMAGE_TO_UP', 'Bild zum Hochladen eingeben:');
@define('GO', 'Los!');
@define('NEWSIZE', 'Neue Gr&ouml;&szlig;e ');
@define('RESIZE_BLAHBLAH', '<b>Gr&ouml;&szlig; von %s &auml;ndern</b><p>');
@define('ORIGINAL_SIZE', 'Originalgr&ouml;&szlig;: <i>%sx%s</i> Pixel');
@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Hier k&ouml;nnen sie die Bildgr&ouml;&szlig;e &auml;ndern. Um die Proportionen beizubehalten, einfach einen der beiden Werte eingeben, und anschlie&szlig;end die TAB taste dr&uuml;cken, und Sie erhalten eine Vorschau mit korrekten Proportionen.');
@define('DATE_FORMAT_1', 'd.m.Y');
@define('CALENDAR', 'Kalender');
@define('QUICKJUMP_CALENDAR', 'QuickJump Kalender');
@define('QUICKSEARCH', 'Schnellsuche');
@define('SEARCH_FOR_ENTRY', 'Nach Eintr&auml;gen suchen');
@define('ARCHIVES', 'Archive');
@define('BROWSE_ARCHIVES', 'Die Archive durchst&ouml;bern');
@define('TOP_REFERRER', 'Top Referrer');
@define('SHOWS_TOP_SITES', 'Zeigt die Top-Seiten, die auf Ihr Blog linken');
@define('TOP_EXITS', 'Top Exits');
@define('SHOWS_TOP_EXIT', 'Zeigt die Top-Exit-Links Ihres Blogs');
@define('SYNDICATION', 'Syndication');
@define('SHOWS_RSS_BLAHBLAH', 'Zeigt die RSS Syndication-Links');
@define('SUPERUSER', 'Eigent&uuml;mer');
@define('ALLOWS_YOU_BLAHBLAH', 'Link zum Konfigurieren von Serendipity und zum Schreiben von Eintr&auml;gen - WICHTIG');
@define('PLUG', 'Plug');
@define('ADVERTISES_BLAHBLAH', 'Zeigt einen Hinweis, dass Serendipity die Blog Software ist');
@define('HTML_NUGGET', 'HTML Klotz');
@define('HOLDS_A_BLAHBLAH', 'Zeigt einen kleinen Klotz HTML Code in einer der Seitenleisten an');
@define('TITLE_FOR_NUGGET', 'Titel für den Klotz');
@define('THE_NUGGET', 'Der HTML Klotz!');
@define('SYNDICATE_THIS_BLOG', 'Syndicate This Blog');
@define('QUICKJUMP', 'Schnellauswahl');
@define('SEARCH_TOO_SHORT', 'Bitte geben Sie einen Suchbegriff mit mindestens drei Zeichen an.');
@define('YOU_CHOSE', 'Sie haben sich f&uuml;r  %s entschieden');
@define('IMAGE_SIZE', 'Bildgr&ouml;&szlig;e');
@define('IMAGE_AS_A_LINK', 'Bild als Link');
@define('POWERED_BY', 'Powered by');
@define('SUPERUSER', 'Besitzer login');
@define('TRACKBACKS', 'Trackbacks');
@define('TRACKBACK', 'Trackback');
@define('NO_TRACKBACKS', 'Keine Trackbacks');
@define('TOPICS_OF', 'Themen in');
@define('VIEW_FULL', 'ganz anzeigen');
@define('VIEW_TOPICS', '&Uuml;berschriften anzeigen');
@define('AT', 'um');
@define('SET_AS_TEMPLATE', 'Als Template w&auml;hlen');
@define('VIEW_EXTENDED_ENTRY', 'Gesamten Beitrag ansehen');
@define('IN', 'in');
@define('EXCERPT', 'Auszug');
@define('TRACKED', 'Aufgenommen');
@define('LINK_TO_ENTRY', 'Link zum Eintrag');
@define('LINK_TO_REMOTE_ENTRY', 'Link zum Remote-Eintrag');
@define('IP_ADDRESS', 'IP-Adresse');
@define('USER', 'Benutzer');
@define('THUMBNAIL_USING_OWN', 'Using %s as it\'s own thumbnail because it is so small already.');
@define('THUMBNAIL_FAILED_COPY', 'Wanted to use %s as it\'s own thumbnail, but failed to copy!');
@define('AUTHOR', 'Author');
@define('LAST_UPDATED', 'Zuletzt aktualisiert');
@define('TRACKBACK_SPECIFIC', 'Trackback f&uuml;r spezifische URI dieses Eintrags');
@define('DIRECT_LINK', 'Direkter Link zu diesem Eintrag');
@define('COMMENT_ADDED', 'Dein Kommentar wurde hinzugefügt. Klick %shier um zu den Kommentaren zur&uuml;ckzukehren%s und %shier um das Fenster zu schlie&szlig;en%s.');
@define('COMMENTS_DISABLE', 'Kommentare für diesen Eintrag nicht mehr zulassen');
@define('COMMENTS_ENABLE', 'Kommentare für diesen Eintrag zulassen');
@define('COMMENTS_CLOSED', 'Die Kommentarfunktion wurde vom Besitzer dieses Blogs in diesem Eintrag deaktiviert.');
@define('COMMENT_NOT_ADDED', 'Dein Kommentar wurde nicht hinzugefügt, da der Eintrag geschlossen wurde. Klick %shier um zu den Kommentaren zur&uuml;ckzukehren%s und %shier um das Fenster zu schlie&szlig;en%s.');
@define('EMPTY_COMMENT', 'Dein Kommentar enthielt nichts, bitte %sgeh zur&uuml;ck%s und versuch\'s nochmal');
@define('ENTRIES_FOR', 'Eintr&auml;ge am %s');
@define('TOPICS_FOR', 'Themen am %s');
@define('DOCUMENT_NOT_FOUND', 'Das Dokument %s wurde nicht gefunden.');
@define('USERNAME', 'Benutzername');
@define('PASSWORD', 'Passwort');
@define('SERENDIPITY_INSTALLATION', 'Serendipity-Installation');
@define('LEFT', 'links');
@define('RIGHT', 'rechts');
@define('HIDDEN', 'versteckt');
@define('REMOVE_TICKED_PLUGINS', 'Markierte plugins entfernen');
@define('SAVE_CHANGES_TO_LAYOUT', '&Auml;nderungen am Layout speichern');
@define('COMMENTS_FROM', 'Kommentare von');
@define('ERROR', 'Fehler');
@define('ENTRY_SAVED', 'Eintrag gespeichert');
@define('DELETE_SURE', 'Soll #%s permanent gelöscht werden?');
@define('NOT_REALLY', 'Nicht wirklich...');
@define('DUMP_IT', 'Hinfort damit!');
@define('RIP_ENTRY', 'Ruhe in Frieden, #%s');
@define('CATEGORY_DELETED', 'Kategorie #%s wurde gelöscht. Alte Artikel in dieser Kategorie nach %s verschoben');
@define('CATEGORY_REMAINING', 'Alte Artikel in dieser Kategorie (falls vorhanden) nach #%s verschieben.');
@define('INVALID_CATEGORY', 'Es wurde keine Kategorie zum löschen gewählt.');
@define('CATEGORY_SAVED', 'Kategorie gespeichert');
@define('SELECT_TEMPLATE', 'Wählen Sie das Template für Ihr blog');
@define('ENTRIES_SUCCESSFULLY_INSERTED', 'Einträge erfolgreich importiert!');
@define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Einträge konnten nicht importiert werden!');
@define('VIEW_FEED_EXPORT', 'Feed einsehen');
@define('IMPORT', 'Import');
@define('EXPORT', 'Export');
@define('YES', 'Ja');
@define('NO', 'Nein');
@define('CHECK_N_SAVE', 'Testen &amp; speichern');
@define('DIRECTORY_NOT_EXISTANT', 'Verzeichnis %s existiert nicht. Bitte legen Sie es an!');
@define('DIRECTORY_WRITE_ERROR', 'Keine Schreibrechte für Verzeichnis %s. Bitte korrigieren');
@define('DIRECTORY_CREATE_ERROR', 'Verzeichnis %s existiert nicht und konnte nicht erstellt werden. Bitte legen Sie es manuell an.');
@define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; führen Sie <i>%s %s</i> aus!');
@define('CANT_EXECUTE_BINARY', 'Kann die \'%s\'-Datei nicht ausführen');
@define('FILE_WRITE_ERROR', 'Datei %s kann nicht geschrieben werden.');
@define('FILE_CREATE_YOURSELF', ' Bitte die Datei manuell anlegen oder Dateirechte korrigieren.');
@define('COPY_CODE_BELOW', '<br />* Kopieren Sie den folgenden Code in die Datei %s Ihres %s Verzeichnisses:<b><pre>%s</pre></b>' . "\n");
@define('WWW_USER', 'Ersetzen Sie \'www\' mit dem User, als der Ihr Webserver läuft. (z.B. \'nobody\')');
@define('BROWSER_RELOAD', 'Danach aktualisieren Sie bitte diese Seite in Ihrem Browser');
@define('DIAGNOSTIC_ERROR', 'Bei der Einrichtung Ihrer Installation traten einige Fehler auf:');
@define('ALL_VALID', 'Alle Eintragungen scheinen korrekt zu sein.');
@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity ist noch nicht eingerichtet. Bitte jetzt <a href="%s">installieren</a>.');
@define('INCLUDE_ERROR', 'serendipity Fehler: Kann Datei %s nicht einbinden - wird beendet.');
@define('DATABASE_ERROR', 'serendipity Fehler: Kann keine Verbindung zur Datenbank herstellen - wird beendet.');
@define('ATTEMPT_SETUP_DATABASE', 'Probiere Datenbank einzurichten...');
@define('CHECK_DATABASE_EXISTS', 'Checking to see if the database is already in place.  If you see a database query error here, ignore it...');
@define('CREATE_DATABASE', 'Richte Datenbank ein...');
@define('DATABASE_DONE', 'Einrichtung der Datenbank abgeschlossen.');
@define('ATTEMPT_WRITE_FILE', 'Probiere die Datei %s zu erstellen...');
@define('SERENDIPITY_INSTALLED', '%sSerendipity wurde erfolgreich aufh Ihrem System eingerichtet.%s Bitte merken Sie sich Ihr Passwort: "%s", Ihr Benutzername ist "%s".%sSie können Ihr neues PHP blog <a href="%s">genau hier</a> finden');
@define('WRITTEN_N_SAVED', 'Konfiguration geschrieben und gesichert');
@define('IMAGE_ALIGNMENT', 'Bildausrichtung');
@define('ENTER_NEW_NAME', 'Bitte einen neuen Namen eingeben für: ');
@define('IMAGE_MANAGER', 'Bildmanager');
@define('RESIZING', 'Anpassung der Bildgröße');
@define('RESIZE_DONE', 'Fertig (%s Bildgrößen angepaßt).');
@define('DELETE_IMAGE', 'Bild namens <b>%s</b> gelöscht');
@define('DELETE_IMAGE_FAIL' , 'Kann Bild namens <b>%s</b> nicht löschen');
@define('DELETE_THUMBNAIL', 'Vorschaubilder zu <b>%s</b> gelöscht');
@define('FILE_NOT_FOUND', 'Die Datei namens <b>%s</b> kann nicht gefunden werden, vielleicht wurde sie schon gelöscht?');
@define('ABOUT_TO_DELETE_FILE', 'Sie sind dabei die Datei <b>%s</b> zu löschen.<br />Wenn Sie das Bild in einem Ihrer Einträge verwenden, wird das Löschen Lücken erzeugen.<br />Soll trotzdem fortgefahren werden?<br /><br />');
@define('IMAGE_FULLSIZE', 'Vollbild');
@define('IMAGE_RENAME', 'Bild umbenennen');
@define('IMAGE_RESIZE', 'Bildgröße ändern');
@define('IMAGE_DELETE', 'Bild löschen');
@define('ABORT_NOW', 'Abbrechen');
@define('REMOTE_FILE_NOT_FOUND', 'Die Datei konnte auf dem Server nicht gefunden werden, sind Sie sich dass die URL <b>%s</b> korrekt ist?');
@define('FILE_FETCHED', '%s geladen');
@define('FILE_UPLOADED', 'Datei %s erfolgreich hochgeladen');
@define('WORD_OR', 'Oder');
@define('SCALING_IMAGE', 'Ändere Größe von %s nach %s x %s px');
@define('KEEP_PROPORTIONS', 'Proportionen beibehalten');
@define('REALLY_SCALE_IMAGE', 'Bildgröße wirklich verändert? Kein zurück!');
@define('RUNNING', 'Sie benutzen serendipity v.');
@define('TOGGLE_ALL', 'Alle Optionen ein-/ausblenden');
@define('TOGGLE_OPTION', 'Option ein-/ausblenden');
@define('SUBSCRIBE_TO_THIS_ENTRY', 'Bei Aktualisierung dieser Kommentare benachrichtigen');
@define('UNSUBSCRIBE_OK', 'TRANSLATE_ME');
@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Benachrichtigung zu neuem Kommentar des Eintrags "%s"');
@define('SUBSCRIPTION_MAIL', "Hallo %s,\n\nEin neues Kommentar wurde dem Eintrag hinzugefügt, den Sie auf \"%s\" namens \"%s\" finden.\nDer Name des Autoren ist: %s\n\nSie können den Eintrag hier finden: %s\n\nSie können diese Benachrichtung mit folgender URL kündigen: %s\n");
@define('SUBSCRIPTION_TRACKBACK_MAIL', "Hallo %s,\n\nEin neues Trackback wurde dem Eintrag hinzugefügt, den Sie auf \"%s\" namens \"%s\" finden.\nDer Name des Autoren ist: %s\n\nSie können den Eintrag hier finden: %s\n\nSie können diese Benachrichtung mit folgender URL kündigen: %s\n");
@define('SIGNATURE', "\n-- \n%s wird betrieben mit Serendipity.\nDas allerbeste blog, Sie können es auch nutzen.\nWie das geht, sehen Sie auf <http://s9y.org>.");
@define('DATABASE_ALREADY_INSTALLED', 'ÜBERSPRUNGEN: Datenbank besteht bereits');
@define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
@define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
@define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 Kommentar');
@define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Feld "managingEditor"');
@define('SYNDICATION_PLUGIN_WEBMASTER',  'Feld "webMaster"');
@define('SYNDICATION_PLUGIN_BANNERURL', 'Bild für den RSS feed');
@define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Breite des Bildes');
@define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Höhe des Bildes');
@define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'E-Mail Adresse des Webmasters, falls vorhanden. (leer: nicht verwenden) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', 'E-Mail Adresse des verantwortlichen Editors, falls vorhanden. (leer: nicht verwenden) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_BANNERURL_DESC', 'URL für ein Bild im GIF/JPEG/PNG Format, falls vorhanden. (leer: serendipity-Logo)');
@define('SYNDICATION_PLUGIN_BANNERWIDTH_DESC', 'in Pixeln, max. 144');
@define('SYNDICATION_PLUGIN_BANNERHEIGHT_DESC', 'in Pixeln, max. 400');
@define('SYNDICATION_PLUGIN_TTL', 'Feld "ttl" (time-to-live)');
@define('SYNDICATION_PLUGIN_TTL_DESC', 'Anzahl von Minuten, nachdem Ihr Blog von fremden Seiten nicht mehr gecached werden sollte (leer: nicht verwenden) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_PUBDATE', 'Feld "pubDate"');
@define('SYNDICATION_PLUGIN_PUBDATE_DESC', 'Soll das "pubDate"-Feld für den RSS-Kanal eingebettet werden, um das Datum des letzten Eintrags zu enthalten?');
@define('CONTENT', 'Inhalt');
@define('TYPE', 'Typ');
@define('DRAFT', 'Entwurf');
@define('PUBLISH', 'Ver&ouml;ffentlichung');
@define('PREVIEW', 'Vorschau');
@define('DATE', 'Datum');
@define('DATE_FORMAT_2', 'Y-m-d H:i'); // Needs to be ISO 8601 compliant for date conversion!
@define('DATE_INVALID', 'Warnung: Das Datum, welches Sie für den Artikel angegeben haben ist ungültig. Es muss dem Format JJJJ-MM-TT SS:MM entsprechen.');
@define('CATEGORY_PLUGIN_DESC', 'Zeigt eine Liste der Kategorien');
@define('ALL_AUTHORS', 'Alle Autoren');
@define('CATEGORIES_TO_FETCH', 'Quelle der Kategorien');
@define('CATEGORIES_TO_FETCH_DESC', 'Kategorien welcher Autoren einbeziehen?');
@define('PAGE_BROWSE', 'Seite %s von %s, insgesamt %s Einträge');
@define('PREVIOUS_PAGE', 'vorige Seite');
@define('NEXT_PAGE', 'nächste Seite');
@define('ALL_CATEGORIES', 'Alle Kategorien');
@define('DO_MARKUP', 'Textformatierung(en) durchführen');
@define('DO_MARKUP_DESCRIPTION', 'Textformatierung(en) durchführen, wie z.B. Smilies, Schnellformatierung via *, /, _, ...). Dadurch wird jeglicher eingegebener HTML-Code beibehalten. Standardmäßig sind Textformatierungen aktiviert.');
@define('AUTOMATIC_LOGIN', 'Daten speichern');
@define('RECENTENTRIES_PLUGIN_TITLE', 'Aktuelle Einträge');
@define('RECENTENTRIES_PLUGIN_BLAHBLAH', 'Zeigt die Titel der aktuellsten Einträge mit Datum');
@define('RECENTENTRIES_PLUGIN_NUMBER', 'Anzahl der Einträge');
@define('RECENTENTRIES_PLUGIN_NUMBER_BLAHBLAH', 'Wieviele Einträge sollen angezeigt werden? (Standard: 10)');
@define('COMMENTS_PLUGIN_BLAHBLAH', 'Zeigt die letzten Kommentare');
@define('COMMENTS_PLUGIN_WORDWRAP', 'Zeilenumbruch');
@define('COMMENTS_PLUGIN_WORDWRAP_BLAHBLAH', 'Nach wievielen Wörtern soll ein Zeilenumbruch eingefügt werden? (Standard: 30)');
@define('COMMENTS_PLUGIN_MAXCHARS', 'Zeichen pro Kommentar');
@define('COMMENTS_PLUGIN_MAXCHARS_BLAHBLAH', 'Wieviele Zeichen sollen pro Kommentar gezeigt werden? (Standard: 120)');
@define('COMMENTS_PLUGIN_MAXENTRIES', 'Anzahl an Kommentaren');
@define('COMMENTS_PLUGIN_MAXENTRIES_BLAHBLAH', 'Wieviele Kommentare sollen gezeigt werden? (Standard: 15)');
@define('GENERAL_PLUGIN_DATEFORMAT', 'Datumsformat');
@define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Das Datumsformat des Eintrages, mithilfe von PHPs strftime() Variablen. (Standard: "%s")');
@define('GENERAL_PLUGIN_LANGUAGE', 'Anzeigesprache');
@define('GENERAL_PLUGIN_LANGUAGE_BLAHBLAH', 'In welcher Sprache soll das Datum formatiert werden? ("en|de", Standard "en")');
@define('ERROR_TEMPLATE_FILE', 'Die Templatedatei konnte nicht geöffnet werden, bitte die serendipity-Version aktualisieren!');
@define('ADVANCED_OPTIONS', 'Erweiterte Optionen');
@define('PING_WEBLOGS', 'Einträge ankündigen (via XML-RPC ping) bei:');
@define('SENDING_PING', 'Sende XML-RPC ping zu %s');
@define('EDIT_ENTRY', 'Eintrag bearbeiten');

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

--- NEW FILE: serendipity_lang_en.inc.php ---
<?php # $Id: serendipity_lang_en.inc.php,v 1.1 2004/01/21 18:28:25 tomsommer Exp $

##########################################################################
# serendipity - another blogger...                                       #
##########################################################################
#                                                                        #
# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
# http://www.jannis.to/programming/serendipity.html                      #
#                                                                        #
##########################################################################

// English language file
if (!isset($serendipity['months'])) {
    $serendipity['months']  = array('J...@ha...', 'January', 'February', 'March',
                        'April', 'May', 'June', 'July', 'August', 'September',
                        'October', 'November', 'December');
}

if (!isset($serendipity['weekDayAbb'])) {
    $serendipity['weekDayAbb'] = array('M', 'Tu', 'W', 'Th', 'F', 'Sa', 'Su');
}

@define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administration Suite');
@define('HAVE_TO_BE_LOGGED_ON', 'You have to be logged on to view this page:');
@define('APPEARANCE', 'Appearance');
@define('MANAGE_STYLES', 'Manage styles');
@define('CONFIGURE_PLUGINS', 'Configure Plugins');
@define('ADMIN', 'Admin:');
@define('CONFIGURATION', 'Configuration');
@define('IMPORT_EXPORT_ENTRIES', 'Import/Export Entries');
@define('BACK_TO_BLOG', 'Back to Weblog');
@define('LOGIN', 'Login');
@define('LOGOUT', 'Logout');
@define('LOGGEDOUT', 'Logged out.');
@define('CREATE_NEW_CAT', 'Create a New Category');
@define('CREATE', 'Create');
@define('EDIT_THIS_CAT', 'Editing "%s - %s"');
@define('SAVE', 'Save');
@define('NAME', 'Name');
@define('DESCRIPTION', 'Description');
@define('CLICK_CAT_TO_EDIT', 'Click on a category to edit it');
@define('CREATE_NEW_CAT', 'Create New Category');
@define('SELECT_IMAGE', 'Select an image');
@define('I_WANT_THUMB', 'I want to use the thumbnail in my entry.');
@define('I_WANT_BIG_IMAGE', 'I want to use the larger image in my entry.');
@define('I_WANT_NO_LINK', ' I  want to display it as an image');
@define('I_WANT_IT_TO_LINK', 'I want to display it as a link to this url:');
@define('BACK', 'Back');
@define('FORWARD', 'Forward');
@define('ANONYMOUS', 'Anonymous');
@define('LINK_TO_COMMENT', 'Link to comment #');
@define('SEND_MAIL_TO', 'Send a mail to');
@define('NEW_TRACKBACK_TO', 'New trackback made to');
@define('NEW_COMMENT_TO', 'New comment posted to');
@define('RECENT', 'Recent...');
@define('OLDER', 'Older...');
@define('DONE', 'Done');
@define('CLICK_IMAGE_TO_INSERT', 'Click the image you want to insert:');
@define('WELCOME_BACK', 'Welcome back,');
@define('RUNNING', 'You are running Serendipity v.');
@define('ADD_PLUGIN', 'Add plugin');
@define('TITLE', 'Title');
@define('PLUGIN', 'Plugin');
@define('DESCRIPTION', 'Description');
@define('PLACEMENT', 'Placement');
@define('DELETE', 'Delete');
@define('SAVE', 'Save');
@define('SELECT_A_PLUGIN_TO_ADD', 'Select a plugin to add');
@define('UP', 'UP');
@define('DOWN', 'DOWN');
@define('ENTRIES', 'Entries:');
@define('NEW_ENTRY', 'New entry');
@define('AUTHOR_SUITE', 'Authoring Suite');
@define('EDIT_ENTRIES', 'Edit entries');
@define('DELETE_ENTRIES', 'Delete entries');
@define('CATEGORIES', 'Categories');
@define('EDIT_CATEGORIES', 'Manage Categories');
@define('IMAGES', 'Images:');
@define('ADD_IMAGES', 'Add images');
@define('WARNING_THIS_BLAHBLAH', "WARNING:\\nThis may take a long time if there are many images without thumbnails.");
@define('CREATE_THUMBS', 'Rebuild Thumbs');
@define('MANAGE_IMAGES', 'Manage images');
@define('ADMIN_INTERFACE', 'Admin interface');
@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Authoring Suite');
@define('NAME', 'Name');
@define('EMAIL', 'Email');
@define('HOMEPAGE', 'Homepage');
@define('COMMENT', 'Comment');
@define('REMEMBER_INFO', 'Remember Information? ');
@define('SUBMIT_COMMENT', 'Submit Comment');
@define('NO_ENTRIES_TO_PRINT', 'No entries to print.');
@define('COMMENTS', 'Comments');
@define('ADD_COMMENT', 'Add Comment');
@define('NO_COMMENTS', 'No comments.');
@define('POSTED_BY', 'Posted by');
@define('TRACKBACK_FROM', 'Trackback from');
@define('ON', 'on');
@define('A_NEW_COMMENT_BLAHBLAH', 'A new comment has been posted on your blog "%s", in the entry entitled "%s".');
@define('A_NEW_TRACKBACK_BLAHBLAH', 'A new trackback has been made to your blog-entry entitled "%s".');
@define('NO_CATEGORY', 'No Category');
@define('ENTRY_BODY', 'Entry Body');
@define('EXTENDED_BODY', 'Extended Body');
@define('CATEGORY', 'Category:');
@define('TEMPLATE_NAME', 'template name');
@define('CHOOSE_STYLESHEET', 'Choose a style sheet....');
@define('EDIT', 'Edit');
@define('MAKE_DEFAULT', 'Make default');
@define('CREATE_NEW_STYLESHEET', 'Create New StyleSheet');
@define('NO_ENTRIES_BLAHBLAH', 'No Entries Found for Query %s' . "\n");
@define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Your search for %s returned %s results:');
@define('SEARCH_TOO_SHORT', 'Your search-query must be longer than 3 characters');
@define('IMAGE', 'Image');
@define('ERROR_FILE_NOT_EXISTS', 'Error: Old filename doesn\'t exist!');
@define('ERROR_FILE_EXISTS', 'Error: New filename already used, pick another!');
@define('ERROR_SOMETHING', 'Error: Something\'s wrong.');
@define('ADDING_IMAGE', 'Adding image...');
@define('THUMB_CREATED_DONE', 'Thumbnail created.<br>Done.');
@define('ERROR_FILE_EXISTS_ALREADY', 'Error: File already exists on your machine!');
@define('ERROR_UNKNOWNE_NOUPLOAD', 'Unknown error occured, file not uploaded...');
@define('ADD_IMAGE_BLAHBLAH', '<b>Add an image to your repository:</b><p>Here you can upload images, or tell me to fetch them from somewhere in the web! If you don\'t have appropriate images, search for images on google matching your thoughts. Try <a href="http://images.google.com" target="_blank">Google\'s image search</a>, the results are often useful and always funny :)<p><b>Select method:</b><br>');
@define('ENTER_IMAGE_URL', 'Enter an URL of an image to fetch:');
@define('ENTER_IMAGE_TO_UP', 'Select an image you wish to upload:');
@define('GO', 'Go!');
@define('NEWSIZE', 'New size: ');
@define('RESIZE_BLAHBLAH', '<b>Resize %s</b><p>');
@define('ORIGINAL_SIZE', 'Original size: <i>%sx%s</i> pixel');
@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Here you can adjust the images new size. If you want to keep the proportions, just enter one value and press the TAB key, I\'ll automatically calculate the new size so the proportions  one value and press the TAB key, I\'ll automatically calculate the new size so the proportions don\'t get messed up:');
@define('DATE_FORMAT_1', 'l, F jS Y');
@define('CALENDAR', 'Calendar');
@define('QUICKJUMP_CALENDAR', 'QuickJump Calendar');
@define('QUICKSEARCH', 'Quicksearch');
@define('SEARCH_FOR_ENTRY', 'Search for an entry');
@define('ARCHIVES', 'Archives');
@define('BROWSE_ARCHIVES', 'Browse archives by month');
@define('TOP_REFERRER', 'Top Referrers');
@define('SHOWS_TOP_SITES', 'Shows top sites that linked to your blogs');
@define('TOP_EXITS', 'Top Exits');
@define('SHOWS_TOP_EXIT', 'Shows top exit links from your blogs');
@define('SYNDICATION', 'Syndication');
@define('SHOWS_RSS_BLAHBLAH', 'Shows RSS syndication links');
@define('ALLOWS_YOU_BLAHBLAH', 'Allows you to configure and publish your blog');
@define('PLUG', 'Plug');
@define('ADVERTISES_BLAHBLAH', 'Advertises the origins of your blog');
@define('HTML_NUGGET', 'HTML Nugget');
@define('HOLDS_A_BLAHBLAH', 'Holds a nugget of HTML in your sidebar');
@define('TITLE_FOR_NUGGET', 'Title for the nugget');
@define('THE_NUGGET', 'The Nugget of HTML!');
@define('SYNDICATE_THIS_BLOG', 'Syndicate This Blog');
@define('QUICKJUMP', 'Quickjump');
@define('YOU_CHOSE', 'You chose %s');
@define('IMAGE_SIZE', 'Image size');
@define('IMAGE_AS_A_LINK', 'Image insertion');
@define('POWERED_BY', 'Powered by');
@define('SUPERUSER', 'Superuser');
@define('TRACKBACKS', 'Trackbacks');
@define('TRACKBACK', 'Trackback');
@define('NO_TRACKBACKS', 'No Trackbacks');
@define('TOPICS_OF', 'Topics of');
@define('VIEW_FULL', 'view full');
@define('VIEW_TOPICS', 'view topics');
@define('AT', 'at');
@define('SET_AS_TEMPLATE', 'Set as template');
@define('VIEW_EXTENDED_ENTRY', 'View Extended Entry');
@define('IN', 'in');
@define('EXCERPT', 'Excerpt');
@define('TRACKED', 'Tracked');
@define('LINK_TO_ENTRY', 'Link to entry');
@define('LINK_TO_REMOTE_ENTRY', 'Link to remote-entry');
@define('IP_ADDRESS', 'IP-address');
@define('USER', 'User');
@define('THUMBNAIL_USING_OWN', 'Using %s as it\'s own thumbnail because it is so small already.');
@define('THUMBNAIL_FAILED_COPY', 'Wanted to use %s as it\'s own thumbnail, but failed to copy!');
@define('AUTHOR', 'Author');
@define('LAST_UPDATED', 'Last Updated');
@define('TRACKBACK_SPECIFIC', 'Trackback specific URI for this entry');
@define('DIRECT_LINK', 'Direct link to this entry');
@define('COMMENT_ADDED', 'Your comment was successfully added. Click %shere to return%s to the comments, and %shere to close%s this window.');
@define('COMMENT_NOT_ADDED', 'Your comment could not be added, because comments for this entry has been disabled. Click %shere to return%s to the comments, and %shere to close%s this window.');
@define('COMMENTS_DISABLE', 'Do not allow comments to this entry');
@define('COMMENTS_ENABLE', 'Allow comments to this entry');
@define('COMMENTS_CLOSED', 'The author has not allowed comments to this entry');
@define('EMPTY_COMMENT', 'Your comment did not contain anything, please %sgo back%s and try again');
@define('ENTRIES_FOR', 'Entries for %s');
@define('TOPICS_FOR', 'Topics for %s');
@define('DOCUMENT_NOT_FOUND', 'The document %s was not found.');
@define('USERNAME', 'Username');
@define('PASSWORD', 'Password');
@define('AUTOMATIC_LOGIN', 'Save information');
@define('SERENDIPITY_INSTALLATION', 'Serendipity installation');
@define('LEFT', 'left');
@define('RIGHT', 'right');
@define('HIDDEN', 'hidden');
@define('REMOVE_TICKED_PLUGINS', 'Remove ticked plugins');
@define('SAVE_CHANGES_TO_LAYOUT', 'Save changes to layout');
@define('COMMENTS_FROM', 'Comments from');
@define('ERROR', 'Error');
@define('ENTRY_SAVED', 'Entry saved');
@define('DELETE_SURE', 'Are you sure you want to delete #%s permanently?');
@define('NOT_REALLY', 'Not really...');
@define('DUMP_IT', 'Dump it!');
@define('RIP_ENTRY', 'R.I.P. entry #%s');
@define('CATEGORY_DELETED', 'Category #%s deleted. Old articles moved to category #%s');
@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category: %s');
@define('INVALID_CATEGORY', 'No category was provided for deletion');
@define('CATEGORY_SAVED', 'Category saved');
@define('SELECT_TEMPLATE', 'Select the template you wish to use for your blog');
@define('ENTRIES_SUCCESSFULLY_INSERTED', 'Entries successfully inserted!');
@define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Entries were not successfully inserted!');
@define('VIEW_FEED_EXPORT', 'View feed export');
@define('IMPORT', 'Import');
@define('EXPORT', 'Export');
@define('YES', 'Yes');
@define('NO', 'No');
@define('CHECK_N_SAVE', 'Check &amp; save');
@define('DIRECTORY_NOT_EXISTANT', 'Directory %s does not exist. Create it!');
@define('DIRECTORY_WRITE_ERROR', 'Can\'t write to directory %s. Check permissions.');
@define('DIRECTORY_CREATE_ERROR', 'Directory %s does not exist and could not be created. Please manually create the directory');
@define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; run <i>%s %s</i>');
@define('CANT_EXECUTE_BINARY', 'Can\'t execute the %s binary');
@define('FILE_WRITE_ERROR', 'Can\'t write to file %s.');
@define('FILE_CREATE_YOURSELF', 'Please create the file yourself or check permissions');
@define('COPY_CODE_BELOW', '<br />* Just copy the code below and place it in %s in your %s folder:<b><pre>%s</pre></b>' . "\n");
@define('WWW_USER', 'Change www to the user apache runs as (i.e. nobody).');
@define('BROWSER_RELOAD', 'Once you\'ve done this, hit your browser\'s "reload" button.');
@define('DIAGNOSTIC_ERROR', 'We detected some errors while running some diagnostics on your entered information:');
@define('ALL_VALID', 'All entered information appears to be valid.');
@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity is not yet installed. Please <a href="%s">install</a> it now.');
@define('INCLUDE_ERROR', 'serendipity error: could not include %s - exiting.');
@define('DATABASE_ERROR', 'serendipity error: unable to connect to database - exiting.');
@define('ATTEMPT_SETUP_DATABASE', 'Attemping to setup database...');
@define('CHECK_DATABASE_EXISTS', 'Checking to see if the database is already in place.  If you see a database query error here, ignore it...');
@define('CREATE_DATABASE', 'Creating default database setup...');
@define('DATABASE_DONE', 'Done creating database');
@define('ATTEMPT_WRITE_FILE', 'Attemping to write %s file...');
@define('SERENDIPITY_INSTALLED', '%sSerendipity was successfully installed on your system.%s Please remember your password: "%s", your username is "%s".%sYou can find your new PHP blog <a href="%s">right here</a>');
@define('WRITTEN_N_SAVED', 'Configuration written &amp; saved');
@define('IMAGE_ALIGNMENT', 'Image alignment');
@define('ENTER_NEW_NAME', 'Enter the new name for: ');
@define('IMAGE_MANAGER', 'Image Manager');
@define('RESIZING', 'Resizing');
@define('RESIZE_DONE', 'Done (resized %s images).');
@define('DELETE_IMAGE', 'Deleted the image entitled <b>%s</b>');
@define('DELETE_IMAGE_FAIL' , 'Unable to delete image <b>%s</b>');
@define('DELETE_THUMBNAIL', 'Deleted the image thumbnail entitled <b>%s</b>');
@define('FILE_NOT_FOUND', 'Unable to locate the file entitled <b>%s</b>, maybe it has already been deleted?');
@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead images<br />Are you sure you wish to proceed?<br /><br />');
@define('IMAGE_FULLSIZE', 'Fullsize');
@define('IMAGE_RENAME', 'Rename this image');
@define('IMAGE_RESIZE', 'Resize this image');
@define('IMAGE_DELETE', 'Delete this image');
@define('ABORT_NOW', 'Abort now');
@define('REMOTE_FILE_NOT_FOUND', 'File was not located on the remote server, are you sure the URL: <b>%s</b> is correct?');
@define('FILE_FETCHED', '%s fetched');
@define('FILE_UPLOADED', 'File %s successfully uploaded');
@define('WORD_OR', 'Or');
@define('SCALING_IMAGE', 'Scaling %s to %s x %s px');
@define('KEEP_PROPORTIONS', 'Keep proportions');
@define('REALLY_SCALE_IMAGE', 'Really scale the image? No way back!');
@define('TOGGLE_ALL', 'Toggle expand all');
@define('TOGGLE_OPTION', 'Toggle option');
@define('SUBSCRIBE_TO_THIS_ENTRY', 'Subscribe to this entry');
@define('UNSUBSCRIBE_OK', "%s is now unsubscribed from this entry");
@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'New comment to subscribed entry "%s"');
@define('SUBSCRIPTION_MAIL', "Hello %s,\n\nA new comment was made to the entry you are monitoring on \"%s\", entitled \"%s\"\nThe name of the poster is: %s\n\nYou can find the entry here: %s\n\nYou can unsubscribe by clicking on this link: %s\n");
@define('SUBSCRIPTION_TRACKBACK_MAIL', "Hello %s,\n\nA new trackback was added to the entry you are monitoring on \"%s\", entitled \"%s\"\nThe name of the poster is: %s\n\nYou can find the entry here: %s\n\nYou can unsubscribe by clicking on this link: %s\n");
@define('SIGNATURE', "\n-- \n%s is powered by Serendipity.\nThe best blog around, you can use it too.\nCheck out <http://s9y.org> to find out how.");
@define('DATABASE_ALREADY_INSTALLED', 'SKIPPED: Database already installed');
@define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
@define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
@define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 comments');
@define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Field "managingEditor"');
@define('SYNDICATION_PLUGIN_WEBMASTER',  'Field "webMaster"');
@define('SYNDICATION_PLUGIN_BANNERURL', 'Image for the RSS feed');
@define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Image width');
@define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Image height');
@define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'E-Mail address of the webmaster, if available. (empty: hidden) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', 'E-Mail address of the managing editor, if available. (empty: hidden) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_BANNERURL_DESC', 'URL of an image in GIF/JPEG/PNG format, if available. (empty: serendipity-logo)');
@define('SYNDICATION_PLUGIN_BANNERWIDTH_DESC', 'in pixels, max. 144');
@define('SYNDICATION_PLUGIN_BANNERHEIGHT_DESC', 'in pixels, max. 400');
@define('SYNDICATION_PLUGIN_TTL', 'Field "ttl" (time-to-live)');
@define('SYNDICATION_PLUGIN_TTL_DESC', 'Amount of minutes after which your blog should not be cached any more by foreign sites/applications (empty: hidden) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_PUBDATE', 'Field "pubDate"');
@define('SYNDICATION_PLUGIN_PUBDATE_DESC', 'Should the "pubDate"-field be embedded for a RSS-channel, to show the date of the latest entry?');
@define('CONTENT', 'Content');
@define('TYPE', 'Type');
@define('DRAFT', 'Draft');
@define('PUBLISH', 'Publish');
@define('PREVIEW', 'Preview');
@define('DATE', 'Date');
@define('DATE_FORMAT_2', 'Y-m-d H:i'); // Needs to be ISO 8601 compliant for date conversion!
@define('DATE_INVALID', 'Warning: The date you specified was invalid. It has to be given in YYYY-MM-DD HH:MM format.');
@define('CATEGORY_PLUGIN_DESC', 'Shows the list of categories.');
@define('ALL_AUTHORS', 'All authors');
@define('CATEGORIES_TO_FETCH', 'Categories to fetch');
@define('CATEGORIES_TO_FETCH_DESC', 'Fetch categories from which author?');
@define('PAGE_BROWSE', 'Page %s of %s, totalling %s entries');
@define('PREVIOUS_PAGE', 'previous page');
@define('NEXT_PAGE', 'next page');
@define('ALL_CATEGORIES', 'All categories');
@define('DO_MARKUP', 'Perform Markup Transformations');
@define('DO_MARKUP_DESCRIPTION', 'Apply markup transformations to the text (smilies, shortcut markups via *, /, _, ...). Disabling this will preserve any HTML-code in the text. Default is "Yes".');
@define('RECENTENTRIES_PLUGIN_TITLE', 'Recent Entries');
@define('RECENTENTRIES_PLUGIN_BLAHBLAH', 'Shows the titles and dates of the most recent entries');
@define('RECENTENTRIES_PLUGIN_NUMBER', 'Number of entries');
@define('RECENTENTRIES_PLUGIN_NUMBER_BLAHBLAH', 'How many entries should be displayed? (Default: 10)');
@define('COMMENTS_PLUGIN_BLAHBLAH', 'Displays the last comments to your entries');
@define('COMMENTS_PLUGIN_WORDWRAP', 'Wordwrap');
@define('COMMENTS_PLUGIN_WORDWRAP_BLAHBLAH', 'How many words until a wordwrap will occur? (Default: 30)');
@define('COMMENTS_PLUGIN_MAXCHARS', 'Maximum chars per comment');
@define('COMMENTS_PLUGIN_MAXCHARS_BLAHBLAH', 'How many chars will be displayed for each comment? (Default: 120)');
@define('COMMENTS_PLUGIN_MAXENTRIES', 'Maximum number of comments');
@define('COMMENTS_PLUGIN_MAXENTRIES_BLAHBLAH', 'How many comments will be shown? (Default: 15)');
@define('GENERAL_PLUGIN_DATEFORMAT', 'Dateformatting');
@define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'The format of the entry\'s actual date, using PHPs strftime() variables. (Default: "%s")');
@define('GENERAL_PLUGIN_LANGUAGE', 'Output language');
@define('GENERAL_PLUGIN_LANGUAGE_BLAHBLAH', 'What is your output language used for date and text formatting? ("en|de", default "en")');
@define('ERROR_TEMPLATE_FILE', 'Unable to open template file, please update serendipity!');
@define('ADVANCED_OPTIONS', 'Advanced Options');
@define('PING_WEBLOGS', 'Announce entries (via XML-RPC ping) to:');
@define('SENDING_PING', 'Sending XML-RPC ping to host %s');
@define('EDIT_ENTRY', 'Edit entry');

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

--- NEW FILE: serendipity_lang_es.inc.php ---
<?php # $Id: serendipity_lang_es.inc.php,v 1.5

##########################################################################
# serendipity - another blogger...                                       #
##########################################################################
#                                                                        #
# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
# http://www.jannis.to/programming/serendipity.html                      #
#                                                                        #
# Translated by Luis Cervantes <Lui...@on...>                   #
# Traducido por Luis Cervantes <Lui...@on...>                   #
#                                                                        #
##########################################################################

// Spanish language file
if (!isset($serendipity['months'])) {
    $serendipity['months']  = array('J...@ha...', 'Enero', 'Febrero', 'Marzo',
                        'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre',
                        'Octubre', 'Noviembre', 'Diciembre');
}

if (!isset($serendipity['weekDayAbb'])) {
    $serendipity['weekDayAbb'] = array('L', 'M', 'X', 'J', 'V', 'S', 'D');
}

@define('SERENDIPITY_ADMIN_SUITE', 'Suite de Administración de Serendipity');
@define('HAVE_TO_BE_LOGGED_ON', 'Debes identificarte para ver esta pagina:');
@define('APPEARANCE', 'Apariencia');
@define('MANAGE_STYLES', 'Control de estilos');
@define('CONFIGURE_PLUGINS', 'Configurar Plugins');
@define('ADMIN', 'Admin:');
@define('CONFIGURATION', 'Configuración');
@define('IMPORT_EXPORT_ENTRIES', 'Importar/Exportar posts');
@define('BACK_TO_BLOG', 'Volver al weblog');
@define('LOGOUT', 'Salir');
@define('LOGGEDOUT', 'No identificado');
@define('CREATE_NEW_CAT', 'Crear una categoría nueva');
@define('CREATE', 'Crear');
@define('EDIT_THIS_CAT', 'Editar "%s - %s"');
@define('SAVE', 'Guardar');
@define('NAME', 'Nombre');
@define('DESCRIPTION', 'Descripción');
@define('CLICK_CAT_TO_EDIT', 'Haz click en una categoría para editarla');
@define('CREATE_NEW_CAT', 'Crear una categoría nueva');
@define('SELECT_IMAGE', 'Selecciona una imagen');
@define('I_WANT_THUMB', 'Quiero usar la miniatura en mi post.');
@define('I_WANT_BIG_IMAGE', 'Quiero usar la imagen más grande en mi post.');
@define('I_WANT_NO_LINK', ' Quiero que aparezca como una imagen');
@define('I_WANT_IT_TO_LINK', 'Quiero que aparezca como un enlace a esta url:');
@define('BACK', 'Atrás');
@define('FORWARD', 'Seguir');
@define('ANONYMOUS', 'Anónimo');
@define('LINK_TO_COMMENT', 'Enlace al comentario #');
@define('SEND_MAIL_TO', 'Enviar correo a');
@define('NEW_TRACKBACK_TO', 'Nuevo trackback para');
@define('NEW_COMMENT_TO', 'Comentario nuevo para');
@define('RECENT', 'Recientes..');
@define('OLDER', 'Antiguos..');
@define('DONE', 'Aplicar');
@define('CLICK_IMAGE_TO_INSERT', 'Haz click en la imagen que quieres insertar:');
@define('WELCOME_BACK', 'Bienvenido de nuevo,');
@define('RUNNING', 'Estas usando Serendipity v.');
@define('ADD_PLUGIN', 'Añadir plugin');
@define('TITLE', 'Titulo');
@define('PLUGIN', 'Plugin');
@define('DESCRIPTION', 'Descripción');
@define('PLACEMENT', 'Localización');
@define('DELETE', 'Borrar');
@define('SAVE', 'Guardar');
@define('SELECT_A_PLUGIN_TO_ADD', 'Selecciona el plugin que quieres añadir');
@define('UP', 'ARRIBA');
@define('DOWN', 'ABAJO');
@define('ENTRIES', 'Posts:');
@define('NEW_ENTRY', 'Post nuevo');
@define('AUTHOR_SUITE', 'Suite de autoría');
@define('EDIT_ENTRIES', 'Editar posts');
@define('DELETE_ENTRIES', 'Borrar posts');
@define('CATEGORIES', 'Categorías');
@define('EDIT_CATEGORIES', 'Control de Categorías');
@define('IMAGES', 'Imágenes:');
@define('ADD_IMAGES', 'Añadir imágenes');
@define('WARNING_THIS_BLAHBLAH', "ATENCIÓN:\\nPuede tardar si hay muchas imágenes que no están en miniatura.");
@define('CREATE_THUMBS', 'Crear las miniaturas');
@define('MANAGE_IMAGES', 'Control de imágenes');
@define('ADMIN_INTERFACE', 'Panel de Administración');
@define('SERENDIPITY_AUTHORING_SUITE', 'Suite de Serendipity para autoría ');
@define('NAME', 'Nombre');
@define('EMAIL', 'E-mail');
@define('HOMEPAGE', 'Url personal');
@define('COMMENT', 'Comentario');
@define('REMEMBER_INFO', '¿Recordar la información? ');
@define('SUBMIT_COMMENT', 'Mandar comentario');
@define('NO_ENTRIES_TO_PRINT', 'No hay posts.');
@define('COMMENTS', 'Comentarios');
@define('ADD_COMMENT', 'Añadir Comentario');
@define('NO_COMMENTS', 'No hay Comentarios.');
@define('POSTED_BY', 'Autor');
@define('TRACKBACK_FROM', 'Trackback desde');
@define('ON', 'activado');
@define('A_NEW_COMMENT_BLAHBLAH', 'Un nuevo comentario en el blog "%s", para el post "%s".');
@define('A_NEW_TRACKBACK_BLAHBLAH', 'Se ha realizado un nuevo trackback al post titulado "%s".');
@define('NO_CATEGORY', 'No existe la categoría');
@define('ENTRY_BODY', 'Texto del post');
@define('EXTENDED_BODY', 'Texto ampliado');
@define('CATEGORY', 'Categoría:');
@define('TEMPLATE_NAME', 'Nombre de la plantilla');
@define('CHOOSE_STYLESHEET', 'Selecciona una hoja de estilo..');
@define('EDIT', 'Editar');
@define('MAKE_DEFAULT', 'Predeterminado');
@define('CREATE_NEW_STYLESHEET', 'Crear una hoja nueva de estilos');
@define('NO_ENTRIES_BLAHBLAH', 'No se han encontrado resultados para el termino %s' . "\n");
@define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'La búsqueda para %s ha obtenido %s resultados:');
@define('SEARCH_TOO_SHORT', 'La búsqueda debe tener tres caracteres como mínimo ');
@define('IMAGE', 'Imagen');
@define('ERROR_FILE_NOT_EXISTS', 'Error: ¡El fichero no existe!');
@define('ERROR_FILE_EXISTS', 'Error: ¡Un archivo con ese nombre ya existe, selecciona otro!');
@define('ERROR_SOMETHING', 'Error: Algo esta mal.');
@define('ADDING_IMAGE', 'Añadiendo imagen..');
@define('THUMB_CREATED_DONE', 'Miniatura creada.<br>Terminado.');
@define('ERROR_FILE_EXISTS_ALREADY', 'Error: ¡El archivo ya existe en el sistema!');
@define('ERROR_UNKNOWNE_NOUPLOAD', 'Error desconocido, el archivo no ha sido transferido...');
@define('ADD_IMAGE_BLAHBLAH', '<b>Añade una imagen:</b><p>Aquí puedes subir tus imágenes o bien indicar la dirección url de una imagen para direccionarla. Si no tienes las imágenes adecuadas puedes buscar en <a href="http://images.google.es" target="_blank">Imágenes de Google</a>, los resultados no son siempre efectivos pero si divertidos :)<p><b>Selecciona un método:</b><br>');
@define('ENTER_IMAGE_URL', 'Introduce la URL de la imagen que quieres enlazar:');
@define('ENTER_IMAGE_TO_UP', 'Selecciona la imagen que deseas transferir:');
@define('GO', '¡Ir!');
@define('NEWSIZE', 'Nuevo tamaño: ');
@define('RESIZE_BLAHBLAH', '<b>Cambiar tamaño %s</b><p>');
@define('ORIGINAL_SIZE', 'Tamaño original: <i>%sx%s</i> pixel');
@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Aquí puedes ajustar el nuevo tamaño de la imagen. Si quieres mantener las proporciones solo introduce uno de los valores y presiona la tecla tabulador (TAB), de esta forma se ajustara automáticamente:');
@define('DATE_FORMAT_1', 'd.m.Y');
@define('CALENDAR', 'Calendario');
@define('QUICKJUMP_CALENDAR', 'Calendario Rápido');
@define('QUICKSEARCH', 'Buscar');
@define('SEARCH_FOR_ENTRY', 'Busca un post');
@define('ARCHIVES', 'Archivos');
@define('BROWSE_ARCHIVES', 'Archivos de otros meses');
@define('TOP_REFERRER', 'Sitios asociados');
@define('SHOWS_TOP_SITES', 'Muestra los sitios que enlazan a tu weblog');
@define('TOP_EXITS', 'Salídas');
@define('SHOWS_TOP_EXIT', 'Muestra las salídas más frecuentes de tu weblog');
@define('SYNDICATION', 'Sindicar');
@define('SHOWS_RSS_BLAHBLAH', 'Muestra los enlaces RSS de sindicacion');
@define('ALLOWS_YOU_BLAHBLAH', 'Te permite configurar y publicar el weblog');
@define('PLUG', 'Plug');
@define('ADVERTISES_BLAHBLAH', 'Informa del código en el que se basa tu weblog');
@define('HTML_NUGGET', 'Fragmento de HTML');
@define('HOLDS_A_BLAHBLAH', 'Prensenta un fragmento de HTML en la barra lateral');
@define('TITLE_FOR_NUGGET', 'Titulo para el fragmento de HTML');
@define('THE_NUGGET', '¡Fragmento de HTML!');
@define('SYNDICATE_THIS_BLOG', 'Sindicar');
@define('QUICKJUMP', 'Calendario');
@define('YOU_CHOSE', 'Eliges %s');
@define('IMAGE_SIZE', 'Tamaño de la imagen');
@define('IMAGE_AS_A_LINK', 'Inserción de imagen');
@define('POWERED_BY', 'Basado en');
@define('SUPERUSER', 'Super usuario');
@define('TRACKBACKS', 'Trackbacks');
@define('TRACKBACK', 'Trackback');
@define('NO_TRACKBACKS', 'No hay Trackbacks');
@define('TOPICS_OF', 'Temas de');
@define('VIEW_FULL', 'Ver mas');
@define('VIEW_TOPICS', 'Ver temas');
@define('AT', 'a las');
@define('SET_AS_TEMPLATE', 'Mantenlo como plantilla');
@define('VIEW_EXTENDED_ENTRY', 'Ver el post extendido');
@define('IN', 'en');
@define('EXCERPT', 'Segmento');
@define('TRACKED', 'Tracked');
@define('LINK_TO_ENTRY', 'Enlazar al post');
@define('LINK_TO_REMOTE_ENTRY', 'Enlazar a un post remoto');
@define('IP_ADDRESS', 'Dirección-IP');
@define('USER', 'Usuario');
@define('THUMBNAIL_USING_OWN', 'Usando %s como su miniatura debido a el escaso tamaño.');
@define('THUMBNAIL_FAILED_COPY', 'Querías usar %s como tu miniatura, ¡pero ha fallado la copia!');
@define('AUTHOR', 'Autor');
@define('LAST_UPDATED', 'Ultima actualización');
@define('TRACKBACK_SPECIFIC', 'Realiza un Trackback de esta URI para este post');
@define('DIRECT_LINK', 'Enlace directo a este post');
@define('COMMENT_ADDED', 'Tu comentario ha sido añadido correctamente. Pulsa %aquí para volver%s a los comentarios, y %aquí para cerrar%s esta ventana.');
@define('COMMENT_NOT_ADDED', 'Tu comentario no ha podido ser añadido, la posibilidad de añadir comentarios a este post ha sido desactivada. Pulsa %aquí para volver%s a los comentarios, y %aquí para cerrar%s esta ventana');
@define('COMMENTS_DISABLE', 'No se permiten comentarios a este post');
@define('COMMENTS_ENABLE', 'Se permiten comentarios a este post');
@define('COMMENTS_CLOSED', 'El autor no permite añadir comentarios a este post');
@define('EMPTY_COMMENT', 'Tu comentario esta vacío, %svuelve%s e inténtalo de nuevo');
@define('ENTRIES_FOR', 'Posts para %s');
@define('TOPICS_FOR', 'Temas para %s');
@define('DOCUMENT_NOT_FOUND', 'El documento %s no se encontró.');
@define('USERNAME', 'Usuario');
@define('PASSWORD', 'Contraseña');
@define('SERENDIPITY_INSTALLATION', 'Instalación de Serendipity');
@define('LEFT', 'Izquierda');
@define('RIGHT', 'Derecha');
@define('HIDDEN', 'Oculto');
@define('REMOVE_TICKED_PLUGINS', 'Quita los Plugins señalados');
@define('SAVE_CHANGES_TO_LAYOUT', 'Guarda los cambios en el diseño');
@define('COMMENTS_FROM', 'Comentarios para');
@define('ERROR', 'Error');
@define('ENTRY_SAVED', 'Post guardado');
@define('DELETE_SURE', '¿Estas seguro de que quieres eliminar #%s permanentemente?');
@define('NOT_REALLY', 'Realmente no...');
@define('DUMP_IT', '¡A la basura!');
@define('RIP_ENTRY', 'R.I.P, #%s');
@define('CATEGORY_DELETED', 'Categoría #%s eliminada. Los artículos antiguos han sido movidos a la categoría #%s');
@define('CATEGORY_REMAINING', 'Borra esta categoría y mueve sus posts a esta otra: %s');
@define('INVALID_CATEGORY', 'Ninguna categoría valida para borrar');
@define('CATEGORY_SAVED', 'Categoría guardada');
@define('SELECT_TEMPLATE', 'Selecciona la plantilla que deseas utilizar en tu weblog');
@define('ENTRIES_SUCCESSFULLY_INSERTED', '¡Posts insertados correctamente!');
@define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', '¡No se ha podido insertar los posts!');
@define('VIEW_FEED_EXPORT', 'View feed export');
@define('IMPORT', 'Importar');
@define('EXPORT', 'Exportar');
@define('YES', 'Si');
@define('NO', 'No');
@define('CHECK_N_SAVE', 'Revisa y Guarda');
@define('DIRECTORY_NOT_EXISTANT', 'El directorio %s no existe. ¡Crealo!');
@define('DIRECTORY_WRITE_ERROR', 'No puedes modificar %s. Comprueba los permisos.');
@define('DIRECTORY_CREATE_ERROR', 'El directorio %s no existe y no puede ser creado. Crealo manualmente.');
@define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; run <i>%s %s</i>');
@define('CANT_EXECUTE_BINARY', 'No se puede ejecutar %s');
@define('FILE_WRITE_ERROR', 'No se puede modificar el archivo %s.');
@define('FILE_CREATE_YOURSELF', 'Crea el archivo tu mismo o verifica los permisos');
@define('COPY_CODE_BELOW', '<br />* Tan solo copia el código situado debajo %s dentro %s del directorio:<b><pre>%s</pre></b>' . "\n");
@define('WWW_USER', 'Cambia la www hacia el usuario que esta ejecutando el servidor web (p.e tu_nombre).');
@define('BROWSER_RELOAD', 'Una vez hecho esto, pulsa en tu navegador el botón "recargar".');
@define('DIAGNOSTIC_ERROR', 'Hemos detectado algunos errores mientras se ejecutaban varias comprobaciones en la información que has introducido:');
@define('ALL_VALID', 'Toda la información que ha introducido parece ser correcta.');
@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity no esta instalado todavía. <a href="%s">Instálalo</a> ahora.');
@define('INCLUDE_ERROR', 'Error de Serendipity: no se puede incluir %s - saliendo.');
@define('DATABASE_ERROR', 'Error de Serendipity: no es posible conectarse a la base de datos - saliendo.');
@define('ATTEMPT_SETUP_DATABASE', 'Intentando configurar la base de datos...');
@define('CHECK_DATABASE_EXISTS', 'Comprobando si la base de datos esta en el lugar correcto.  Si ve un mensaje de error de la base de datos sencillamente ignórelo');
@define('CREATE_DATABASE', 'Creando la configuración por defecto de la base de datos...');
@define('DATABASE_DONE', 'Se termino la creación de la base de datos');
@define('ATTEMPT_WRITE_FILE', 'Intentando modificar el archivo %s...');
@define('SERENDIPITY_INSTALLED', '%sSerendipity se ha instalado correctamente.%s Recuerde su contraseña: "%s", tu nombre de usuario es "%s".%sPuedes encontrar tu nuevo Blog en PHP <a href="%s">aquí</a>');
@define('WRITTEN_N_SAVED', 'Configuración modificada y guardada');
@define('IMAGE_ALIGNMENT', 'Alineación de imágenes');
@define('ENTER_NEW_NAME', 'Introduzca el nuevo nombre para: ');
@define('IMAGE_MANAGER', 'Control de Imagen');
@define('RESIZING', 'Cambiando el tamaño');
@define('RESIZE_DONE', 'Terminado (las imágenes %s cambiaron de tamaño).');
@define('DELETE_IMAGE', 'Eliminada la imagen titulada <b>%s</b>');
@define('DELETE_IMAGE_FAIL' , 'No se puede eliminar la imagen <b>%s</b>');
@define('DELETE_THUMBNAIL', 'Eliminada la imagen miniatura titulada <b>%s</b>');
@define('FILE_NOT_FOUND', 'No es posible encontrar el archivo titulado <b>%s</b>, ¿es posible que lo haya borrado ya?');
@define('ABOUT_TO_DELETE_FILE', 'Vas a borrar <b>%s</b><br />Si estas usando este archivo en alguno de tus posts provocara un error<br />¿Estas seguro de querer continuar?<br /><br />');
@define('IMAGE_FULLSIZE', 'Tamaño completo');
@define('IMAGE_RENAME', 'Renombra esta imagen');
@define('IMAGE_RESIZE', 'Cambia el tamaño de esta imagen');
@define('IMAGE_DELETE', 'Borra esta imagen');
@define('ABORT_NOW', 'Salir ahora');
@define('REMOTE_FILE_NOT_FOUND', 'El archivo no fue localizado en el servidor remoto, ¿estas seguro de que la URL: <b>%s</b> es correcta?');
@define('FILE_FETCHED', '%s enlazado');
@define('FILE_UPLOADED', 'El archivo %s fue transferido correctamente');
@define('WORD_OR', 'O bien...');
@define('SCALING_IMAGE', 'Escalando %s a %s x %s px');
@define('KEEP_PROPORTIONS', 'Mantener las proporciones');
@define('REALLY_SCALE_IMAGE', '¿Realmente deseas escalar la imagen? ¡No se podrá deshacer esta acción!');
@define('TOGGLE_ALL', 'Mostrar/Ocultar');
@define('TOGGLE_OPTION', 'Mostrar/Ocultar');
@define('SUBSCRIBE_TO_THIS_ENTRY', 'Suscribirse a este post');
@define('UNSUBSCRIBE_OK', "%s ahora esta suscrito a este post");
@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Nuevo comentario al post suscrito "%s"');
@define('SUBSCRIPTION_MAIL', "Hola %s,\n\nHay un nuevo comentario al post \"%s\", titulado \"%s\"\nEl autor es: %s\n\nPuedes encontrar el post aquí: %s\n\nPuedes dejar de recibir información sobre este post haciendo click aquí: %s\n");
@define('SUBSCRIPTION_TRACKBACK_MAIL', "Hola %s,\n\nHay un nuevo trackback al post \"%s\", titulado \"%s\"\nEl autor es: %s\n\nPuedes encontrar el post aquí: %s\n\nPuedes dejar de recibir información sobre este post haciendo click aquí: %s\n");
@define('SIGNATURE', "\n-- \n%s esta creado por Serendipity.\nEl mejor blog ;).\nVisita <http://s9y.org> y compruébalo.");
@define('DATABASE_ALREADY_INSTALLED', 'IGNORADO: La base de datos ya esta instalada');
@define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
@define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
@define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 comments');
@define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Campo "managingEditor"');
@define('SYNDICATION_PLUGIN_WEBMASTER',  'Campo "webMaster"');
@define('SYNDICATION_PLUGIN_BANNERURL', 'Imagen para el RSS feed');
@define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Ancho de Imagen');
@define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Alto de Imagen');
@define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'E-Mail del webmaster, si esta disponible. (déjalo vacío para no mostrarlo) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', 'E-Mail del editor, si esta disponible. (déjalo vacío para no mostrarlo) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_BANNERURL_DESC', 'URL de la imagen en formato GIF/JPEG/PNG, si esta disponible. (dejándolo vacío se usara el logo de serendipity)');
@define('SYNDICATION_PLUGIN_BANNERWIDTH_DESC', 'en pixels, max. 144');
@define('SYNDICATION_PLUGIN_BANNERHEIGHT_DESC', 'en pixels, max. 400');
@define('SYNDICATION_PLUGIN_TTL', 'Campo "ttl" (time-to-live)');
@define('SYNDICATION_PLUGIN_TTL_DESC', 'Cantidad de minutos, después de los cuales, tu blog no será verificado por ningún site o aplicación externa.(si lo dejas vacío no se mostrara) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_PUBDATE', 'Campo "pubDate"');
@define('SYNDICATION_PLUGIN_PUBDATE_DESC', '¿Debería el campo "pubDate" estar incluido en un canal RSS para mostrar la fecha del ultimo post?');
@define('CONTENT', 'Contenido');
@define('TYPE', 'Tipo');
@define('DRAFT', 'Borrador');
@define('PUBLISH', 'Publicar');
@define('PREVIEW', 'Previsualizacion');
@define('DATE', 'Fecha');
@define('DATE_FORMAT_2', 'Y-m-d H:i'); // Needs to be ISO 8601 compliant for date conversion!
@define('DATE_INVALID', 'Atención: La fecha especificada no es valida. Debe tener el formato AAAA-MM-DD HH:MM.');
@define('CATEGORY_PLUGIN_DESC', 'Muestra la lista de categorías.');
@define('ALL_AUTHORS', 'Todos los autores');
@define('CATEGORIES_TO_FETCH', 'Categorías enlazadas');
@define('CATEGORIES_TO_FETCH_DESC', '¿De que autor quiere enlazar las categorías?');
@define('PAGE_BROWSE', 'Pagina %s de %s, en total %s posts');
@define('PREVIOUS_PAGE', 'Pagina previa');
@define('NEXT_PAGE', 'Pagina siguiente');
@define('ALL_CATEGORIES', 'Todas las categorías');
/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity INSTALL,1.7,1.8 NEWS,1.47,1.48 compat.php,1.10,1.11 serendipity_admin_installer.inc.php,1.49,1.50 serendipity_config.inc.php,1.44,1.45 serendipity_config_local.tpl,1.25,1.26 serendipity_lang.inc.php,1.6,1.7 serendipity_lang_de.inc.php,1.42,NONE serendipity_lang_en.inc.php,1.53,NONE serendipity_lang_es.inc.php,1.6,NONE

From: <tom...@us...> - 2004-01-21 18:28:30

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv9211

Modified Files:
	INSTALL NEWS compat.php serendipity_admin_installer.inc.php 
	serendipity_config.inc.php serendipity_config_local.tpl 
	serendipity_lang.inc.php 
Removed Files:
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php 
Log Message:
* Added dropdown for languages in the installer
* Added "es" to auto-lang-detection
* Fixed bug with no default values during installation
* Added get_boolean function, check if a string is 'true' or 'false' and return boolean if so
* Moved languages to its own folder


Index: INSTALL
===================================================================
RCS file: /cvsroot/php-blog/serendipity/INSTALL,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- INSTALL	1 Oct 2003 09:29:02 -0000	1.7
+++ INSTALL	21 Jan 2004 18:28:25 -0000	1.8
@@ -52,7 +52,7 @@
    -serendipity_admin_overview.inc.php
    -serendipity_config.inc.php
    -serendipity_functions.inc.php
-   -serendipity_lang_en.inc.php
+   -lang/serendipity_lang_*.inc.php
    These files are never loaded in the browser, but included (as their
    suffix suggests).
 

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- NEWS	21 Jan 2004 15:51:59 -0000	1.47
+++ NEWS	21 Jan 2004 18:28:25 -0000	1.48
@@ -2,6 +2,8 @@
 
 Version 0.5 ()
 ------------------------------------
+    * Moved languages to its own folder and added availiable languages as a dropdown in the installer (tomsommer)
+    * Added spanish translation (Luis Cervantes)
     * Do not allow our entries to trackback our other entries on creation. References are still inserted. (garvinhicking)
     * Added input box to admin entry panel where you can provide an entry id to be directly edited. (garvinhicking)
     * Edit an entry directly from your frontend (link beside trackbacks) (garvinhicking)

Index: compat.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/compat.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- compat.php	12 Jan 2004 17:47:38 -0000	1.10
+++ compat.php	21 Jan 2004 18:28:25 -0000	1.11
@@ -76,19 +76,32 @@
     }
 }
 
+
 // Merge get and post into the serendipity array
 $serendipity['GET']    = &$_GET['serendipity'];
 $serendipity['POST']   = &$_POST['serendipity'];
 $serendipity['COOKIE'] = &$_COOKIE['serendipity'];
 
 
+function serendipity_get_bool($item) {
+    $translation = array('true'  => true,
+                         'false' => false);
+                         
+    if ( isset($translation[$item]) ) {
+        return $translation[$item];
+    } else {
+        return $item;
+    }
+} 
+
 /*
  *  Some defaults for our config vars.
  *  They are likely to be overwritten later in the code
  */
 $serendipity['templatePath'] = 'templates/';
-if(!isset($serendipity['serendipityPath']))
+if(!isset($serendipity['serendipityPath'])) {
     $serendipity['serendipityPath'] = './';
+}
 $serendipity['indexFile'] = 'index.php';
 
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- serendipity_admin_installer.inc.php	21 Jan 2004 16:36:08 -0000	1.49
+++ serendipity_admin_installer.inc.php	21 Jan 2004 18:28:25 -0000	1.50
@@ -102,6 +102,7 @@
 function serendipity_guessInput($type, $name, $value='', $default='') {
     switch ($type) {
         case 'bool' :
+            $value = serendipity_get_bool($value);
             echo '<input id="radio_cfg_' . $name . '_yes" type="radio" name="' . $name . '" value="true" ';
             echo (($value == true) ? 'checked="checked"' : ''). ' /><label for="radio_cfg_' . $name . '_yes"> ' . YES . '</label>&nbsp;';
             echo '<input id="radio_cfg_' . $name . '_no" type="radio" name="' . $name . '" value="false" ';
@@ -195,9 +196,15 @@
 
 <?php
         for ($x=0; $x<count($value); $x++) {
+            /* If we have a valuelist, then use the value from there */
             if (@is_array($from)) {
                 $value[$x]['value'] = $from[$value[$x]['name']];
             }
+            
+            /* If the value is never assigned in the valuelist, then use our default value */
+            if (!isset($from[$value[$x]['name']])) {
+                $value[$x]['value'] = $value[$x]['default'];
+            }
 ?>
                         <tr>
                             <td style="border-bottom: 1px #000000 solid" align="left" valign="top" width="75%">

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- serendipity_config.inc.php	7 Jan 2004 17:45:48 -0000	1.44
+++ serendipity_config.inc.php	21 Jan 2004 18:28:25 -0000	1.45
@@ -58,9 +58,6 @@
     die(DATABASE_ERROR);
 }
 
-$translation = array('true'  => true,
-                     'false' => false);
-
 /*
  *   Load Configuration options from the database
  */
@@ -73,9 +70,8 @@
     /*
      *   Convert 'true' and 'false' into booleans
      */
-    if ( isset($translation[$row['value']]) ) {
-        $row['value'] = $translation[$row['value']];
-    }
+    $row['value'] = serendipity_get_bool($row['value']);
+
     $serendipity[$row['name']] = $row['value'];
 }
 

Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_config_local.tpl	21 Jan 2004 15:07:40 -0000	1.25
+++ serendipity_config_local.tpl	21 Jan 2004 18:28:25 -0000	1.26
@@ -27,8 +27,8 @@
 $serendipity['want_mail']            = '{Send mails to admin?|want_mail|bool|1}';           // Do you want to receive emails when comments are posted to your entries?
 $serendipity['allowSubscriptions']   = '{Allow users to subscribe to entries?|allowSubscriptions|bool|1}'    // Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry
 $serendipity['blogTitle']            = '{Blog name|blogTitle|string|John Doe's personal blog}';             // The title of your blog
-$serendipity['blogDescription']      = '{Blog description|blogDescription|string|Welcome to my blog...}';   // Description of your blog
-$serendipity['lang']                 = '{Language file|lang|string|en}';                                    // Language (for 'en' you need serendipity_lang_en.inc.php).
+$serendipity['blogDescription']      = '{Blog description|blogDescription|string|My little place on the web...}';   // Description of your blog
+$serendipity['lang']                 = '{Language|lang|list|en=>English,de=>German,es=>Spanish}';      // Select the language for your blog
 
 // Appearance and options
 # Customize how Serendipity looks and feels
@@ -49,7 +49,7 @@
 
 // Pinging of Weblog Services
 # Announcement of new weblog entries
-$serendipity['announce_entries']              = '{Announce Entries|announce_entries|bool|0}';             // Do you want new entries to be announced?
+$serendipity['announce_entries']              = '{Announce Entries|announce_entries|bool|1}';             // Do you want new entries to be announced?
 $serendipity['announce_entries_blogs']        = '{blo.gs|announce_entries_blogs|bool|0}';                 // Do you want new entries to be announced on blo.gs?
 $serendipity['announce_entries_blogrolling']  = '{blogrolling.com|announce_entries_blogrolling|bool|0}';  // Do you want new entries to be announced on blogrolling.com?
 $serendipity['announce_entries_technorati']   = '{technorati.com|announce_entries_technorati|bool|0}';    // Do you want new entries to be announced on technorati.com?

Index: serendipity_lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_lang.inc.php	30 Sep 2003 21:22:00 -0000	1.6
+++ serendipity_lang.inc.php	21 Jan 2004 18:28:25 -0000	1.7
@@ -2,7 +2,7 @@
 
 if (!defined('serendipity_LANG_LOADED') || serendipity_LANG_LOADED !== true) {
     // Try and include preferred language from the configurated setting
-    if ( @include('serendipity_lang_'. $serendipity['lang'] .'.inc.php') ) {
+    if ( @include($serendipity['serendipityPath'] .'lang/serendipity_lang_'. $serendipity['lang'] .'.inc.php') ) {
         // Only here can we truely say the language is loaded
         define('serendipity_LANG_LOADED', true);
 
@@ -10,13 +10,13 @@
     } elseif ( IS_installed === false ) {   /* -- Auto-Guess -- */
         // If no config file is loaded, language includes are not available.
         // Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
-        $supported_languages = array('en', 'de');
+        $supported_languages = array('en', 'de', 'es');
         $possible_languages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
         if (is_array($possible_languages)) {
             foreach($possible_languages as $index => $lang) {
                 $preferred_language = preg_replace('|^([^\-_]*)|msU', '\1', $lang);
                 if (in_array($preferred_language, $supported_languages)) {
-                    include_once('serendipity_lang_' . $preferred_language . '.inc.php');
+                    @include_once($serendipity['serendipityPath'] . 'lang/serendipity_lang_' . $preferred_language . '.inc.php');
                     break;
                 } // endif
             } // endforeach
@@ -26,7 +26,7 @@
 
     // Do fallback to english
     if ( (defined('serendipity_LANG_LOADED') && serendipity_LANG_LOADED === true) || IS_installed === false) {
-        include_once('serendipity_lang_en.inc.php');
+        @include_once($serendipity['serendipityPath'] .'lang/serendipity_lang_en.inc.php');
     }
 }
 

--- serendipity_lang_de.inc.php DELETED ---

--- serendipity_lang_en.inc.php DELETED ---

--- serendipity_lang_es.inc.php DELETED ---

[php-blog-cvs] serendipity/lang - New directory

From: <tom...@us...> - 2004-01-21 18:22:14

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv8161/lang

Log Message:
Directory /cvsroot/php-blog/serendipity/lang added to the repository

[php-blog-cvs] Re: serendipity NEWS,1.46,1.47 serendipity_functions.inc.php,1.184,1.185

From: Tom S. <ts...@dr...> - 2004-01-21 17:00:51

gar...@us... wrote:

> Update of /cvsroot/php-blog/serendipity
> In directory sc8-pr-cvs1:/tmp/cvs-serv6522
> 
> Modified Files:
> 	NEWS serendipity_functions.inc.php 
> Log Message:
> Hey, trackback-autodiscovery, leave our own entries alone. We don't need no self control.

yes we do, one of the main things about trackbacks is to be able to 
trackback your own entries...

-- 
Tom Sommer, Denmark
www.dreamcoder.dk - www.tsn.dk - http://blog.dreamcoder.dk

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.48,1.49

From: <tom...@us...> - 2004-01-21 16:36:11

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv17023

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
Fixed bug when clicking on a "no" label in the installer, it would select the "yes" radio-button


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- serendipity_admin_installer.inc.php	20 Jan 2004 11:12:37 -0000	1.48
+++ serendipity_admin_installer.inc.php	21 Jan 2004 16:36:08 -0000	1.49
@@ -104,8 +104,8 @@
         case 'bool' :
             echo '<input id="radio_cfg_' . $name . '_yes" type="radio" name="' . $name . '" value="true" ';
             echo (($value == true) ? 'checked="checked"' : ''). ' /><label for="radio_cfg_' . $name . '_yes"> ' . YES . '</label>&nbsp;';
-            echo '<input id="radio_cfg_' . $name . '_yes" type="radio" name="' . $name . '" value="false" ';
-            echo (($value == true) ? '' : 'checked="checked"'). ' /><label for="radio_cfg_' . $name . '_yes"> ' . NO . '</label>';
+            echo '<input id="radio_cfg_' . $name . '_no" type="radio" name="' . $name . '" value="false" ';
+            echo (($value == true) ? '' : 'checked="checked"'). ' /><label for="radio_cfg_' . $name . '_no"> ' . NO . '</label>';
             break;
 
         case 'protected' :

[php-blog-cvs] serendipity serendipity_lang_es.inc.php,1.5,1.6

From: <jt...@us...> - 2004-01-21 16:29:19

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv15597

Modified Files:
	serendipity_lang_es.inc.php 
Log Message:
Added full spanish tranlation (Luis Cervantes)

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_es.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_lang_es.inc.php	7 Sep 2003 21:38:01 -0000	1.5
+++ serendipity_lang_es.inc.php	21 Jan 2004 16:29:16 -0000	1.6
@@ -1,16 +1,303 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_es.inc.php,v 1.5
 
 ##########################################################################
-# serendipity - un otro blogger...                                       #
+# serendipity - another blogger...                                       #
+##########################################################################
+#                                                                        #
+# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
+# http://www.jannis.to/programming/serendipity.html                      #
+#                                                                        #
+# Translated by Luis Cervantes <Lui...@on...>                   #
+# Traducido por Luis Cervantes <Lui...@on...>                   #
+#                                                                        #
 ##########################################################################
 
 // Spanish language file
-$serendipity['months']  = array('', 'Enero', 'Febrero', 'Marzo',
-                    'Abril', 'Mayo', 'Junio', 'Julio', 'Augusto', 'Septiembre',
-                    'Octobre', 'Noviembre', 'Deciembre');
-
-$serendipity['weekDayAbb'] = array('L', 'Ma', 'Mi', 'J', 'V', 'S', 'D');
+if (!isset($serendipity['months'])) {
+    $serendipity['months']  = array('J...@ha...', 'Enero', 'Febrero', 'Marzo',
+                        'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre',
+                        'Octubre', 'Noviembre', 'Diciembre');
+}
 
+if (!isset($serendipity['weekDayAbb'])) {
+    $serendipity['weekDayAbb'] = array('L', 'M', 'X', 'J', 'V', 'S', 'D');
+}
 
+@define('SERENDIPITY_ADMIN_SUITE', 'Suite de Administración de Serendipity');
+@define('HAVE_TO_BE_LOGGED_ON', 'Debes identificarte para ver esta pagina:');
+@define('APPEARANCE', 'Apariencia');
+@define('MANAGE_STYLES', 'Control de estilos');
+@define('CONFIGURE_PLUGINS', 'Configurar Plugins');
+@define('ADMIN', 'Admin:');
+@define('CONFIGURATION', 'Configuración');
+@define('IMPORT_EXPORT_ENTRIES', 'Importar/Exportar posts');
+@define('BACK_TO_BLOG', 'Volver al weblog');
+@define('LOGOUT', 'Salir');
+@define('LOGGEDOUT', 'No identificado');
+@define('CREATE_NEW_CAT', 'Crear una categoría nueva');
+@define('CREATE', 'Crear');
+@define('EDIT_THIS_CAT', 'Editar "%s - %s"');
+@define('SAVE', 'Guardar');
+@define('NAME', 'Nombre');
+@define('DESCRIPTION', 'Descripción');
+@define('CLICK_CAT_TO_EDIT', 'Haz click en una categoría para editarla');
+@define('CREATE_NEW_CAT', 'Crear una categoría nueva');
+@define('SELECT_IMAGE', 'Selecciona una imagen');
+@define('I_WANT_THUMB', 'Quiero usar la miniatura en mi post.');
+@define('I_WANT_BIG_IMAGE', 'Quiero usar la imagen más grande en mi post.');
+@define('I_WANT_NO_LINK', ' Quiero que aparezca como una imagen');
+@define('I_WANT_IT_TO_LINK', 'Quiero que aparezca como un enlace a esta url:');
+@define('BACK', 'Atrás');
+@define('FORWARD', 'Seguir');
+@define('ANONYMOUS', 'Anónimo');
+@define('LINK_TO_COMMENT', 'Enlace al comentario #');
+@define('SEND_MAIL_TO', 'Enviar correo a');
+@define('NEW_TRACKBACK_TO', 'Nuevo trackback para');
+@define('NEW_COMMENT_TO', 'Comentario nuevo para');
+@define('RECENT', 'Recientes..');
+@define('OLDER', 'Antiguos..');
+@define('DONE', 'Aplicar');
+@define('CLICK_IMAGE_TO_INSERT', 'Haz click en la imagen que quieres insertar:');
+@define('WELCOME_BACK', 'Bienvenido de nuevo,');
+@define('RUNNING', 'Estas usando Serendipity v.');
+@define('ADD_PLUGIN', 'Añadir plugin');
+@define('TITLE', 'Titulo');
+@define('PLUGIN', 'Plugin');
+@define('DESCRIPTION', 'Descripción');
+@define('PLACEMENT', 'Localización');
+@define('DELETE', 'Borrar');
+@define('SAVE', 'Guardar');
+@define('SELECT_A_PLUGIN_TO_ADD', 'Selecciona el plugin que quieres añadir');
+@define('UP', 'ARRIBA');
+@define('DOWN', 'ABAJO');
+@define('ENTRIES', 'Posts:');
+@define('NEW_ENTRY', 'Post nuevo');
+@define('AUTHOR_SUITE', 'Suite de autoría');
+@define('EDIT_ENTRIES', 'Editar posts');
+@define('DELETE_ENTRIES', 'Borrar posts');
+@define('CATEGORIES', 'Categorías');
+@define('EDIT_CATEGORIES', 'Control de Categorías');
+@define('IMAGES', 'Imágenes:');
+@define('ADD_IMAGES', 'Añadir imágenes');
+@define('WARNING_THIS_BLAHBLAH', "ATENCIÓN:\\nPuede tardar si hay muchas imágenes que no están en miniatura.");
+@define('CREATE_THUMBS', 'Crear las miniaturas');
+@define('MANAGE_IMAGES', 'Control de imágenes');
+@define('ADMIN_INTERFACE', 'Panel de Administración');
+@define('SERENDIPITY_AUTHORING_SUITE', 'Suite de Serendipity para autoría ');
+@define('NAME', 'Nombre');
+@define('EMAIL', 'E-mail');
+@define('HOMEPAGE', 'Url personal');
+@define('COMMENT', 'Comentario');
+@define('REMEMBER_INFO', '¿Recordar la información? ');
+@define('SUBMIT_COMMENT', 'Mandar comentario');
+@define('NO_ENTRIES_TO_PRINT', 'No hay posts.');
+@define('COMMENTS', 'Comentarios');
+@define('ADD_COMMENT', 'Añadir Comentario');
+@define('NO_COMMENTS', 'No hay Comentarios.');
+@define('POSTED_BY', 'Autor');
+@define('TRACKBACK_FROM', 'Trackback desde');
+@define('ON', 'activado');
+@define('A_NEW_COMMENT_BLAHBLAH', 'Un nuevo comentario en el blog "%s", para el post "%s".');
+@define('A_NEW_TRACKBACK_BLAHBLAH', 'Se ha realizado un nuevo trackback al post titulado "%s".');
+@define('NO_CATEGORY', 'No existe la categoría');
+@define('ENTRY_BODY', 'Texto del post');
+@define('EXTENDED_BODY', 'Texto ampliado');
+@define('CATEGORY', 'Categoría:');
+@define('TEMPLATE_NAME', 'Nombre de la plantilla');
+@define('CHOOSE_STYLESHEET', 'Selecciona una hoja de estilo..');
+@define('EDIT', 'Editar');
+@define('MAKE_DEFAULT', 'Predeterminado');
+@define('CREATE_NEW_STYLESHEET', 'Crear una hoja nueva de estilos');
+@define('NO_ENTRIES_BLAHBLAH', 'No se han encontrado resultados para el termino %s' . "\n");
+@define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'La búsqueda para %s ha obtenido %s resultados:');
+@define('SEARCH_TOO_SHORT', 'La búsqueda debe tener tres caracteres como mínimo ');
+@define('IMAGE', 'Imagen');
+@define('ERROR_FILE_NOT_EXISTS', 'Error: ¡El fichero no existe!');
+@define('ERROR_FILE_EXISTS', 'Error: ¡Un archivo con ese nombre ya existe, selecciona otro!');
+@define('ERROR_SOMETHING', 'Error: Algo esta mal.');
+@define('ADDING_IMAGE', 'Añadiendo imagen..');
+@define('THUMB_CREATED_DONE', 'Miniatura creada.<br>Terminado.');
+@define('ERROR_FILE_EXISTS_ALREADY', 'Error: ¡El archivo ya existe en el sistema!');
+@define('ERROR_UNKNOWNE_NOUPLOAD', 'Error desconocido, el archivo no ha sido transferido...');
+@define('ADD_IMAGE_BLAHBLAH', '<b>Añade una imagen:</b><p>Aquí puedes subir tus imágenes o bien indicar la dirección url de una imagen para direccionarla. Si no tienes las imágenes adecuadas puedes buscar en <a href="http://images.google.es" target="_blank">Imágenes de Google</a>, los resultados no son siempre efectivos pero si divertidos :)<p><b>Selecciona un método:</b><br>');
+@define('ENTER_IMAGE_URL', 'Introduce la URL de la imagen que quieres enlazar:');
+@define('ENTER_IMAGE_TO_UP', 'Selecciona la imagen que deseas transferir:');
+@define('GO', '¡Ir!');
+@define('NEWSIZE', 'Nuevo tamaño: ');
+@define('RESIZE_BLAHBLAH', '<b>Cambiar tamaño %s</b><p>');
+@define('ORIGINAL_SIZE', 'Tamaño original: <i>%sx%s</i> pixel');
+@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Aquí puedes ajustar el nuevo tamaño de la imagen. Si quieres mantener las proporciones solo introduce uno de los valores y presiona la tecla tabulador (TAB), de esta forma se ajustara automáticamente:');
+@define('DATE_FORMAT_1', 'd.m.Y');
+@define('CALENDAR', 'Calendario');
+@define('QUICKJUMP_CALENDAR', 'Calendario Rápido');
+@define('QUICKSEARCH', 'Buscar');
+@define('SEARCH_FOR_ENTRY', 'Busca un post');
+@define('ARCHIVES', 'Archivos');
+@define('BROWSE_ARCHIVES', 'Archivos de otros meses');
+@define('TOP_REFERRER', 'Sitios asociados');
+@define('SHOWS_TOP_SITES', 'Muestra los sitios que enlazan a tu weblog');
+@define('TOP_EXITS', 'Salídas');
+@define('SHOWS_TOP_EXIT', 'Muestra las salídas más frecuentes de tu weblog');
+@define('SYNDICATION', 'Sindicar');
+@define('SHOWS_RSS_BLAHBLAH', 'Muestra los enlaces RSS de sindicacion');
+@define('ALLOWS_YOU_BLAHBLAH', 'Te permite configurar y publicar el weblog');
+@define('PLUG', 'Plug');
+@define('ADVERTISES_BLAHBLAH', 'Informa del código en el que se basa tu weblog');
+@define('HTML_NUGGET', 'Fragmento de HTML');
+@define('HOLDS_A_BLAHBLAH', 'Prensenta un fragmento de HTML en la barra lateral');
+@define('TITLE_FOR_NUGGET', 'Titulo para el fragmento de HTML');
+@define('THE_NUGGET', '¡Fragmento de HTML!');
+@define('SYNDICATE_THIS_BLOG', 'Sindicar');
+@define('QUICKJUMP', 'Calendario');
+@define('YOU_CHOSE', 'Eliges %s');
+@define('IMAGE_SIZE', 'Tamaño de la imagen');
+@define('IMAGE_AS_A_LINK', 'Inserción de imagen');
+@define('POWERED_BY', 'Basado en');
+@define('SUPERUSER', 'Super usuario');
+@define('TRACKBACKS', 'Trackbacks');
+@define('TRACKBACK', 'Trackback');
+@define('NO_TRACKBACKS', 'No hay Trackbacks');
+@define('TOPICS_OF', 'Temas de');
+@define('VIEW_FULL', 'Ver mas');
+@define('VIEW_TOPICS', 'Ver temas');
+@define('AT', 'a las');
+@define('SET_AS_TEMPLATE', 'Mantenlo como plantilla');
+@define('VIEW_EXTENDED_ENTRY', 'Ver el post extendido');
+@define('IN', 'en');
+@define('EXCERPT', 'Segmento');
+@define('TRACKED', 'Tracked');
+@define('LINK_TO_ENTRY', 'Enlazar al post');
+@define('LINK_TO_REMOTE_ENTRY', 'Enlazar a un post remoto');
+@define('IP_ADDRESS', 'Dirección-IP');
+@define('USER', 'Usuario');
+@define('THUMBNAIL_USING_OWN', 'Usando %s como su miniatura debido a el escaso tamaño.');
+@define('THUMBNAIL_FAILED_COPY', 'Querías usar %s como tu miniatura, ¡pero ha fallado la copia!');
+@define('AUTHOR', 'Autor');
+@define('LAST_UPDATED', 'Ultima actualización');
+@define('TRACKBACK_SPECIFIC', 'Realiza un Trackback de esta URI para este post');
+@define('DIRECT_LINK', 'Enlace directo a este post');
+@define('COMMENT_ADDED', 'Tu comentario ha sido añadido correctamente. Pulsa %aquí para volver%s a los comentarios, y %aquí para cerrar%s esta ventana.');
+@define('COMMENT_NOT_ADDED', 'Tu comentario no ha podido ser añadido, la posibilidad de añadir comentarios a este post ha sido desactivada. Pulsa %aquí para volver%s a los comentarios, y %aquí para cerrar%s esta ventana');
+@define('COMMENTS_DISABLE', 'No se permiten comentarios a este post');
+@define('COMMENTS_ENABLE', 'Se permiten comentarios a este post');
+@define('COMMENTS_CLOSED', 'El autor no permite añadir comentarios a este post');
+@define('EMPTY_COMMENT', 'Tu comentario esta vacío, %svuelve%s e inténtalo de nuevo');
+@define('ENTRIES_FOR', 'Posts para %s');
+@define('TOPICS_FOR', 'Temas para %s');
+@define('DOCUMENT_NOT_FOUND', 'El documento %s no se encontró.');
+@define('USERNAME', 'Usuario');
+@define('PASSWORD', 'Contraseña');
+@define('SERENDIPITY_INSTALLATION', 'Instalación de Serendipity');
+@define('LEFT', 'Izquierda');
+@define('RIGHT', 'Derecha');
+@define('HIDDEN', 'Oculto');
+@define('REMOVE_TICKED_PLUGINS', 'Quita los Plugins señalados');
+@define('SAVE_CHANGES_TO_LAYOUT', 'Guarda los cambios en el diseño');
+@define('COMMENTS_FROM', 'Comentarios para');
+@define('ERROR', 'Error');
+@define('ENTRY_SAVED', 'Post guardado');
+@define('DELETE_SURE', '¿Estas seguro de que quieres eliminar #%s permanentemente?');
+@define('NOT_REALLY', 'Realmente no...');
+@define('DUMP_IT', '¡A la basura!');
+@define('RIP_ENTRY', 'R.I.P, #%s');
+@define('CATEGORY_DELETED', 'Categoría #%s eliminada. Los artículos antiguos han sido movidos a la categoría #%s');
+@define('CATEGORY_REMAINING', 'Borra esta categoría y mueve sus posts a esta otra: %s');
+@define('INVALID_CATEGORY', 'Ninguna categoría valida para borrar');
+@define('CATEGORY_SAVED', 'Categoría guardada');
+@define('SELECT_TEMPLATE', 'Selecciona la plantilla que deseas utilizar en tu weblog');
+@define('ENTRIES_SUCCESSFULLY_INSERTED', '¡Posts insertados correctamente!');
+@define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', '¡No se ha podido insertar los posts!');
+@define('VIEW_FEED_EXPORT', 'View feed export');
+@define('IMPORT', 'Importar');
+@define('EXPORT', 'Exportar');
+@define('YES', 'Si');
+@define('NO', 'No');
+@define('CHECK_N_SAVE', 'Revisa y Guarda');
+@define('DIRECTORY_NOT_EXISTANT', 'El directorio %s no existe. ¡Crealo!');
+@define('DIRECTORY_WRITE_ERROR', 'No puedes modificar %s. Comprueba los permisos.');
+@define('DIRECTORY_CREATE_ERROR', 'El directorio %s no existe y no puede ser creado. Crealo manualmente.');
+@define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; run <i>%s %s</i>');
+@define('CANT_EXECUTE_BINARY', 'No se puede ejecutar %s');
+@define('FILE_WRITE_ERROR', 'No se puede modificar el archivo %s.');
+@define('FILE_CREATE_YOURSELF', 'Crea el archivo tu mismo o verifica los permisos');
+@define('COPY_CODE_BELOW', '<br />* Tan solo copia el código situado debajo %s dentro %s del directorio:<b><pre>%s</pre></b>' . "\n");
+@define('WWW_USER', 'Cambia la www hacia el usuario que esta ejecutando el servidor web (p.e tu_nombre).');
+@define('BROWSER_RELOAD', 'Una vez hecho esto, pulsa en tu navegador el botón "recargar".');
+@define('DIAGNOSTIC_ERROR', 'Hemos detectado algunos errores mientras se ejecutaban varias comprobaciones en la información que has introducido:');
+@define('ALL_VALID', 'Toda la información que ha introducido parece ser correcta.');
+@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity no esta instalado todavía. <a href="%s">Instálalo</a> ahora.');
+@define('INCLUDE_ERROR', 'Error de Serendipity: no se puede incluir %s - saliendo.');
+@define('DATABASE_ERROR', 'Error de Serendipity: no es posible conectarse a la base de datos - saliendo.');
+@define('ATTEMPT_SETUP_DATABASE', 'Intentando configurar la base de datos...');
+@define('CHECK_DATABASE_EXISTS', 'Comprobando si la base de datos esta en el lugar correcto.  Si ve un mensaje de error de la base de datos sencillamente ignórelo');
+@define('CREATE_DATABASE', 'Creando la configuración por defecto de la base de datos...');
+@define('DATABASE_DONE', 'Se termino la creación de la base de datos');
+@define('ATTEMPT_WRITE_FILE', 'Intentando modificar el archivo %s...');
+@define('SERENDIPITY_INSTALLED', '%sSerendipity se ha instalado correctamente.%s Recuerde su contraseña: "%s", tu nombre de usuario es "%s".%sPuedes encontrar tu nuevo Blog en PHP <a href="%s">aquí</a>');
+@define('WRITTEN_N_SAVED', 'Configuración modificada y guardada');
+@define('IMAGE_ALIGNMENT', 'Alineación de imágenes');
+@define('ENTER_NEW_NAME', 'Introduzca el nuevo nombre para: ');
+@define('IMAGE_MANAGER', 'Control de Imagen');
+@define('RESIZING', 'Cambiando el tamaño');
+@define('RESIZE_DONE', 'Terminado (las imágenes %s cambiaron de tamaño).');
+@define('DELETE_IMAGE', 'Eliminada la imagen titulada <b>%s</b>');
+@define('DELETE_IMAGE_FAIL' , 'No se puede eliminar la imagen <b>%s</b>');
+@define('DELETE_THUMBNAIL', 'Eliminada la imagen miniatura titulada <b>%s</b>');
+@define('FILE_NOT_FOUND', 'No es posible encontrar el archivo titulado <b>%s</b>, ¿es posible que lo haya borrado ya?');
+@define('ABOUT_TO_DELETE_FILE', 'Vas a borrar <b>%s</b><br />Si estas usando este archivo en alguno de tus posts provocara un error<br />¿Estas seguro de querer continuar?<br /><br />');
+@define('IMAGE_FULLSIZE', 'Tamaño completo');
+@define('IMAGE_RENAME', 'Renombra esta imagen');
+@define('IMAGE_RESIZE', 'Cambia el tamaño de esta imagen');
+@define('IMAGE_DELETE', 'Borra esta imagen');
+@define('ABORT_NOW', 'Salir ahora');
+@define('REMOTE_FILE_NOT_FOUND', 'El archivo no fue localizado en el servidor remoto, ¿estas seguro de que la URL: <b>%s</b> es correcta?');
+@define('FILE_FETCHED', '%s enlazado');
+@define('FILE_UPLOADED', 'El archivo %s fue transferido correctamente');
+@define('WORD_OR', 'O bien...');
+@define('SCALING_IMAGE', 'Escalando %s a %s x %s px');
+@define('KEEP_PROPORTIONS', 'Mantener las proporciones');
+@define('REALLY_SCALE_IMAGE', '¿Realmente deseas escalar la imagen? ¡No se podrá deshacer esta acción!');
+@define('TOGGLE_ALL', 'Mostrar/Ocultar');
+@define('TOGGLE_OPTION', 'Mostrar/Ocultar');
+@define('SUBSCRIBE_TO_THIS_ENTRY', 'Suscribirse a este post');
+@define('UNSUBSCRIBE_OK', "%s ahora esta suscrito a este post");
+@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Nuevo comentario al post suscrito "%s"');
+@define('SUBSCRIPTION_MAIL', "Hola %s,\n\nHay un nuevo comentario al post \"%s\", titulado \"%s\"\nEl autor es: %s\n\nPuedes encontrar el post aquí: %s\n\nPuedes dejar de recibir información sobre este post haciendo click aquí: %s\n");
+@define('SUBSCRIPTION_TRACKBACK_MAIL', "Hola %s,\n\nHay un nuevo trackback al post \"%s\", titulado \"%s\"\nEl autor es: %s\n\nPuedes encontrar el post aquí: %s\n\nPuedes dejar de recibir información sobre este post haciendo click aquí: %s\n");
+@define('SIGNATURE', "\n-- \n%s esta creado por Serendipity.\nEl mejor blog ;).\nVisita <http://s9y.org> y compruébalo.");
+@define('DATABASE_ALREADY_INSTALLED', 'IGNORADO: La base de datos ya esta instalada');
+@define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
+@define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
+@define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 comments');
+@define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Campo "managingEditor"');
+@define('SYNDICATION_PLUGIN_WEBMASTER',  'Campo "webMaster"');
+@define('SYNDICATION_PLUGIN_BANNERURL', 'Imagen para el RSS feed');
+@define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Ancho de Imagen');
+@define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Alto de Imagen');
+@define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'E-Mail del webmaster, si esta disponible. (déjalo vacío para no mostrarlo) [RSS 2.0]');
+@define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', 'E-Mail del editor, si esta disponible. (déjalo vacío para no mostrarlo) [RSS 2.0]');
+@define('SYNDICATION_PLUGIN_BANNERURL_DESC', 'URL de la imagen en formato GIF/JPEG/PNG, si esta disponible. (dejándolo vacío se usara el logo de serendipity)');
+@define('SYNDICATION_PLUGIN_BANNERWIDTH_DESC', 'en pixels, max. 144');
+@define('SYNDICATION_PLUGIN_BANNERHEIGHT_DESC', 'en pixels, max. 400');
+@define('SYNDICATION_PLUGIN_TTL', 'Campo "ttl" (time-to-live)');
+@define('SYNDICATION_PLUGIN_TTL_DESC', 'Cantidad de minutos, después de los cuales, tu blog no será verificado por ningún site o aplicación externa.(si lo dejas vacío no se mostrara) [RSS 2.0]');
+@define('SYNDICATION_PLUGIN_PUBDATE', 'Campo "pubDate"');
+@define('SYNDICATION_PLUGIN_PUBDATE_DESC', '¿Debería el campo "pubDate" estar incluido en un canal RSS para mostrar la fecha del ultimo post?');
+@define('CONTENT', 'Contenido');
+@define('TYPE', 'Tipo');
+@define('DRAFT', 'Borrador');
+@define('PUBLISH', 'Publicar');
+@define('PREVIEW', 'Previsualizacion');
+@define('DATE', 'Fecha');
+@define('DATE_FORMAT_2', 'Y-m-d H:i'); // Needs to be ISO 8601 compliant for date conversion!
+@define('DATE_INVALID', 'Atención: La fecha especificada no es valida. Debe tener el formato AAAA-MM-DD HH:MM.');
+@define('CATEGORY_PLUGIN_DESC', 'Muestra la lista de categorías.');
+@define('ALL_AUTHORS', 'Todos los autores');
+@define('CATEGORIES_TO_FETCH', 'Categorías enlazadas');
+@define('CATEGORIES_TO_FETCH_DESC', '¿De que autor quiere enlazar las categorías?');
+@define('PAGE_BROWSE', 'Pagina %s de %s, en total %s posts');
+@define('PREVIOUS_PAGE', 'Pagina previa');
+@define('NEXT_PAGE', 'Pagina siguiente');
+@define('ALL_CATEGORIES', 'Todas las categorías');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity NEWS,1.46,1.47 serendipity_functions.inc.php,1.184,1.185

From: <gar...@us...> - 2004-01-21 15:52:03

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv6522

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
Hey, trackback-autodiscovery, leave our own entries alone. We don't need no self control.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- NEWS	21 Jan 2004 15:09:32 -0000	1.46
+++ NEWS	21 Jan 2004 15:51:59 -0000	1.47
@@ -2,6 +2,7 @@
 
 Version 0.5 ()
 ------------------------------------
+    * Do not allow our entries to trackback our other entries on creation. References are still inserted. (garvinhicking)
     * Added input box to admin entry panel where you can provide an entry id to be directly edited. (garvinhicking)
     * Edit an entry directly from your frontend (link beside trackbacks) (garvinhicking)
     * Made pinging blogs configurable/changeable per-entry. Added "blogg.de" to RPC-ping list (garvinhicking)

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- serendipity_functions.inc.php	21 Jan 2004 15:09:32 -0000	1.184
+++ serendipity_functions.inc.php	21 Jan 2004 15:51:59 -0000	1.185
@@ -1723,7 +1723,7 @@
         if($locations[$i][0] == '/') {
             $locations[$i] = 'http://' . $_SERVER['HTTP_HOST'] . $locations[$i];
         }
-
+        
         $query = "SELECT COUNT(id) FROM {$serendipity['dbPrefix']}references WHERE ";
         $query .= "entry_id=$tmpid AND link='" . serendipity_db_escape_string($locations[$i]) . "'";
 
@@ -1732,6 +1732,11 @@
             continue;
         }
         if (!$serendipity['noautodiscovery']) {
+            if (strstr($locations[$i][0], $serendipity['baseURL'])) {
+                // We do not want to trackback our own entries, do we? :-)
+                continue;
+            }
+
             serendipity_reference_autodiscover($locations[$i], $url, $author, $title, serendipity_trackback_excerpt($text));
         }
     }

[php-blog-cvs] serendipity NEWS,1.45,1.46 serendipity_admin_entries.inc.php,1.14,1.15 serendipity_functions.inc.php,1.183,1.184 serendipity_lang_de.inc.php,1.41,1.42 serendipity_lang_en.inc.php,1.52,1.53

From: <gar...@us...> - 2004-01-21 15:09:35

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv29688

Modified Files:
	NEWS serendipity_admin_entries.inc.php 
	serendipity_functions.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php 
Log Message:
Edit entries from frontend.
Input box to edit articles by giving their id on admin panel


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- NEWS	21 Jan 2004 10:10:39 -0000	1.45
+++ NEWS	21 Jan 2004 15:09:32 -0000	1.46
@@ -2,6 +2,8 @@
 
 Version 0.5 ()
 ------------------------------------
+    * Added input box to admin entry panel where you can provide an entry id to be directly edited. (garvinhicking)
+    * Edit an entry directly from your frontend (link beside trackbacks) (garvinhicking)
     * Made pinging blogs configurable/changeable per-entry. Added "blogg.de" to RPC-ping list (garvinhicking)
     * Fixed referrer and exit tracking on PostgreSQL (jtate)
     * Added support for pinging weblogs.com, blo.gs, blogrolling.com and technorati.com to announce new entries. (jimwinstead & sebastianbergmann)

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_admin_entries.inc.php	11 Nov 2003 16:17:03 -0000	1.14
+++ serendipity_admin_entries.inc.php	21 Jan 2004 15:09:32 -0000	1.15
@@ -79,7 +79,7 @@
                 <?php echo date('d.m.y, H:i', $entries[$x]['timestamp']) . ': '; ?>
                 <br />
                 <?php if ($entries[$x]['isdraft'] == 'true') echo DRAFT . ':'; ?>
-                <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=<?php echo $action; ?>&amp;serendipity[id]=<?php echo $entries[$x]['id']; ?>">
+                <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=<?php echo $action; ?>&amp;serendipity[id]=<?php echo $entries[$x]['id']; ?>" title="#<?php echo $entries[$x]['id']; ?>">
                     <?php echo htmlentities(substr(empty($entries[$x]['title']) ? $entries[$x]['body'] : $entries[$x]['title'], 0, 40)); ?>
                 </a>
             </td>
@@ -91,8 +91,8 @@
                 <?php echo date('d.m.y, H:i', $entries[$x + $half]['timestamp']) . ': '; ?>
                 <br />
                 <?php if ($entries[$x + $half]['isdraft'] == 'true') echo DRAFT . ':'; ?>
-                <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=<?php echo $action; ?>&amp;serendipity[id]=<?php echo $entries[$x + $half]['id']; ?>">
-                    <?php echo htmlentities(substr($entries[$x + $half]['title'], 0, 40)); ?>
+                <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=<?php echo $action; ?>&amp;serendipity[id]=<?php echo $entries[$x + $half]['id']; ?>" title="#<?php echo $entries[$x + $half]['id']; ?>">
+                    <?php echo htmlentities(substr(empty($entries[$x + $half]['title']) ? $entries[$x + $half]['body'] : $entries[$x + $half]['title'], 0, 40)); ?>
                 </a>
 <?php
             }
@@ -101,6 +101,20 @@
         </tr>
 <?php
         }
+?>
+        <tr>
+            <td class="serendipity_admin_list_item">
+                <br />
+                <form action="?" method="get">
+                    <input type="hidden" name="serendipity[action]" value="admin" />
+                    <input type="hidden" name="serendipity[adminModule]" value="entries" />
+                    <input type="hidden" name="serendipity[adminAction]" value="edit" />
+                    <?php echo EDIT_ENTRY . ': #<input type="text" size="3" name="serendipity[id]" /> <input type="submit" name="submit" value="' . GO . '" />'; ?>
+                </form>
+
+            </td>
+        </tr>
+<?php
     } else {
         // We've got nothing
 ?>

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- serendipity_functions.inc.php	21 Jan 2004 10:13:39 -0000	1.183
+++ serendipity_functions.inc.php	21 Jan 2004 15:09:32 -0000	1.184
@@ -766,6 +766,10 @@
                     echo '      onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">';
                     echo $label . ' (' . $entry['trackbacks'] . ')</a>';
                 }
+
+                if ($_SESSION['serendipityAuthedUser'] === true) {
+                    echo ' | <a href="' . $serendipity['baseURL'] . 'serendipity_entries.php?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=' . $entry['id'] . '">' . EDIT_ENTRY . '</a>';
+                }
 ?>
                 </div>
 
@@ -784,7 +788,7 @@
 <?php
                 if (isset($serendipity['GET']['id'])) {
 ?>
-            <link rel="pingback" href="<?php echo $serendipity['baseURL']; ?>comment.php?type=pingback&amp;entry_id=<?php echo$entry['id']; ?>" />
+            <link rel="pingback" href="<?php echo $serendipity['baseURL']; ?>comment.php?type=pingback&amp;entry_id=<?php echo $entry['id']; ?>" />
             <br />
 
             <div class="serendipity_commentsTitle"><?php echo COMMENTS; ?></div>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- serendipity_lang_de.inc.php	21 Jan 2004 10:10:39 -0000	1.41
+++ serendipity_lang_de.inc.php	21 Jan 2004 15:09:32 -0000	1.42
@@ -319,6 +319,7 @@
 @define('ADVANCED_OPTIONS', 'Erweiterte Optionen');
 @define('PING_WEBLOGS', 'Einträge ankündigen (via XML-RPC ping) bei:');
 @define('SENDING_PING', 'Sende XML-RPC ping zu %s');
+@define('EDIT_ENTRY', 'Eintrag bearbeiten');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- serendipity_lang_en.inc.php	21 Jan 2004 10:10:39 -0000	1.52
+++ serendipity_lang_en.inc.php	21 Jan 2004 15:09:32 -0000	1.53
@@ -319,6 +319,7 @@
 @define('ADVANCED_OPTIONS', 'Advanced Options');
 @define('PING_WEBLOGS', 'Announce entries (via XML-RPC ping) to:');
 @define('SENDING_PING', 'Sending XML-RPC ping to host %s');
+@define('EDIT_ENTRY', 'Edit entry');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

469 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 523 524 525 526 527 .. 552 > >> (Page 525 of 552)