php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.80,1.81

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

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
Use a dropdown for selecting the Beginning of the week in the Quickjump configuration


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- serendipity_sidebar_items.php	28 Jul 2004 19:06:55 -0000	1.80
+++ serendipity_sidebar_items.php	10 Aug 2004 17:53:48 -0000	1.81
@@ -12,7 +12,11 @@
     {
         switch($name) {
             case 'beginningOfWeek':
-                $propbag->add('type',        'string');
+                $propbag->add('type',        'select');
+                for ( $i = 1; $i <= 7; $i++ ) {
+                    $options[] = serendipity_formatTime('%A', mktime(0,0,0,3,$i-1,2004));
+                }
+                $propbag->add('select_values', $options);                
                 $propbag->add('name',        CALENDAR_BEGINNING_OF_WEEK);
                 $propbag->add('description', CALENDAR_BOW_DESC);
                 $propbag->add('default',     1);

[php-blog-cvs] serendipity serendipity_functions_images.inc.php,1.29,1.30

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

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

Modified Files:
	serendipity_functions_images.inc.php 
Log Message:
- The size of the popup window for non-image files should be 600x500
- Center the zoom window on the screen


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_functions_images.inc.php	10 Aug 2004 17:02:10 -0000	1.29
+++ serendipity_functions_images.inc.php	10 Aug 2004 17:39:52 -0000	1.30
@@ -834,8 +834,10 @@
         </td>
 <?php
                 if ($serendipity['authorid'] == $file['authorid'] || $file['authorid'] == '0' || $serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) {
+                    $popupWidth = ($is_image ? ($file['dimensions_width'] + 20) : 600);
+                    $popupHeight = ($is_image ? ($file['dimensions_height'] + 20) : 500);
 ?>
-        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo ($file['dimensions_height'] + 20); ?>,width=<?php echo ($file['dimensions_width'] + 20); ?>,toolbar=no,menubar=no,location=no,resize=1,resizable=1<?php echo ($is_image ? '' : ',scrollbars=yes'); ?>');" /></td>
+        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo $popupHeight; ?>,width=<?php echo $popupWidth; ?>,top='+ (screen.height-<?php echo $popupHeight ?>)/2 +',left='+ (screen.width-<?php echo $popupWidth ?>)/2 +',toolbar=no,menubar=no,location=no,resize=1,resizable=1<?php echo ($is_image ? '' : ',scrollbars=yes'); ?>');" /></td>
         <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_RENAME; ?>"   alt="<?php echo MEDIA_RENAME; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/rename.png" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /></td>
         <?php if ($is_image) { ?><td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>"   alt="<?php echo IMAGE_RESIZE; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/scale.png"  border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fid]=<?php echo $file['id']; ?>';" /></td><?php } ?>
         <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>"   alt="<?php echo MEDIA_DELETE; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]=<?php echo $file['id']; ?>';" /></td>

[php-blog-cvs] serendipity serendipity_functions_images.inc.php,1.28,1.29

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

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

Modified Files:
	serendipity_functions_images.inc.php 
Log Message:
add scrollbars to zoom window for media manager, when clicking on non-image files. thanks to fredb86.


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_functions_images.inc.php	10 Aug 2004 08:19:23 -0000	1.28
+++ serendipity_functions_images.inc.php	10 Aug 2004 17:02:10 -0000	1.29
@@ -835,7 +835,7 @@
 <?php
                 if ($serendipity['authorid'] == $file['authorid'] || $file['authorid'] == '0' || $serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) {
 ?>
-        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo ($file['dimensions_height'] + 20); ?>,width=<?php echo ($file['dimensions_width'] + 20); ?>,toolbar=no,menubar=no,location=no,resize=1,resizable=1');" /></td>
+        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo ($file['dimensions_height'] + 20); ?>,width=<?php echo ($file['dimensions_width'] + 20); ?>,toolbar=no,menubar=no,location=no,resize=1,resizable=1<?php echo ($is_image ? '' : ',scrollbars=yes'); ?>');" /></td>
         <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_RENAME; ?>"   alt="<?php echo MEDIA_RENAME; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/rename.png" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /></td>
         <?php if ($is_image) { ?><td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>"   alt="<?php echo IMAGE_RESIZE; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/scale.png"  border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fid]=<?php echo $file['id']; ?>';" /></td><?php } ?>
         <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>"   alt="<?php echo MEDIA_DELETE; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]=<?php echo $file['id']; ?>';" /></td>

[php-blog-cvs] serendipity serendipity_functions_images.inc.php,1.27,1.28

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

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

Modified Files:
	serendipity_functions_images.inc.php 
Log Message:
mime types for mobile blogging


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_functions_images.inc.php	8 Aug 2004 22:01:38 -0000	1.27
+++ serendipity_functions_images.inc.php	10 Aug 2004 08:19:23 -0000	1.28
@@ -490,6 +490,22 @@
             $mime = 'audio/x-ms-wma';
             break;
 
+        case 'qcp':
+            $mime = 'audio/vnd.qcelp';
+            break;
+
+        case 'jad':
+            $mime = 'text/vnd.sun.j2me.app-descriptor';
+            break;
+
+        case '3g2':
+        case '3gp':
+            $mime = 'video/3gpp';
+            break;
+
+        case 'jar':
+            $mime = 'application/java-archive';
+
         default:
             $mime = 'application/octet-stream';
             break;

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.392,1.393 serendipity_xmlrpc.php,1.15,1.16 NEWS,1.197,1.198

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

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

Modified Files:
	serendipity_functions.inc.php serendipity_xmlrpc.php NEWS 
Log Message:
fixes from ilya for mt/blogger api



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- NEWS	8 Aug 2004 15:24:49 -0000	1.197
+++ NEWS	9 Aug 2004 19:57:34 -0000	1.198
@@ -3,14 +3,21 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed some postgreSQL-issues, thanks to Ilya A. Volynets-Evenbakh!
+
+    * Improved and fixed XHTML-Cleanup Event plugin (garvinhicking)
+
+    * Fixed .htaccess update/creation errors for shared installation
+      (garvinhicking)
+
     * RFE #832040 - Allow for easier handling of Calendar CSS classes
       and remove hardcoded attributes for "today" (tomsommer)
 
-    * Add detection for support of php_value directives in .htaccess 
+    * Add detection for support of php_value directives in .htaccess
       files (tomsommer)
 
-    * Installation will report an error, if the needed db-extension for 
-      a specific database-type are not available within PHP 
+    * Installation will report an error, if the needed db-extension for
+      a specific database-type are not available within PHP
       (garvinhicking)
 
     * Added bulgariang language, thanks to Bogomil Shopov

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -d -r1.392 -r1.393
--- serendipity_functions.inc.php	9 Aug 2004 15:25:24 -0000	1.392
+++ serendipity_functions.inc.php	9 Aug 2004 19:57:34 -0000	1.393
@@ -2561,6 +2561,12 @@
         if (!$_SESSION['serendipityRightPublish']) {
             $entry['isdraft'] = 'true';
         }
+	if(!isset($entry['allow_comments'])){
+	    $entry['allow_comments']='false';
+	}
+	if(!isset($entry['moderate_comments'])){
+	    $entry['moderate_comments']='false';
+	}
 
         $res = serendipity_db_insert('entries', $entry);
 

Index: serendipity_xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_xmlrpc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_xmlrpc.php	27 May 2004 13:11:35 -0000	1.15
+++ serendipity_xmlrpc.php	9 Aug 2004 19:57:34 -0000	1.16
@@ -193,6 +193,7 @@
 }
 
 function blogger_newPost($message) {
+    global $serendipity;
     $val = $message->params[2];
     $username = $val->getval();
     $val = $message->params[3];
@@ -202,6 +203,8 @@
     }
     $val = $message->params[4];
     $entry['body']  = $val->getval();
+    $entry['allow_comments'] = $serendipity['allowCommentsDefault'];
+    $entry['moderate_comments'] = $serendipity['moderateCommentsDefault'];
     $id = serendipity_updertEntry($entry);
     return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
 }
@@ -241,6 +244,7 @@
 }
 
 function metaWeblog_newPost($message) {
+    global $serendipity;
     $val = $message->params[1];
     $username = $val->getval();
     $val = $message->params[2];
@@ -256,6 +260,8 @@
     $entry['body'] = $post_array['description'];
     $entry['extended'] = $post_array['mt_text_more'];
     $entry['isdraft'] = ($publish == 0)?'true':'false';
+    $entry['allow_comments'] = $serendipity['allowCommentsDefault'];
+    $entry['moderate_comments'] = $serendipity['moderateCommentsDefault'];
     $id = serendipity_updertEntry($entry);
     return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
 }

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.3,1.4 serendipity_lang_cs.inc.php,1.50,1.51 serendipity_lang_cz.inc.php,1.50,1.51 serendipity_lang_da.inc.php,1.67,1.68 serendipity_lang_de.inc.php,1.84,1.85 serendipity_lang_en.inc.php,1.68,1.69 serendipity_lang_es.inc.php,1.66,1.67 serendipity_lang_fr.inc.php,1.46,1.47 serendipity_lang_nl.inc.php,1.24,1.25 serendipity_lang_pt.inc.php,1.24,1.25

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

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

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php 
	serendipity_lang_cz.inc.php serendipity_lang_da.inc.php 
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_nl.inc.php serendipity_lang_pt.inc.php 
Log Message:
Kill orphaned constants


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- serendipity_lang_cs.inc.php	8 Aug 2004 22:01:39 -0000	1.50
+++ serendipity_lang_cs.inc.php	9 Aug 2004 15:53:35 -0000	1.51
@@ -69,7 +69,6 @@
 @define('NEW_ENTRY', 'Nový záznam');
 @define('AUTHOR_SUITE', 'Autorská sekce');
 @define('EDIT_ENTRIES', 'Editovat záznamy');
-@define('DELETE_ENTRIES', 'Vymazat záznamy');
 @define('CATEGORIES', 'Kategorie');
 @define('EDIT_CATEGORIES', 'Editace kategorií');
 @define('IMAGES', 'Obrázky:');
@@ -90,20 +89,14 @@
 @define('ADD_COMMENT', 'Pøidat komentáø');
 @define('NO_COMMENTS', 'Žádné komentáøe.');
 @define('POSTED_BY', 'Vložil');
-@define('TRACKBACK_FROM', 'Odezva od');
 @define('ON', 'v');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Nový komentáø k weblogu "%s", k záznamu s názvem "%s".');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'Nová odezva na weblog/záznam s názvem "%s".');
 @define('NO_CATEGORY', 'Žádná kategorie');
-@define('CANNOT_EDIT_CATEGORY', 'Kategorie není k dispozici');
 @define('ENTRY_BODY', 'Text záznamu');
 @define('EXTENDED_BODY', 'Rozšíøená textová èást');
 @define('CATEGORY', 'Kategorie');
-@define('TEMPLATE_NAME', 'Název vzoru');
-@define('CHOOSE_STYLESHEET', 'Vybrat styl...');
 @define('EDIT', 'Editace');
-@define('MAKE_DEFAULT', 'Použít default');
-@define('CREATE_NEW_STYLESHEET', 'Vytvoøit nový styl');
 @define('NO_ENTRIES_BLAHBLAH', 'Nenalezen žádný záznam odpovídající volbì %s' . "\n");
 @define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Vyhledávání %s odpovídá %s výsledkù:');
 @define('SEARCH_TOO_SHORT', 'Výraz pro vyhledávání musí být delší než 3 znaky');
@@ -178,7 +171,6 @@
 @define('COMMENTS_CLOSED', 'Autor neumožnil pøidávat komentáøe');
 @define('EMPTY_COMMENT', 'Vᚠkomentáø nic neobsahuje, %svrate se%s a zkuste to znovu');
 @define('ENTRIES_FOR', 'Záznamy k %s');
-@define('TOPICS_FOR', 'Témata k %s');
 @define('DOCUMENT_NOT_FOUND', 'Dokument %s nebyl nalezen.');
 @define('USERNAME', 'Jméno (pøezdívka)');
 @define('PASSWORD', 'Heslo');
@@ -211,7 +203,6 @@
 @define('NO', 'Ne');
 @define('USE_DEFAULT', 'Default');
 @define('CHECK_N_SAVE', 'Provìøit a uložit');
-@define('DIRECTORY_NOT_EXISTANT', 'Adresáø %s neexistuje. Vytvoøte jej!');
 @define('DIRECTORY_WRITE_ERROR', 'Nelze zapisovat do adresáøe %s. Provìøte oprávnìní.');
 @define('DIRECTORY_CREATE_ERROR', 'Adresáø %s neexistuje a nemohl být vytvoøen. Vytvoøte adresáø manuálnì.');
 @define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; spustit <i>%s %s</i>');
@@ -222,7 +213,6 @@
 @define('WWW_USER', 'Zmìòte www na uživatele, který je urèen v Apache (na pø. nobody).');
 @define('BROWSER_RELOAD', 'Po dokonèení stisknìte tlaèítko obnovení stránky ve Vašem prohlížeèi.');
 @define('DIAGNOSTIC_ERROR', 'Diagnostika detekovala nìjaké chyby ve vkládaných informacích:');
-@define('ALL_VALID', 'Všechny vložené informace jsou platné.');
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity ještì není nainstalován. <a href="%s">Instalujte</a> jej nyní.');
 @define('INCLUDE_ERROR', 'chyba serendipity: nelze vložit %s - ukonèeno.');
 @define('DATABASE_ERROR', 'chyba serendipity: nelze se spojit s databází - ukonèeno.');
@@ -235,7 +225,6 @@
 @define('WRITTEN_N_SAVED', 'Konfigurace byla zapsána a uložena');
 @define('IMAGE_ALIGNMENT', 'Úprava obrázku');
 @define('ENTER_NEW_NAME', 'Nový název: ');
-@define('IMAGE_MANAGER', 'Správa obrázkù');
 @define('RESIZING', 'Zmìna rozmìrù');
 @define('RESIZE_DONE', 'Hotovo (upraven rozmìr %s obrázkù).');
 @define('SYNCING', 'Synchronizace databáze s adresáøem obrázkù');
@@ -271,7 +260,6 @@
 @define('SYNDICATION_PLUGIN_20c', 'Komentáøe RSS 2.0');
 @define('SYNDICATION_PLUGIN_ATOM03', 'Kanál ATOM 0.3');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', 'Kanál %s');
-@define('SYNDICATION_PLUGIN_GENERIC_COMMENTFEED', 'Komentáøe %s');
 @define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Pole "hlavní redaktor"');
 @define('SYNDICATION_PLUGIN_WEBMASTER',  'Pole "webmaster"');
 @define('SYNDICATION_PLUGIN_BANNERURL', 'Obrázek kanálu RSS');
@@ -306,8 +294,6 @@
 @define('DO_MARKUP_DESCRIPTION', 'Pøevést znaèky na text (smajlíky, zkratky *, /, _, ...). Vypnutí této volby zajistí uložení HTML kódù v textu. Pøednastaveno "Ano".');
 @define('GENERAL_PLUGIN_DATEFORMAT', 'Formátování data');
 @define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Formát aktuálního data záznamu, používá PHP promìnnou strftime(). (Pøednastaveno: "%s")');
-@define('GENERAL_PLUGIN_LANGUAGE', 'Výstupní jazyk');
-@define('GENERAL_PLUGIN_LANGUAGE_BLAHBLAH', 'Který výstupní jazyk bude použit pro formátování data a textu? ("en|de", pøednastaveno "en")');
 @define('ERROR_TEMPLATE_FILE', 'Nelze otevøít vzorový soubor, updatujte Serendipity!');
 @define('ADVANCED_OPTIONS', 'Rozšíøené volby');
 @define('EDIT_ENTRY', 'Editovat záznam');
@@ -348,17 +334,6 @@
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Vaše instalace Serendipity je upgradována na %s');
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Kliknutím %ssem%s se vrátíte do vašeho weblogu');
 @define('IMAGE_NAME', 'Uložit obrázek pod názvem (prázdné: použít pùvodní název): ');
-@define('RECENTENTRIES_PLUGIN_TITLE', 'Poslední záznamy');
-@define('RECENTENTRIES_PLUGIN_BLAHBLAH', 'Ukázat názvy a obsah posledních záznamù');
-@define('RECENTENTRIES_PLUGIN_NUMBER', 'Poèet záznamù');
-@define('RECENTENTRIES_PLUGIN_NUMBER_BLAHBLAH', 'Kolik záznamù chcete zobrazit? (Pøednastaveno: 10)');
-@define('COMMENTS_PLUGIN_BLAHBLAH', 'Zobrazit poslední komentáøe k vašim záznamùm');
-@define('COMMENTS_PLUGIN_WORDWRAP', 'Omezení délky');
-@define('COMMENTS_PLUGIN_WORDWRAP_BLAHBLAH', 'Kolik slov povolit do omezení? (Pøednastaveno: 30)');
-@define('COMMENTS_PLUGIN_MAXCHARS', 'Maximální poèet znakù jednoho komentáøe');
-@define('COMMENTS_PLUGIN_MAXCHARS_BLAHBLAH', 'Kolik znakù komentáøe chcete zobrazit? (Pøednastaveno: 120)');
-@define('COMMENTS_PLUGIN_MAXENTRIES', 'Maximální poèet komentáøù');
-@define('COMMENTS_PLUGIN_MAXENTRIES_BLAHBLAH', 'Kolik komentáøù chcete zobrazit? (Pøednastaveno: 15)');
 @define('MANAGE_USERS', 'Správa uživatelù');
 @define('EDIT_USERS', 'Editovat uživatele');
 @define('CREATE_USERS', 'Vytvoøit uživatele');
@@ -385,7 +360,6 @@
 @define('ERROR_NO_DIRECTORY', 'Chyba: Adresáø %s neexistuje');
 @define('FORCE_DELETE', 'Vynucené mazání souborù, které nejsou v databázi');
 @define('CHECKING_DIRECTORY', 'Kontrola souborù v adresáøi %s');
-@define('DELETING_DIRECTORY', 'Vymazání adresáøe %s...');
 @define('DELETING_FILE', 'Vymazání souboru %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Nelze odstranit neprázdný adresáø. Zkuste zvolit "vynucené mazání", pokud potøebujete vymazat tyto soubory, a odešlete požadavek znovu. Existující soubory jsou:');
 @define('DIRECTORY_DELETE_FAILED', 'Vymazání adresáøe %s se nepodaøilo. Zkontrolujte oprávnìní nebo ètìte zprávu výše.');

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- serendipity_lang_da.inc.php	8 Aug 2004 22:01:39 -0000	1.67
+++ serendipity_lang_da.inc.php	9 Aug 2004 15:53:35 -0000	1.68
@@ -64,7 +64,6 @@
 @define('NEW_ENTRY', 'Ny artikel');
 @define('AUTHOR_SUITE', 'Redaktørsuite');
 @define('EDIT_ENTRIES', 'Rediger artikler');
-@define('DELETE_ENTRIES', 'Slet artikler');
 @define('CATEGORIES', 'Kategorier');
 @define('EDIT_CATEGORIES', 'Administrer kategorier');
 @define('IMAGES', 'Billeder:');
@@ -85,20 +84,14 @@
 @define('ADD_COMMENT', 'Tilføj kommentar');
 @define('NO_COMMENTS', 'Ingen kommentarer.');
 @define('POSTED_BY', 'Skrevet af');
-@define('TRACKBACK_FROM', 'Trackback fra');
 @define('ON', 'aktiv');
 @define('A_NEW_COMMENT_BLAHBLAH', 'En ny kommentar er blevet oprettet på din blog "%s", til artiklen ved navn "%s".');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'Et nyt trackback er blevet lavet til din artikel ved navn "%s".');
 @define('NO_CATEGORY', 'Ingen kategori');
-@define('CANNOT_EDIT_CATEGORY', 'Kategori not available');
 @define('ENTRY_BODY', 'Artikel indhold');
 @define('EXTENDED_BODY', 'Udvidet indhold');
 @define('CATEGORY', 'Kategori');
-@define('TEMPLATE_NAME', 'Navn på template');
-@define('CHOOSE_STYLESHEET', 'Vælg et stylesheet....');
 @define('EDIT', 'Rediger');
-@define('MAKE_DEFAULT', 'Sæt som standard');
-@define('CREATE_NEW_STYLESHEET', 'Opret nyt stylesheet');
 @define('NO_ENTRIES_BLAHBLAH', 'Ingen artikler blev fundet som indeholdt %s' . "\n");
 @define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Din søgning på %s retunerede %s resultater:');
 @define('SEARCH_TOO_SHORT', 'Din søgning skal være på mere end 3 tegn');
@@ -173,7 +166,6 @@
 @define('COMMENTS_CLOSED', 'Forfatteren har valgt ikke at tillade kommentarer til denne artikel');
 @define('EMPTY_COMMENT', 'Din kommentar indeholdt ikke noget, gå venligst %stilbage%s og prøv igen');
 @define('ENTRIES_FOR', 'Artikler fra %s');
-@define('TOPICS_FOR', 'Emner fra %s');
 @define('DOCUMENT_NOT_FOUND', 'Dokumentet %s kunne ikke findes.');
 @define('USERNAME', 'Brugernavn');
 @define('PASSWORD', 'Adgangskode');
@@ -206,7 +198,6 @@
 @define('NO', 'Nej');
 @define('USE_DEFAULT', 'Default');
 @define('CHECK_N_SAVE', 'Check &amp; gem');
-@define('DIRECTORY_NOT_EXISTANT', 'Biblioteket %s findes ikke. Opret det!');
 @define('DIRECTORY_WRITE_ERROR', 'Kan ikke skrive til biblioteket %s. Check filrettighederne.');
 @define('DIRECTORY_CREATE_ERROR', 'Biblioteket %s eksisterer ikke og kunne ikke oprettes. Opret venligst biblioteket manuelt');
 @define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; Kør <i>%s %s</i>');
@@ -217,7 +208,6 @@
 @define('WWW_USER', 'Ændr www til den bruger som apache kører som (fx. nobody).');
 @define('BROWSER_RELOAD', 'Når du har gjort dette, så tryk på browserens "opdater" knap');
 @define('DIAGNOSTIC_ERROR', 'Vi har opdaget nogle fejl mens vi kørte nogle diagnostiker på dine indtastede informationer:');
-@define('ALL_VALID', 'Alle de indtastede informationer ser ud til at være korrekte.');
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity er endnu ikke installeret. Klik <a href="%s">her for at installere</a> nu.');
 @define('INCLUDE_ERROR', 'serendipityfejl: Kunne ikke inkludere %s - Afbryder.');
 @define('DATABASE_ERROR', 'serendipityfejl: Kunne ikke oprette forbindelse til databasen - Afbryder.');
@@ -230,7 +220,6 @@
 @define('WRITTEN_N_SAVED', 'Konfiguration skrevet &amp; gemt');
 @define('IMAGE_ALIGNMENT', 'Billedejustering');
 @define('ENTER_NEW_NAME', 'Indtast det nye navn for: ');
-@define('IMAGE_MANAGER', 'Billedehåndtering');
 @define('RESIZING', 'Ændre dimensioner');
 @define('RESIZE_DONE', 'Færdig (Ændrede %s billeder).');
 @define('SYNCING', 'Synkronisere databasen med billedemappen');
@@ -266,7 +255,6 @@
 @define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 kommentarer');
 @define('SYNDICATION_PLUGIN_ATOM03', 'ATOM 0.3 feed');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
-@define('SYNDICATION_PLUGIN_GENERIC_COMMENTFEED', '%s kommentarer');
 @define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Feltet "Hovedredaktør"');
 @define('SYNDICATION_PLUGIN_WEBMASTER',  'Feltet "webmaster"');
 @define('SYNDICATION_PLUGIN_BANNERURL', 'Billede til RSS feedet');
@@ -299,25 +287,10 @@
 @define('ALL_CATEGORIES', 'Alle kategorier');
 @define('DO_MARKUP', 'Udført Markup-transformation');
 @define('DO_MARKUP_DESCRIPTION', 'Tilføj markup-transformationer på teksten (smilies, shortcut markups via *, /, _, ...). Hvis du slår dette fra vil al HTML-kode i teksten blive bibeholdt. Standard er "Ja".');
-@define('RECENTENTRIES_PLUGIN_TITLE', 'Nyeste artikler');
-@define('RECENTENTRIES_PLUGIN_BLAHBLAH', 'Viser titlerne og datoerne på de nyeste artikler');
-@define('RECENTENTRIES_PLUGIN_NUMBER', 'Antallet af artikler');
-@define('RECENTENTRIES_PLUGIN_NUMBER_BLAHBLAH', 'Hvor mangel artikler skal der vises? (Standard: 10)');
-@define('COMMENTS_PLUGIN_BLAHBLAH', 'Viser de nyeste kommentarer på dine artikler');
-@define('COMMENTS_PLUGIN_WORDWRAP', 'Linieskift');
-@define('COMMENTS_PLUGIN_WORDWRAP_BLAHBLAH', 'Hvor mange ord inden der skal ske et linieskift? (Standard: 30)');
-@define('COMMENTS_PLUGIN_MAXCHARS', 'Maximalt antal tegn per kommentar');
-@define('COMMENTS_PLUGIN_MAXCHARS_BLAHBLAH', 'Hvor mange tegn skal vises af hver kommentar? (Standard: 120)');
-@define('COMMENTS_PLUGIN_MAXENTRIES', 'Maximalt antal kommentarer');
-@define('COMMENTS_PLUGIN_MAXENTRIES_BLAHBLAH', 'Hvor mange kommentarer vil blive vist? (Standard: 15)');
 @define('GENERAL_PLUGIN_DATEFORMAT', 'Datoformat');
 @define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Formatet på artiklens faktiske dato, brug PHPs strftime() variabler. (Standard: "%s")');
-@define('GENERAL_PLUGIN_LANGUAGE', 'Sprog');
-@define('GENERAL_PLUGIN_LANGUAGE_BLAHBLAH', 'Hvilket sprog er brugt til datoer og tekstformatering? ("en|de", default "en")');
 @define('ERROR_TEMPLATE_FILE', 'Kunne ikke åbne skabelonen, opdater Serendipity!');
 @define('ADVANCED_OPTIONS', 'Avancerede indstillinger');
-@define('PING_WEBLOGS', 'Annoncer artikler (via XML-RPC ping) til:');
-@define('SENDING_PING', 'Send XML-RPC ping til host %s');
 @define('EDIT_ENTRY', 'Rediger artikel');
 @define('HTACCESS_ERROR', 'For at kunne checke din lokale webserver\'s installation, skal Serendipity være i stand til at skrive til filen ".htaccess". Dette var ikke muligt pga. forkerte rettigheder. Justér rettighederne således: <br />&nbsp;&nbsp;%s<br />og genindlæs siden.');
 @define('SORT_ORDER', 'Sorter efter');
@@ -488,7 +461,6 @@
 @define('ERROR_NO_DIRECTORY', 'Fejl: Mappen %s eksistere ikke');
 @define('FORCE_DELETE', 'Gennemtving sletning af filer der ikke befinder sig i media databasen');
 @define('CHECKING_DIRECTORY', 'Checker filer i mappen %s');
-@define('DELETING_DIRECTORY', 'Sletter mappen %s...');
 @define('DELETING_FILE', 'Sletter fil %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Kunne ikke fjerne en ikke-tom mappe. Afkryds "gennemtving sletning" feltet, hvis du vil slette disse og tryk derefter på submit igen. Eksisterende filer er:');
 @define('DIRECTORY_DELETE_FAILED', 'Sletning af mappe %s mislykkedes. Check rettigheder eller ovenstående beskeder.');

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- serendipity_lang_fr.inc.php	8 Aug 2004 22:01:40 -0000	1.46
+++ serendipity_lang_fr.inc.php	9 Aug 2004 15:53:36 -0000	1.47
@@ -66,7 +66,6 @@
 @define('NEW_ENTRY', 'Poster une news');
 @define('AUTHOR_SUITE', 'Suite des auteurs');
 @define('EDIT_ENTRIES', 'Editer les news');
-@define('DELETE_ENTRIES', 'Supprimer les news');
 @define('CATEGORIES', 'Catégories');
 @define('EDIT_CATEGORIES', 'Configurer les catégories');
 @define('IMAGES', 'Images:');
@@ -87,20 +86,14 @@
 @define('ADD_COMMENT', 'Ajouter un commentaire');
 @define('NO_COMMENTS', 'Pas de commentaires.');
 @define('POSTED_BY', 'Posté par');
-@define('TRACKBACK_FROM', 'Suivi de');
 @define('ON', 'sur');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Un nouveau commentaire a été posté sur votre blog "%s", dans la news intitulée "%s".');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'Un nouveau suivi a été fait sur votre blog à la news intitulée "%s".');
 @define('NO_CATEGORY', 'Pas de Catégorie');
-@define('CANNOT_EDIT_CATEGORY', 'Catégorie non disponible');
 @define('ENTRY_BODY', 'Corps de la news');
 @define('EXTENDED_BODY', 'Extension de la news');
 @define('CATEGORY', 'Catégorie');
-@define('TEMPLATE_NAME', 'Nom du thème');
-@define('CHOOSE_STYLESHEET', 'Choisissez un style....');
 @define('EDIT', 'Editer');
-@define('MAKE_DEFAULT', 'Par défaut');
-@define('CREATE_NEW_STYLESHEET', 'Créer un nouveau style');
 @define('NO_ENTRIES_BLAHBLAH', 'Aucune news trouvée pour la requête %s' . "\n");
 @define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Votre recherche pour %s a donné %s résultats:');
 @define('SEARCH_TOO_SHORT', 'Votre recherche-requête doit être supérieure à 3 caractères');
@@ -175,7 +168,6 @@
 @define('COMMENTS_CLOSED', 'L\'auteur n\'a pas autorisé de commentaires pour cette news');
 @define('EMPTY_COMMENT', 'Votre commentaire est vide, donc %sretournez en arrière%s et réessayez');
 @define('ENTRIES_FOR', 'News pour %s');
-@define('TOPICS_FOR', 'Sujets pour %s');
 @define('DOCUMENT_NOT_FOUND', 'Le document %s n\'a pas été trouvé.');
 @define('USERNAME', 'Nom d\'utilisateur');
 @define('PASSWORD', 'Mot de passe');
@@ -207,7 +199,6 @@
 @define('NO', 'Non');
 @define('USE_DEFAULT', 'Default');
 @define('CHECK_N_SAVE', 'Vérifier &amp; sauvegarder');
-@define('DIRECTORY_NOT_EXISTANT', 'Le répertoire %s n\'existe pas. Le créer.');
 @define('DIRECTORY_WRITE_ERROR', 'Ne peut écrire dans le répertoire %s. Vérifiez les permissions.');
 @define('DIRECTORY_CREATE_ERROR', 'Le répertoire %s n\'existe pas et ne peux être crée. Merci de créer le répertoire manuellement');
 @define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; exécute <i>%s %s</i>');
@@ -218,7 +209,6 @@
 @define('WWW_USER', 'Changer www pour l\'utilisateur apache utilisé comme (exemple : personne).');
 @define('BROWSER_RELOAD', 'Une fois ceci effectué, faites un refresh en pressant la touche "F5".');
 @define('DIAGNOSTIC_ERROR', 'Plusieurs erreurs détectées lorsque la vérification des informations que vous avez entrées a été lancée:');
-@define('ALL_VALID', 'Toutes les informations saisies semblent être valides.');
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity n\'est pas encore intallé. <a href="%s">Cliquez ici pour l\'installer immédiatement</a>.');
 @define('INCLUDE_ERROR', 'Erreur serendipity: ne peux inclure %s - fermeture.');
 @define('DATABASE_ERROR', 'Erreur serendipity: ne peux se connecter à la base de données - fermeture.');
@@ -231,7 +221,6 @@
 @define('WRITTEN_N_SAVED', 'Configuration écrite &amp; sauvegardée');
 @define('IMAGE_ALIGNMENT', 'Alignement de l\'image');
 @define('ENTER_NEW_NAME', 'Entrez le nouveau nom pour: ');
-@define('IMAGE_MANAGER', 'Administration des images');
 @define('RESIZING', 'Redimensionnement');
 @define('RESIZE_DONE', 'Terminé (redimensionné %s images).');
 @define('SYNCING', 'Synchronisation de la base de données avec le répertoire des images');
@@ -267,7 +256,6 @@
 @define('SYNDICATION_PLUGIN_20c', 'Commentaires RSS 2.0');
 @define('SYNDICATION_PLUGIN_ATOM03', 'ATOM 0.3');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s');
-@define('SYNDICATION_PLUGIN_GENERIC_COMMENTFEED', 'Commentaires %s');
 @define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Champ "EditeurAdministration"');
 @define('SYNDICATION_PLUGIN_WEBMASTER',  'Champ "Webmaster"');
 @define('SYNDICATION_PLUGIN_BANNERURL', 'Image pour les liens RSS');
@@ -294,7 +282,6 @@
 @define('ALL_AUTHORS', 'Tous les auteurs');
 @define('CATEGORIES_TO_FETCH', 'Catégories à diviser');
 @define('CATEGORIES_TO_FETCH_DESC', 'Diviser les catégories par auteur?');
-@define('PAGE_BROWSE_ENTIRES', 'La page %s de %s, totalise %s news');
 @define('PREVIOUS_PAGE', 'Page précédente');
 @define('NEXT_PAGE', 'Page suivante');
 @define('ALL_CATEGORIES', 'Toutes les catégories');
@@ -302,8 +289,6 @@
 @define('DO_MARKUP_DESCRIPTION', 'Appliquer les transformations de code au texte (smileys, raccourcis via *, /, _, ...). Le désactiver préserva tout le code HTML dans le texte. "Oui" est par défaut.');
 @define('GENERAL_PLUGIN_DATEFORMAT', 'Format de la date');
 @define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Le format de date des news actuelles, utilisant la variable PHPs strftime(). (Défaut: "%s")');
-@define('GENERAL_PLUGIN_LANGUAGE', 'Language');
-@define('GENERAL_PLUGIN_LANGUAGE_BLAHBLAH', 'Quel est votre language utilisé pour la date et le format du texte? ("en|de", défaut "en")');
 @define('ERROR_TEMPLATE_FILE', 'Impossible d\'ouvrir le fichier du thème, merci de mettre Serendipity à jour!');
 @define('ADVANCED_OPTIONS', 'Options avancées');
 @define('EDIT_ENTRY', 'Editer les news');
@@ -475,7 +460,6 @@
 @define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
 @define('FORCE_DELETE', 'Force deletion of files not inside the media database');
 @define('CHECKING_DIRECTORY', 'Checking files in directory %s');
-@define('DELETING_DIRECTORY', 'Deleting directory %s...');
 @define('DELETING_FILE', 'Deleting file %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Could not remove non-empty directory. Check the "force deletion" checkbox if you want to remove those files as well, and then submit again. Existing files are:');
 @define('DIRECTORY_DELETE_FAILED', 'Deletion of directory %s failed. Check permissions or messages above.');

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- serendipity_lang_cz.inc.php	8 Aug 2004 22:01:39 -0000	1.50
+++ serendipity_lang_cz.inc.php	9 Aug 2004 15:53:35 -0000	1.51
@@ -69,7 +69,6 @@
 @define('NEW_ENTRY', 'Nový záznam');
 @define('AUTHOR_SUITE', 'Autorská sekce');
 @define('EDIT_ENTRIES', 'Editovat záznamy');
-@define('DELETE_ENTRIES', 'Vymazat záznamy');
 @define('CATEGORIES', 'Kategorie');
 @define('EDIT_CATEGORIES', 'Editace kategorií');
 @define('IMAGES', 'Obrázky:');
@@ -90,20 +89,14 @@
 @define('ADD_COMMENT', 'Pøidat komentáø');
 @define('NO_COMMENTS', '®ádné komentáøe.');
 @define('POSTED_BY', 'Vlo¾il');
-@define('TRACKBACK_FROM', 'Odezva od');
 @define('ON', 'v');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Nový komentáø k weblogu "%s", k záznamu s názvem "%s".');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'Nová odezva na weblog/záznam s názvem "%s".');
 @define('NO_CATEGORY', '®ádná kategorie');
-@define('CANNOT_EDIT_CATEGORY', 'Kategorie není k dispozici');
 @define('ENTRY_BODY', 'Text záznamu');
 @define('EXTENDED_BODY', 'Roz¹íøená textová èást');
 @define('CATEGORY', 'Kategorie');
-@define('TEMPLATE_NAME', 'Název vzoru');
-@define('CHOOSE_STYLESHEET', 'Vybrat styl...');
 @define('EDIT', 'Editace');
-@define('MAKE_DEFAULT', 'Pou¾ít default');
-@define('CREATE_NEW_STYLESHEET', 'Vytvoøit nový styl');
 @define('NO_ENTRIES_BLAHBLAH', 'Nenalezen ¾ádný záznam odpovídající volbì %s' . "\n");
 @define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Vyhledávání %s odpovídá %s výsledkù:');
 @define('SEARCH_TOO_SHORT', 'Výraz pro vyhledávání musí být del¹í ne¾ 3 znaky');
@@ -178,7 +171,6 @@
 @define('COMMENTS_CLOSED', 'Autor neumo¾nil pøidávat komentáøe');
 @define('EMPTY_COMMENT', 'Vá¹ komentáø nic neobsahuje, %svra»te se%s a zkuste to znovu');
 @define('ENTRIES_FOR', 'Záznamy k %s');
-@define('TOPICS_FOR', 'Témata k %s');
 @define('DOCUMENT_NOT_FOUND', 'Dokument %s nebyl nalezen.');
 @define('USERNAME', 'Jméno (pøezdívka)');
 @define('PASSWORD', 'Heslo');
@@ -211,7 +203,6 @@
 @define('NO', 'Ne');
 @define('USE_DEFAULT', 'Default');
 @define('CHECK_N_SAVE', 'Provìøit a ulo¾it');
-@define('DIRECTORY_NOT_EXISTANT', 'Adresáø %s neexistuje. Vytvoøte jej!');
 @define('DIRECTORY_WRITE_ERROR', 'Nelze zapisovat do adresáøe %s. Provìøte oprávnìní.');
 @define('DIRECTORY_CREATE_ERROR', 'Adresáø %s neexistuje a nemohl být vytvoøen. Vytvoøte adresáø manuálnì.');
 @define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; spustit <i>%s %s</i>');
@@ -222,7 +213,6 @@
 @define('WWW_USER', 'Zmìòte www na u¾ivatele, který je urèen v Apache (na pø. nobody).');
 @define('BROWSER_RELOAD', 'Po dokonèení stisknìte tlaèítko obnovení stránky ve Va¹em prohlí¾eèi.');
 @define('DIAGNOSTIC_ERROR', 'Diagnostika detekovala nìjaké chyby ve vkládaných informacích:');
-@define('ALL_VALID', 'V¹echny vlo¾ené informace jsou platné.');
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity je¹tì není nainstalován. <a href="%s">Instalujte</a> jej nyní.');
 @define('INCLUDE_ERROR', 'chyba serendipity: nelze vlo¾it %s - ukonèeno.');
 @define('DATABASE_ERROR', 'chyba serendipity: nelze se spojit s databází - ukonèeno.');
@@ -235,7 +225,6 @@
 @define('WRITTEN_N_SAVED', 'Konfigurace byla zapsána a ulo¾ena');
 @define('IMAGE_ALIGNMENT', 'Úprava obrázku');
 @define('ENTER_NEW_NAME', 'Nový název: ');
-@define('IMAGE_MANAGER', 'Správa obrázkù');
 @define('RESIZING', 'Zmìna rozmìrù');
 @define('RESIZE_DONE', 'Hotovo (upraven rozmìr %s obrázkù).');
 @define('SYNCING', 'Synchronizace databáze s adresáøem obrázkù');
@@ -271,7 +260,6 @@
 @define('SYNDICATION_PLUGIN_20c', 'Komentáøe RSS 2.0');
 @define('SYNDICATION_PLUGIN_ATOM03', 'Kanál ATOM 0.3');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', 'Kanál %s');
-@define('SYNDICATION_PLUGIN_GENERIC_COMMENTFEED', 'Komentáøe %s');
 @define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Pole "hlavní redaktor"');
 @define('SYNDICATION_PLUGIN_WEBMASTER',  'Pole "webmaster"');
 @define('SYNDICATION_PLUGIN_BANNERURL', 'Obrázek kanálu RSS');
@@ -306,8 +294,6 @@
 @define('DO_MARKUP_DESCRIPTION', 'Pøevést znaèky na text (smajlíky, zkratky *, /, _, ...). Vypnutí této volby zajistí ulo¾ení HTML kódù v textu. Pøednastaveno "Ano".');
 @define('GENERAL_PLUGIN_DATEFORMAT', 'Formátování data');
 @define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Formát aktuálního data záznamu, pou¾ívá PHP promìnnou strftime(). (Pøednastaveno: "%s")');
-@define('GENERAL_PLUGIN_LANGUAGE', 'Výstupní jazyk');
-@define('GENERAL_PLUGIN_LANGUAGE_BLAHBLAH', 'Který výstupní jazyk bude pou¾it pro formátování data a textu? ("en|de", pøednastaveno "en")');
 @define('ERROR_TEMPLATE_FILE', 'Nelze otevøít vzorový soubor, updatujte Serendipity!');
 @define('ADVANCED_OPTIONS', 'Roz¹íøené volby');
 @define('EDIT_ENTRY', 'Editovat záznam');
@@ -348,17 +334,6 @@
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Va¹e instalace Serendipity je upgradována na %s');
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Kliknutím %ssem%s se vrátíte do va¹eho weblogu');
 @define('IMAGE_NAME', 'Ulo¾it obrázek pod názvem (prázdné: pou¾ít pùvodní název): ');
-@define('RECENTENTRIES_PLUGIN_TITLE', 'Poslední záznamy');
-@define('RECENTENTRIES_PLUGIN_BLAHBLAH', 'Ukázat názvy a obsah posledních záznamù');
-@define('RECENTENTRIES_PLUGIN_NUMBER', 'Poèet záznamù');
-@define('RECENTENTRIES_PLUGIN_NUMBER_BLAHBLAH', 'Kolik záznamù chcete zobrazit? (Pøednastaveno: 10)');
-@define('COMMENTS_PLUGIN_BLAHBLAH', 'Zobrazit poslední komentáøe k va¹im záznamùm');
-@define('COMMENTS_PLUGIN_WORDWRAP', 'Omezení délky');
-@define('COMMENTS_PLUGIN_WORDWRAP_BLAHBLAH', 'Kolik slov povolit do omezení? (Pøednastaveno: 30)');
-@define('COMMENTS_PLUGIN_MAXCHARS', 'Maximální poèet znakù jednoho komentáøe');
-@define('COMMENTS_PLUGIN_MAXCHARS_BLAHBLAH', 'Kolik znakù komentáøe chcete zobrazit? (Pøednastaveno: 120)');
-@define('COMMENTS_PLUGIN_MAXENTRIES', 'Maximální poèet komentáøù');
-@define('COMMENTS_PLUGIN_MAXENTRIES_BLAHBLAH', 'Kolik komentáøù chcete zobrazit? (Pøednastaveno: 15)');
 @define('MANAGE_USERS', 'Správa u¾ivatelù');
 @define('EDIT_USERS', 'Editovat u¾ivatele');
 @define('CREATE_USERS', 'Vytvoøit u¾ivatele');
@@ -385,7 +360,6 @@
 @define('ERROR_NO_DIRECTORY', 'Chyba: Adresáø %s neexistuje');
 @define('FORCE_DELETE', 'Vynucené mazání souborù, které nejsou v databázi');
 @define('CHECKING_DIRECTORY', 'Kontrola souborù v adresáøi %s');
-@define('DELETING_DIRECTORY', 'Vymazání adresáøe %s...');
 @define('DELETING_FILE', 'Vymazání souboru %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Nelze odstranit neprázdný adresáø. Zkuste zvolit "vynucené mazání", pokud potøebujete vymazat tyto soubory, a ode¹lete po¾adavek znovu. Existující soubory jsou:');
 @define('DIRECTORY_DELETE_FAILED', 'Vymazání adresáøe %s se nepodaøilo. Zkontrolujte oprávnìní nebo ètìte zprávu vý¹e.');

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_lang_nl.inc.php	8 Aug 2004 22:01:40 -0000	1.24
+++ serendipity_lang_nl.inc.php	9 Aug 2004 15:53:36 -0000	1.25
@@ -69,7 +69,6 @@
 @define('NEW_ENTRY', 'Nieuwe log');
 @define('AUTHOR_SUITE', 'Auteur Suite');
 @define('EDIT_ENTRIES', 'Bewerk logs');
-@define('DELETE_ENTRIES', 'Verwijder logs');
 @define('CATEGORIES', 'Categorieën');
 @define('EDIT_CATEGORIES', 'Beheer Categorieën');
 @define('IMAGES', 'Beelden:');
@@ -90,7 +89,6 @@
 @define('ADD_COMMENT', 'Commentaar toeveoegen');
 @define('NO_COMMENTS', 'Geen commentaar.');
 @define('POSTED_BY', 'Aangepaakt door');
-@define('TRACKBACK_FROM', 'Trackback van');
 @define('ON', 'aan');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Een nieuwe commentaar werd toegevoegd aan uw blog "%s", in de log met titel "%s".');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'Een nieuwe trackback werd toegevoegd aan uw log met titel "%s".');
@@ -98,11 +96,7 @@
 @define('ENTRY_BODY', 'Log aanhef');
 @define('EXTENDED_BODY', 'Log compleet');
 @define('CATEGORY', 'Categorie:');
-@define('TEMPLATE_NAME', 'template naam');
-@define('CHOOSE_STYLESHEET', 'Kies een StyleSheet....');
 @define('EDIT', 'Bewerk');
-@define('MAKE_DEFAULT', 'Maak default');
-@define('CREATE_NEW_STYLESHEET', 'Maak een nieuwe  StyleSheet');
 @define('NO_ENTRIES_BLAHBLAH', 'Geen logs gevonden met %s' . "\n");
 @define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Uw zoekopdracht naar %s geeft %s resultaten :');
 @define('SEARCH_TOO_SHORT', 'Uw zoekwoord moet langer zijn dan 3 karakters');
@@ -177,7 +171,6 @@
 @define('COMMENTS_CLOSED', 'De auteur laat geen commentaar toe op deze log');
 @define('EMPTY_COMMENT', 'Geen commetaar opgegeven %sg terug%s en probeer opnieuw');
 @define('ENTRIES_FOR', 'Logs voor %s');
-@define('TOPICS_FOR', 'Topics voor %s');
 @define('DOCUMENT_NOT_FOUND', 'Het document %s werd niet gevonden.');
 @define('USERNAME', 'Gebruiker');
 @define('PASSWORD', 'Paswoord');
@@ -209,7 +202,6 @@
 @define('NO', 'Neen');
 @define('USE_DEFAULT', 'Default');
 @define('CHECK_N_SAVE', 'Check &amp; bewaar');
-@define('DIRECTORY_NOT_EXISTANT', 'De folder %s bestaat niet. Aanmaken!');
 @define('DIRECTORY_WRITE_ERROR', 'Kan niet schrijven op deze folder %s. Kijk de permissies na.');
 @define('DIRECTORY_CREATE_ERROR', 'Folder %s bestaat niet en kon niet aangemaakt worden. Maak zelf de folder');
 @define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; start <i>%s %s</i>');
@@ -220,7 +212,6 @@
 @define('WWW_USER', 'Verander www naar de gebruiker waarop apache wraait (bvb nobody).');
 @define('BROWSER_RELOAD', 'Eens dat gedaan klik "refresh" in je browser.');
 @define('DIAGNOSTIC_ERROR', 'We hebben een paar fouten gevonden:');
-@define('ALL_VALID', 'Alle gegeven informatie is correct.');
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity is nog niet geïnstalleerd. <a href="%s">install</a> nu.');
 @define('INCLUDE_ERROR', 'serendipity fout: kon %s nirt toevoegen - ik stop.');
 @define('DATABASE_ERROR', 'serendipity fout: ik kan niet aansluiten op de database - ik stop.');
@@ -233,7 +224,6 @@
 @define('WRITTEN_N_SAVED', 'Configuratie &amp; bewaard');
 @define('IMAGE_ALIGNMENT', 'Beeld alignering');
 @define('ENTER_NEW_NAME', 'Geef een nieuwe naam voor: ');
-@define('IMAGE_MANAGER', 'Beheer van beelden');
 @define('RESIZING', 'Vergroten/Verkleinen');
 @define('RESIZE_DONE', 'Gedaane ( %s aangepast).');
 @define('SYNCING', 'Syncronizeren van de database met de beeldfolder');
@@ -302,8 +292,6 @@
 @define('DO_MARKUP_DESCRIPTION', 'Pas markup transformaties toe op (smilies, shortcut markups via *, /, _, ...). Disabling bewaart HTML-code in de terkst. Default is "Yes".');
 @define('GENERAL_PLUGIN_DATEFORMAT', 'Formaat datum');
 @define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Het formaat van de datum van de log, gebruik makend van de PHP strftime() variabelen (Default: "%s")');
-@define('GENERAL_PLUGIN_LANGUAGE', 'Output Taal');
-@define('GENERAL_PLUGIN_LANGUAGE_BLAHBLAH', 'Wat is je output taal voor datum en tekstformattering? ("en|de", default "en")');
 @define('ERROR_TEMPLATE_FILE', 'Kan het template bestand niet openen, gelieve een update uit te voeren!');
 @define('ADVANCED_OPTIONS', 'Ge avanceerde opties');
 @define('EDIT_ENTRY', 'Bewerk log');
@@ -346,7 +334,7 @@
 @define('IMAGE_NAME', 'Bewaar het beeld met volgende naam: (leeg: gebruik oorspronkelijke bestandnaam): ');
 
 /* TRANSLATE */
-  @define('MANAGE_USERS', 'Manage users');
+@define('MANAGE_USERS', 'Manage users');
 @define('EDIT_USERS', 'Edit users');
 @define('CREATE_USERS', 'Create users');
 @define('CREATE_NEW_USER', 'Create new user');
@@ -375,7 +363,6 @@
 @define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
 @define('FORCE_DELETE', 'Force deletion of files not inside the media database');
 @define('CHECKING_DIRECTORY', 'Checking files in directory %s');
-@define('DELETING_DIRECTORY', 'Deleting directory %s...');
 @define('DELETING_FILE', 'Deleting file %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Could not remove non-empty directory. Check the "force deletion" checkbox if you want to remove those files as well, and then submit again. Existing files are:');
 @define('DIRECTORY_DELETE_FAILED', 'Deletion of directory %s failed. Check permissions or messages above.');
@@ -389,7 +376,6 @@
 @define('IN_REPLY_TO', 'In reply to');
 @define('TOP_LEVEL', 'Top level');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
-@define('SYNDICATION_PLUGIN_GENERIC_COMMENTFEED', '%s comments');
 @define('PERMISSIONS', 'Permissions');
 
 /* DATABASE SETTINGS */
@@ -540,7 +526,7 @@
 @define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login');
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
 @define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?'); // Translate
-@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"no": Unchecked external links (Top Exits, Top Referrers, User comments) are not shown/shown as plain text where applicable to prevent google spam (recommended). "yes": Unchecked external links are shown as hyperlinks. Can be overridden within sidebar plugin configuration!'); // Translate 
+@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"no": Unchecked external links (Top Exits, Top Referrers, User comments) are not shown/shown as plain text where applicable to prevent google spam (recommended). "yes": Unchecked external links are shown as hyperlinks. Can be overridden within sidebar plugin configuration!'); // Translate
 @define('PAGE_BROWSE_COMMENTS', 'Page %s of %s, totalling %s comments'); // Translate
 @define('FILTERS', 'Filters'); // Translate
 @define('FIND_ENTRIES', 'Find entries'); // Translate

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- serendipity_lang_en.inc.php	8 Aug 2004 22:01:40 -0000	1.68
+++ serendipity_lang_en.inc.php	9 Aug 2004 15:53:36 -0000	1.69
@@ -67,7 +67,6 @@
 @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:');
@@ -88,20 +87,14 @@
 @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('CANNOT_EDIT_CATEGORY', 'Category Not Available');
 @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');
@@ -174,7 +167,6 @@
 @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');
@@ -207,7 +199,6 @@
 @define('NO', 'No');
 @define('USE_DEFAULT', 'Default');
 @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>');
@@ -218,7 +209,6 @@
 @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.');
@@ -231,7 +221,6 @@
 @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('SYNCING', 'Syncronizing the database with the image folder');
@@ -297,8 +286,6 @@
 @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('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('EDIT_ENTRY', 'Edit entry');
@@ -366,7 +353,6 @@
 @define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
 @define('FORCE_DELETE', 'Force deletion of files not inside the media database');
 @define('CHECKING_DIRECTORY', 'Checking files in directory %s');
-@define('DELETING_DIRECTORY', 'Deleting directory %s...');
 @define('DELETING_FILE', 'Deleting file %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Could not remove non-empty directory. Check the "force deletion" checkbox if you want to remove those files as well, and then submit again. Existing files are:');
 @define('DIRECTORY_DELETE_FAILED', 'Deletion of directory %s failed. Check permissions or messages above.');
@@ -380,7 +366,6 @@
 @define('IN_REPLY_TO', 'In reply to');
 @define('TOP_LEVEL', 'Top level');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
-@define('SYNDICATION_PLUGIN_GENERIC_COMMENTFEED', '%s comments');
 @define('PERMISSIONS', 'Permissions');
 @define('SETTINGS_SAVED_AT', 'The new settings have been saved at %s');
 
@@ -555,4 +540,4 @@
 @define('MEDIA_FULLSIZE', 'Fullsize');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- serendipity_lang_es.inc.php	8 Aug 2004 22:01:40 -0000	1.66
+++ serendipity_lang_es.inc.php	9 Aug 2004 15:53:36 -0000	1.67
@@ -67,7 +67,6 @@
 @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:');
@@ -88,20 +87,14 @@
 @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('CANNOT_EDIT_CATEGORY', 'Categoría no disponible');
 @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 ');
@@ -177,7 +170,6 @@
 @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');
@@ -208,7 +200,6 @@
 @define('NO', 'No');
 @define('USE_DEFAULT', 'Default');
 @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>');
@@ -219,7 +210,6 @@
 @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.');
@@ -232,7 +222,6 @@
 @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>');
@@ -363,7 +352,6 @@
 @define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
 @define('FORCE_DELETE', 'Force deletion of files not inside the media database');
 @define('CHECKING_DIRECTORY', 'Checking files in directory %s');
-@define('DELETING_DIRECTORY', 'Deleting directory %s...');
 @define('DELETING_FILE', 'Deleting file %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Could not remove non-empty directory. Check the "force deletion" checkbox if you want to remove those files as well, and then submit again. Existing files are:');
 @define('DIRECTORY_DELETE_FAILED', 'Deletion of directory %s failed. Check permissions or messages above.');
@@ -377,7 +365,6 @@
 @define('IN_REPLY_TO', 'In reply to');
 @define('TOP_LEVEL', 'Top level');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
-@define('SYNDICATION_PLUGIN_GENERIC_COMMENTFEED', '%s comments');
 @define('PERMISSIONS', 'Permissions');
 
 /* DATABASE SETTINGS */

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_lang_bg.inc.php	8 Aug 2004 22:01:39 -0000	1.3
+++ serendipity_lang_bg.inc.php	9 Aug 2004 15:53:35 -0000	1.4
@@ -65,7 +65,6 @@
 @define('NEW_ENTRY', 'Íîâî');
 @define('AUTHOR_SUITE', 'Ðàçäåë çà âúâåæäàíå');
 @define('EDIT_ENTRIES', 'Ðåäàêöèÿ íà ñúäúðæàíèå');
-@define('DELETE_ENTRIES', 'Èçòðèâàíå íà ñúäúðæàíèå');
 @define('CATEGORIES', 'Êàòåãîðèè');
 @define('EDIT_CATEGORIES', 'Ðåäàêöèÿ íà êàòåãîðèè');
 @define('IMAGES', 'Èçîáðàæåíèÿ:');
@@ -86,7 +85,6 @@
 @define('ADD_COMMENT', 'Äîáàâè êîìåíòàð');
 @define('NO_COMMENTS', 'Íÿìà êîìåíòàðè');
 @define('POSTED_BY', 'Ïóáëèêóâàíî îò');
-@define('TRACKBACK_FROM', 'Ôîðìà çà ïðîñëåäÿâàíå');
 @define('ON', 'íà');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Íîâ êîìåíòàð áåøå ïóáëèêóâàí íà áëîã-à âè "%s", è å îçàãëàâåí : "%s".');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'Íîâî ïðîñëåäÿâàíå å íàïðàâåíî "%s".');
@@ -94,11 +92,7 @@
 @define('ENTRY_BODY', 'Âúâåäåòå ñúîáùåíèå');
 @define('EXTENDED_BODY', 'Äîïúëíèòåëíî ñúîáùåíèå');
 @define('CATEGORY', 'Êàòåãîðèÿ:');
-@define('TEMPLATE_NAME', 'èìå íà òåìïëåéòà');
-@define('CHOOSE_STYLESHEET', 'Èçáåðè ñòèë....');
 @define('EDIT', 'Ðåäàêöèÿ');
-@define('MAKE_DEFAULT', 'Íàïðàâè îñíîâåí');
-@define('CREATE_NEW_STYLESHEET', 'Ñúçäàé íîâ ñòèë');
 @define('NO_ENTRIES_BLAHBLAH', 'Íàìà íàìåðåíè ðåçóëòàòè çà %s' . "\n");
 @define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Òúðñåíåòî çà  %s âúðíà %s ðåçóëòàòè:');
 @define('SEARCH_TOO_SHORT', 'Âúâåäåòå ìèíèìóì 3 çíàêà â ïîëåòî çà òúðñåíå');
@@ -109,7 +103,6 @@
 @define('ADDING_IMAGE', 'Äîáàâÿíå íà èçîáðàæåíèå...');
 @define('THUMB_CREATED_DONE', 'Òúìáíåéëà å ãîòîâ.');
 @define('ERROR_FILE_EXISTS_ALREADY', 'Ãðåøêà: Òîçè ôàéë âå÷å ñúøåñòâóâà!');
-@define('ERROR_UNKNOWNE_NOUPLOAD', 'Íåïîçíàòà ãðåøêà, ôàéëà íå å êà÷åí...');
 @define('ADD_IMAGE_BLAHBLAH', '<b>Äîáàâåòå èçîáðàæåíèå íà ñúðâúðà:</b><p>Òóê ìîæåòå äà êà÷èòå êàðòèíêè èëè äà ìè êàæåòå àäðåñ îòêúäåòî äà ãè âçåìàì! <b>Èçáåðåòå ìåòîä:</b><br>');
 @define('ENTER_IMAGE_URL', 'Âúâåäåòå URL íà èçîáðàæåíèå:');
 @define('ENTER_IMAGE_TO_UP', 'ÈÇáåðåòå èçîáðàæåíèå çà êà÷âàíå:');
@@ -175,7 +168,6 @@
 @define('COMMENTS_CLOSED', 'Àâòîðà å çàáðàíèë êîìåíòàðèòå êúì ñòàòèÿòà');
 @define('EMPTY_COMMENT', 'Êîìåíòàðúò Âè íå ñúäúðæà íèùî, ìîëÿ âúðíåòå ñå%s %s è ïðîáâàéòå îòíîâî');
 @define('ENTRIES_FOR', 'Ñúäúðæàíèå çà %s');
-@define('TOPICS_FOR', 'Çàãëàâèÿ çà %s');
 @define('DOCUMENT_NOT_FOUND', 'Äîêóìåíòà %s íå å íàìåðåí.');
 @define('USERNAME', 'Ïîòðåáèòåë');
 @define('PASSWORD', 'Ïàðîëà');
@@ -206,7 +198,6 @@
 @define('YES', 'Äà');
 @define('NO', 'Íå');
 @define('CHECK_N_SAVE', 'Èçáåðè  &amp; Çàïàçè');
-@define('DIRECTORY_NOT_EXISTANT', 'Ïàïêàòà %s íå ñúùåñòâóâà. Ñúçäàé ÿ!');
 @define('DIRECTORY_WRITE_ERROR', 'Íå ìîãà äà ïèøà â ïàïêà: %s. Ïðîâåðè äàëè ìîæå äà ñå ïèøå òàì.');
 @define('DIRECTORY_CREATE_ERROR', 'Ïàïêàòà  %s íå ñúøåñòâóâà è íå ìîæå äà áúäå ñúçäàäåíà.Ñúçäàéòå ÿ ðú÷íî !!!');
 @define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; èçïúëíåòå òàçè êîìàíäà: <i>%s %s</i>');
@@ -217,7 +208,6 @@
 @define('WWW_USER', 'Ïðîìåíåòå www íà ïîòðåáèòåë apache äà ñå èçïóëíÿâà êàòî nobody.');
 @define('BROWSER_RELOAD', 'Êàòî íàïðàâèòå òîâà, íàòèñíåòå "reload" áóòîíà.');
 @define('DIAGNOSTIC_ERROR', 'Çàñÿêîõìå íÿêîëêî ãðåøêè ïðè âúâåäåíàòà èíôîðìàöèÿ îò Âàñ:');
-@define('ALL_VALID', 'Âñè÷êî âúâåäåíî îò Âàñ å âàëèäíî.');
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity îøå íå å èíñòàëèðàíà. ìîëÿ êëèíåòå íà òîçè  <a href="%s">ëèíê</a>.');
 @define('INCLUDE_ERROR', 'serendipity ãðåøêà: íå ìîãà äà âìúêíà òîçè ôàéë %s - èçëèçàì.');
 @define('DATABASE_ERROR', 'serendipity ãðåøêà: íå ìîãà äà ñå ñâúðæà ñ áàçàòà äàííè - èçëèçàì.');
@@ -230,7 +220,6 @@
 @define('WRITTEN_N_SAVED', 'Êîíôèãóðàöèÿòà å çàïèñàíà');
 @define('IMAGE_ALIGNMENT', 'Ïîëîæåíèå íà èçîáðàæåíèåòî');
 @define('ENTER_NEW_NAME', 'Âúâåäåòå èìå çà: ');
-@define('IMAGE_MANAGER', 'Ìèíèäæúð íà êàðòèíêèòå');
 @define('RESIZING', 'Ïðîìåíÿíå íà ðàçìåðèòå');
 @define('RESIZE_DONE', 'Ãîòîâî (ïðîìåíåíè %s êàðòèíêè).');
 @define('SYNCING', 'Ñèíõðîíèçèðàíå íà áàçàòà äàííè ñ ïàïêàòà ñ êàðòèíêèòå');
@@ -299,8 +288,6 @@
 @define('DO_MARKUP_DESCRIPTION', 'Ïðèëîæè òðàíñôîðìàöèÿ íà òåêñòà (óñìèâêè è äðóãè).');
 @define('GENERAL_PLUGIN_DATEFORMAT', 'Ôîðìàòèðàíå íà äàòàòà');
 @define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Ôîðìàòà íà äàòàòà íà ñúäúðæàíèåòî å íàïðàâåíî ïîñðåäñòâîì ôóíêöèÿòà íà PHP strftime() (Default: "%s")');
-@define('GENERAL_PLUGIN_LANGUAGE', 'Èçõîäåí åçèê');
-@define('GENERAL_PLUGIN_LANGUAGE_BLAHBLAH', 'Êàêúâ äà å åçèêà çà äàòàòà è òåêñòà? ("en|de", default "en")');
 @define('ERROR_TEMPLATE_FILE', 'Íå ìîãà äà îòâîðÿ ôàéëà ñ òåìïëåéòèòå, ìîëÿ ñâàëåòå ñè ïîñëåäíàòà âåðñèÿ íà serendipity!');
 @define('ADVANCED_OPTIONS', 'Advanced âúçìîæíîñòè');
 @define('EDIT_ENTRY', 'Ðåäàêòèðàé');

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- serendipity_lang_de.inc.php	8 Aug 2004 22:01:39 -0000	1.84
+++ serendipity_lang_de.inc.php	9 Aug 2004 15:53:36 -0000	1.85
@@ -66,7 +66,6 @@
 @define('ENTRIES', 'Einträge');
 @define('NEW_ENTRY', 'Neuer Eintrag');
 @define('EDIT_ENTRIES', 'Einträge bearbeiten');
-@define('DELETE_ENTRIES', 'Eintrag löschen');
 @define('CATEGORIES', 'Kategorien');
 @define('EDIT_CATEGORIES', 'Kategorien bearbeiten');
 @define('IMAGES', 'Bilder:');
@@ -88,19 +87,13 @@
 @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', 'Im Blog %s wurde ein neuer Kommentar zu Eintrag #%s eingetragen!');
 @define('NO_CATEGORY', 'Keine Kategorie');
-@define('CANNOT_EDIT_CATEGORY', 'Kategorie nicht vorhanden');
 @define('ENTRY_BODY', 'Eintrag');
 @define('EXTENDED_BODY', 'Erweiterter Eintrag');
 @define('CATEGORY', 'Kategorie');
-@define('TEMPLATE_NAME', 'Template Name');
-@define('CHOOSE_STYLESHEET', 'Bitte ein Stylesheet wählen...');
 @define('EDIT', 'Bearbeiten');
-@define('MAKE_DEFAULT', 'Als Standard');
-@define('CREATE_NEW_STYLESHEET', 'Neues Stylesheet');
 @define('NO_ENTRIES_BLAHBLAH', 'Für die Suche %s konnte kein Eintrag gefunden werden' . "\n");
 @define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Die Suche nach %s ergab %s Treffer:');
 @define('IMAGE', 'Bild');
@@ -176,7 +169,6 @@
 @define('COMMENT_NOT_ADDED_CLICK', 'Klick %shier um zu den Kommentaren zurückzukehren%s und %shier um das Fenster zu schließen%s.');
 @define('EMPTY_COMMENT', 'Kommentar enthielt nichts, bitte %szurück gehen%s und erneut versuchen');
 @define('ENTRIES_FOR', 'Einträ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');
@@ -208,7 +200,6 @@
 @define('NO', 'Nein');
 @define('USE_DEFAULT', 'Default');
 @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!');
@@ -219,7 +210,6 @@
 @define('WWW_USER', 'Ersetzen Sie \'www\' mit dem User, als der der Webserver läuft. (z.B. \'nobody\')');
 @define('BROWSER_RELOAD', 'Danach aktualisieren Sie bitte diese Seite im Browser');
 @define('DIAGNOSTIC_ERROR', 'Bei der Einrichtung der 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.');
@@ -232,7 +222,6 @@
 @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', 'Anpassen der Bildgröße');
 @define('RESIZE_DONE', 'Fertig (%s Bildgrößen angepaßt).');
 @define('DELETE_IMAGE', 'Bild namens <b>%s</b> gelöscht');
@@ -301,8 +290,6 @@
 @define('AUTOMATIC_LOGIN', 'Daten speichern');
 @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('EDIT_ENTRY', 'Eintrag bearbeiten');
@@ -371,7 +358,6 @@
 @define('ERROR_NO_DIRECTORY', 'Fehler: Verzeichnis %s existiert nicht.');
 @define('FORCE_DELETE', 'Alle Dateien ausserhalb der Mediendatenbank löschen');
 @define('CHECKING_DIRECTORY', 'Prüfe Dateien im Verzeichnis %s');
-@define('DELETING_DIRECTORY', 'Lösche Verzeichnis %s...');
 @define('DELETING_FILE', 'Lösche Datei %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Konnte das Verzeichnis nicht löschen, da noch Dateien vorhanden sind. Bitte die "Alle Dateien löschen"-Auswahlbox anklicken, falls diese Dateien trotzdem gelöscht werden sollen. Die noch vorhandenen Dateien sind:');
 @define('DIRECTORY_DELETE_FAILED', 'Das Löschen des Verzeichnisses %s ist fehlgeschlagen. Bitte Verzeichnisrechte oder vorige Meldungen überprüfen.');
@@ -385,7 +371,6 @@
 @define('IN_REPLY_TO', 'Antwort zu');
 @define('TOP_LEVEL', 'Ursprung');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
-@define('SYNDICATION_PLUGIN_GENERIC_COMMENTFEED', '%s Kommentar');
 @define('PERMISSIONS', 'Rechte');
 @define('XML_IMAGE_TO_DISPLAY', 'XML-Button');
 @define('XML_IMAGE_TO_DISPLAY_DESC','Bilddatei um ein Icon für XML-Feeds darzustellen. Für das Standardbild leer lassen oder \'none\' zum deaktivieren.');

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_lang_pt.inc.php	8 Aug 2004 22:01:40 -0000	1.24
+++ serendipity_lang_pt.inc.php	9 Aug 2004 15:53:36 -0000	1.25
@@ -67,7 +67,6 @@
 @define('NEW_ENTRY', 'Novo artigo');
 @define('AUTHOR_SUITE', 'Painel de autoria');
 @define('EDIT_ENTRIES', 'Editar artigos');
-@define('DELETE_ENTRIES', 'Excluir artigos');
 @define('CATEGORIES', 'Categorias');
 @define('EDIT_CATEGORIES', 'Gerenciar categorias');
 @define('IMAGES', 'Imagens:');
@@ -88,7 +87,6 @@
 @define('ADD_COMMENT', 'Adicionar Comentários');
 @define('NO_COMMENTS', 'Nenhum cmentários.');
 @define('POSTED_BY', 'Enviado por');
-@define('TRACKBACK_FROM', 'Trackback de');
 @define('ON', 'on');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Um novo comentário foi enviado para o seu Blog "%s", no artigo entitulada como "%s".');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'Um novo trackback foi feito para o seu Blog "%s", no artigo entitulada como "%s".');
@@ -96,11 +94,7 @@
 @define('ENTRY_BODY', 'Corpo do artigo');
 @define('EXTENDED_BODY', 'Extensão do corpo do artigo');
 @define('CATEGORY', 'Categoria:');
-@define('TEMPLATE_NAME', 'nome do template');
-@define('CHOOSE_STYLESHEET', 'Escolha uma folha de estilos....');
 @define('EDIT', 'Editar');
-@define('MAKE_DEFAULT', 'Tornar padrão');
-@define('CREATE_NEW_STYLESHEET', 'Criar Nova Folha de Estilos');
 @define('NO_ENTRIES_BLAHBLAH', 'Nenhum artigo encontrada para a consulta %s' . "\n");
 @define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Sua busca para %s retornou %s resultados:');
 @define('SEARCH_TOO_SHORT', 'Sua consulta deve ter no mínimo 3 caracteres');
@@ -175,7 +169,6 @@
 @define('COMMENTS_CLOSED', 'O autor não autorizou comentários para este artigo');
 @define('EMPTY_COMMENT', 'Seu comentário está vazio, por favor, %svolte%s e tente novamente');
 @define('ENTRIES_FOR', 'Artigos para %s');
-@define('TOPICS_FOR', 'Tópicos para %s');
 @define('DOCUMENT_NOT_FOUND', 'O documento %s não foi encontrado.');
 @define('USERNAME', 'Usuário');
 @define('PASSWORD', 'Senha');
@@ -207,7 +200,6 @@
 @define('NO', 'Não');
 @define('USE_DEFAULT', 'Default');
 @define('CHECK_N_SAVE', 'Verificar &amp; salvar');
-@define('DIRECTORY_NOT_EXISTANT', 'Diretório %s não existe. Crie-o!');
 @define('DIRECTORY_WRITE_ERROR', 'Não foi possível escrever no diretório %s. Verifique as permissões.');
 @define('DIRECTORY_CREATE_ERROR', 'O Diretório %s não existe e não pode ser criado. Tente criá-lo manualmente');
 @define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; execute <i>%s %s</i>');
@@ -218,7 +210,6 @@
 @define('WWW_USER', 'Altere www para o usuário com o qual o apache é executado (ex.: nobody).');
 @define('BROWSER_RELOAD', 'Uma vez feito isso, pressione o botão "atualizar" ("reload") do seu navegador.');
 @define('DIAGNOSTIC_ERROR', 'Detectamos alguns erros quando verificamos as informações fornecidas por você:');
-@define('ALL_VALID', 'Todas as informações fornecidas parecem ser válidas.');
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity ainda não está instalado. Por favor <a href="%s">instale-o</a> agora.');
 @define('INCLUDE_ERROR', 'erro do serendipity: não foi possível incluir %s - abortando.');
 @define('DATABASE_ERROR', 'erro do serendipity: não foi possível conectar ao banco de dados - abortando.');
@@ -231,7 +222,6 @@
 @define('WRITTEN_N_SAVED', 'Configuração escrita &amp; salva');
 @define('IMAGE_ALIGNMENT', 'Alinhamento de imagem');
 @define('ENTER_NEW_NAME', 'Informe o novo nome para: ');
-@define('IMAGE_MANAGER', 'Gerenciado de imagens');
 @define('RESIZING', 'Redimensionando');
 @define('RESIZE_DONE', 'Pronto (%s imagens redimensionadas).');
 @define('SYNCING', 'Sincronizando o banco de dados com o diretório de imagens');
@@ -300,8 +290,6 @@
 @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('GENERAL_PLUGIN_DATEFORMAT', 'Formatação de data');
 @define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Formato da data atual do artigo, usando a mesma formatação da função strftime() do PHP. (Padrão: "%s")');
-@define('G...
 
[truncated message content]

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.391,1.392

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Be cool to speech synthesizers


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -d -r1.391 -r1.392
--- serendipity_functions.inc.php	9 Aug 2004 10:00:22 -0000	1.391
+++ serendipity_functions.inc.php	9 Aug 2004 15:25:24 -0000	1.392
@@ -487,7 +487,7 @@
     for ($i = 1; $i <= 7; $i++) {
         $date = mktime(0,0,0,3,$bow+$i-1,2004);
 ?>
-        <td class="serendipity_weekDayName" align="center"><?php echo substr(serendipity_formatTime("%a", $date),0,2); ?></td>
+        <td scope="col" abbr="<?php echo serendipity_formatTime("%A", $date) ?>" title="<?php echo serendipity_formatTime("%A", $date) ?>" class="serendipity_weekDayName" align="center"><?php echo substr(serendipity_formatTime("%a", $date),0,2); ?></td>
 <?php
     }
 ?>

[php-blog-cvs] serendipity serendipity_admin_image_selector.php,1.29,1.30

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

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

Modified Files:
	serendipity_admin_image_selector.php 
Log Message:
when files are used as category images (which doesn't make sense in first instance, but nevertheless...) it will correctly embed those instead of aborting with a blank final popup.


Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_admin_image_selector.php	8 Aug 2004 22:01:38 -0000	1.29
+++ serendipity_admin_image_selector.php	9 Aug 2004 10:20:35 -0000	1.30
@@ -101,6 +101,15 @@
     } else {
         // What to do if file is no image.
         // For the future, maybe allow the user to add title/link description and target window
+
+        if (!empty($serendipity['GET']['filename_only'])) {
+?>
+    <script type="text/javascript">
+        self.opener.serendipity_imageSelector_addToElement('<?php echo htmlspecialchars($imgName); ?>', '<?php echo htmlspecialchars($serendipity['GET']['htmltarget']); ?>');
+        self.close();
+    </script>
+<?php
+        } else {
 ?>
     <script type="text/javascript">
     block = '<a href="<?php echo htmlspecialchars($imgName); ?>" title="<?php echo htmlspecialchars($file['name'] . '.' . $file['extension']); ?>" target="_blank"><?php echo htmlspecialchars($file['name'] . '.' . $file['extension']); ?></a>';
@@ -111,7 +120,9 @@
     }
     self.close();
     </script>
-<?php }
+<?php
+        }
+    }
     break;
 
     default:

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.390,1.391 serendipity_admin_comments.inc.php,1.10,1.11

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

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

Modified Files:
	serendipity_functions.inc.php 
	serendipity_admin_comments.inc.php 
Log Message:
postgre sql compatibility fixes from Ilya A. Volynets-Evenbakh


Index: serendipity_admin_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_admin_comments.inc.php	3 Aug 2004 18:05:54 -0000	1.10
+++ serendipity_admin_comments.inc.php	9 Aug 2004 10:00:22 -0000	1.11
@@ -127,14 +127,13 @@
     $linkNext = '<input type="button" name="serendipity[nextpage]" value="&gt;&gt;&gt;" disabled="disabled" />';
 }
 
-
+$limit=serendipity_db_limit_sql(($page-1)*$commentsPerPage .",". $commentsPerPage);
 $sql = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c
                                 LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id)
                                 WHERE type = 'NORMAL'
                                 ". $and ."
                                 " . (($serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN) ? 'AND e.authorid = ' . $serendipity['authorId'] : '') . "
-                                ORDER BY id DESC
-                                LIMIT ". ($page-1)*$commentsPerPage .",". $commentsPerPage);
+                                ORDER BY id DESC $limit");
 if (!is_array($sql)) {
     echo NO_COMMENTS;
     return;

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -d -r1.390 -r1.391
--- serendipity_functions.inc.php	9 Aug 2004 09:49:54 -0000	1.390
+++ serendipity_functions.inc.php	9 Aug 2004 10:00:22 -0000	1.391
@@ -736,12 +736,14 @@
     }
 
     if (strtolower($serendipity['dbType']) == 'postgres') {
-        $group = 'DISTINCT ON (e.id)';
+        $group    = '';
+        $distinct = 'DISTINCT';
     } else {
-        $group = 'GROUP BY e.id';
+        $group    = 'GROUP BY e.id';
+        $distinct = '';
     }
 
-    $query = "SELECT
+    $query = "SELECT $distinct
                     e.id,
                     e.title,
                     e.timestamp,
@@ -922,12 +924,14 @@
     global $serendipity;
 
     if (strtolower($serendipity['dbType']) == 'postgres') {
-        $group = 'DISTINCT ON (e.id)';
+        $group    = '';
+        $distinct = 'DISTINCT';
     } else {
-        $group = 'GROUP BY e.id';
+        $group    = 'GROUP BY e.id';
+        $distinct = '';
     }
 
-    $querystring = "SELECT
+    $querystring = "SELECT $distinct
                             e.id,
                             e.author,
                             a.username,
@@ -1471,12 +1475,14 @@
     }
 
     if (strtolower($serendipity['dbType']) == 'postgres') {
-        $group = 'DISTINCT ON (co.id)';
+        $group    = '';
+        $distinct = 'DISTINCT';
     } else {
-        $group = 'GROUP BY co.id';
+        $group    = 'GROUP BY e.id';
+        $distinct = '';
     }
 
-    $query = "SELECT
+    $query = "SELECT $distinct
                     co.id,
                     co.entry_id, co.timestamp, co.title, co.email, co.url, co.ip, co.body, co.type, co.subscribed,
                     co.author AS username,
@@ -1516,7 +1522,8 @@
 
     $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id AND type = 'TRACKBACK' $and ORDER BY id";
     if (isset($limit)) {
-        $query .= " LIMIT $limit";
+        $limit  = serendipity_db_limit_sql($limit);
+        $query .= " $limit";
     }
 
     $comments = serendipity_db_query($query);
@@ -3255,6 +3262,10 @@
 function serendipity_displayTopUrlList($list, $limit, $use_links = true) {
     global $serendipity;
 
+    if ($limit){
+        $limit = serendipity_db_limit_sql($limit);
+    }
+
     /* HACK */
     if (preg_match('/^mysqli?/', $serendipity['dbType'])) {
         /* Nonportable SQL due to MySQL date functions,
@@ -3266,14 +3277,14 @@
                   WHERE day > date_sub(current_date, interval 7 day)
                   GROUP BY host
                   ORDER BY total DESC, host
-                  LIMIT $limit";
+                  $limit";
     } else {
         /* Portable version of the same query */
         $query = "SELECT scheme, host, SUM(count) AS total
                   FROM {$serendipity['dbPrefix']}$list
                   GROUP BY scheme, host
                   ORDER BY total DESC, host
-                  LIMIT $limit";
+                  $limit";
     }
 
     $rows = serendipity_db_query($query);
@@ -3387,7 +3398,7 @@
         return;
     }
 
-    $query = "DELETE FORM $serendipity[dbPrefix]entrycat WHERE entryid = $postid";
+    $query = "DELETE FROM $serendipity[dbPrefix]entrycat WHERE entryid = $postid";
     serendipity_db_query($query);
 
     $query = "INSERT INTO $serendipity[dbPrefix]entrycat (entryid, categoryid) VALUES ($categories[0], $postid)";

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.73,1.74 serendipity_functions.inc.php,1.389,1.390 serendipity_functions_installer.inc.php,1.29,1.30

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

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

Modified Files:
	serendipity_admin_installer.inc.php 
	serendipity_functions.inc.php 
	serendipity_functions_installer.inc.php 
Log Message:
finally fixed that damn shared install .htaccess updating problem for good.
let's release 0.7-beta1 :)


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- serendipity_admin_installer.inc.php	28 Jul 2004 17:27:14 -0000	1.73
+++ serendipity_admin_installer.inc.php	9 Aug 2004 09:49:54 -0000	1.74
@@ -11,6 +11,18 @@
     $_POST['installAction'] = '';
 }
 
+/* Check where to deploy .htaccess files. For shared installation, first guess is submitted directory name.
+   If that is not existant we autodetect using current directory. */
+if (IS_installed !== true) {
+    if (!empty($_POST['serendipityPath'])) {
+        $serendipity_core = $_POST['serendipityPath'];
+    } else {
+        $serendipity_core = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/';
+    }
+} else {
+    $serendipity_core = $serendipity['serendipityPath'];
+}
+
 switch ($_POST['installAction']) {
     case 'check':
         /* If we already have serendipity installed, all we need to do is write the configuration again */
@@ -37,8 +49,8 @@
             }
 
             /* Next are the files, .htaccess */
-            printf(ATTEMPT_WRITE_FILE, $serendipity['serendipityPath'] . '.htaccess');
-            $res = serendipity_installFiles();
+            printf(ATTEMPT_WRITE_FILE, $serendipity_core . '.htaccess');
+            $res = serendipity_installFiles($serendipity_core);
             if (is_array($res)) {
                 echo '<span class="serendipity_msg_important">- ' . implode('<br />', $res) . '</span><br /><br />';
                 die();
@@ -86,8 +98,8 @@
         } else {
             /* If we have new rewrite rules, then install them */
             if (isset($_POST['rewrite']) && $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN && $oldRewrite != $_POST['rewrite']) {
-                printf(ATTEMPT_WRITE_FILE, $serendipity['serendipityPath'] . '.htaccess');
-                $res = serendipity_installFiles();
+                printf(ATTEMPT_WRITE_FILE, $serendipity_core . '.htaccess');
+                $res = serendipity_installFiles($serendipity_core);
                 if (is_array($res)) {
                     echo implode('<br />'. $res);
                 } else {
@@ -124,5 +136,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
-
+?>
\ No newline at end of file

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -d -r1.389 -r1.390
--- serendipity_functions.inc.php	8 Aug 2004 22:39:58 -0000	1.389
+++ serendipity_functions.inc.php	9 Aug 2004 09:49:54 -0000	1.390
@@ -521,16 +521,16 @@
             }
             if ($y == 6) {
                 $cellProps[] = 'LastInRow';
-            } 
+            }
             if ($x == $nrOfRows-1) {
                 $cellProps[] = 'LastRow';
-            } 
+            }
 
             // If it's not a blank day, we print the day
             if (($x > 0 || $y >= $firstDayWeekDay) && $currDay <= $nrOfDays) {
 
                 $printDay = $currDay;
- 
+
                 if ($today_year == $year && $today_month == $month && $today_day == $currDay) {
                     $cellProps[] = 'Today';
                 }
@@ -1761,7 +1761,7 @@
         $row = serendipity_db_query($query, true); // Get info on author/entry
 
         // Send mail to the author if he chose to receive these mails, or if the comment is awaiting moderation
-        if (serendipity_db_bool($ca['moderate_comments']) 
+        if (serendipity_db_bool($ca['moderate_comments'])
             || ($type == 'NORMAL' && serendipity_db_bool($row['mail_comments']))
             || ($type == 'TRACKBACK' && serendipity_db_bool($row['mail_trackbacks']))) {
             serendipity_sendComment($cid, $row['email'], $name, $email, $url, $id, $row['title'], $comments, $type, serendipity_db_bool($row['moderate_comments']));
@@ -1950,7 +1950,7 @@
     static $r = array(
         '&amp;\1',
         '&amp;',
-        '<\1r\2 />'
+        '<\1\2 />'
     );
 
     return preg_replace($p, $r, $html);

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_functions_installer.inc.php	5 Aug 2004 22:37:05 -0000	1.29
+++ serendipity_functions_installer.inc.php	9 Aug 2004 09:49:54 -0000	1.30
@@ -266,9 +266,10 @@
     // If not yet installed, do some magic:
     $abort = false;
     if (IS_installed !== true && $_abort !== true) {
-        $old_htaccess = @file_get_contents($serendipity['serendipityPath'] . '.htaccess');
-        $fp = @fopen($serendipity['serendipityPath'] . '.htaccess', 'w');
-        $serendipity_root = str_replace(basename($_SERVER['PHP_SELF']), '', $_SERVER['PHP_SELF']);
+        $serendipity_root = dirname($_SERVER['PHP_SELF']) . '/';
+        $serendipity_core = $_SERVER['DOCUMENT_ROOT'] . $serendipity_root;
+        $old_htaccess     = @file_get_contents($serendipity_core . '.htaccess');
+        $fp               = @fopen($serendipity_core . '.htaccess', 'w');
         $serendipity_host = preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']);
 
         if (!$fp) {
@@ -302,12 +303,12 @@
                 $serendipity['rewrite_default'] = 'none';
             }
 
-            if (!empty($old_htacces)) {
-                $fp = @fopen($serendipity['serendipityPath'] . '.htaccess', 'w');
+            if (!empty($old_htaccess)) {
+                $fp = @fopen($serendipity_core . '.htaccess', 'w');
                 fwrite($fp, $old_htaccess);
                 fclose($fp);
             } else {
-                @unlink($serendipity['serendipityPath'] . '.htaccess');
+                @unlink($serendipity_core . '.htaccess');
             }
         }
     }
@@ -579,10 +580,16 @@
     return true;
 }
 
-function serendipity_installFiles() {
+function serendipity_installFiles($serendipity_core = '') {
     global $serendipity;
 
-    $htaccess = @file_get_contents($serendipity['serendipityPath'] . '.htaccess');
+    // This variable is transmitted from serendipity_admin_installer. If an empty variable is used,
+    // this means that serendipity_installFiles() was called from the auto-updater facility.
+    if (empty($serendipity_core)) {
+        $serendipity_core = $serendipity['serendipityPath'];
+    }
+
+    $htaccess = @file_get_contents($serendipity_core . '.htaccess');
 
     // Let this function be callable outside installation and let it use existing settings.
     $import = array('rewrite', 'serendipityHTTPPath', 'indexFile');
@@ -594,21 +601,21 @@
         }
     }
 
-    if(php_sapi_name() == 'cgi' || php_sapi_name() == 'cgi-fcgi') {
-      $htaccess_cgi = '.cgi';
+    if (php_sapi_name() == 'cgi' || php_sapi_name() == 'cgi-fcgi') {
+        $htaccess_cgi = '.cgi';
     } else {
-      $htaccess_cgi = '';
+        $htaccess_cgi = '';
     }
 
 
     /* Detect comptability with php_value directives */
-    if ( $htaccess_cgi == '' ) {
+    if ($htaccess_cgi == '') {
         $response = '';
-        $serendipity_root = str_replace(basename($_SERVER['PHP_SELF']), '', $_SERVER['PHP_SELF']);
+        $serendipity_root = dirname($_SERVER['PHP_SELF']) . '/';
         $serendipity_host = preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']);
 
-        $old_htaccess = @file_get_contents($serendipity['serendipityPath'] . '.htaccess');
-        $fp = @fopen($serendipity['serendipityPath'] . '.htaccess', 'w');
+        $old_htaccess = @file_get_contents($serendipity_core . '.htaccess');
+        $fp = @fopen($serendipity_core . '.htaccess', 'w');
         if ($fp) {
             fwrite($fp, 'php_value register_globals off'. "\n" .'php_value session.use_trans_sid 0');
             fclose($fp);
@@ -631,12 +638,12 @@
                 $htaccess_cgi = '.cgi';
             }
 
-            if (!empty($old_htacces)) {
-                $fp = @fopen($serendipity['serendipityPath'] . '.htaccess', 'w');
+            if (!empty($old_htaccess)) {
+                $fp = @fopen($serendipity_core . '.htaccess', 'w');
                 fwrite($fp, $old_htaccess);
                 fclose($fp);
             } else {
-                @unlink($serendipity['serendipityPath'] . '.htaccess');
+                @unlink($serendipity_core . '.htaccess');
             }
         }
     }
@@ -692,10 +699,10 @@
                  implode('', $a)
               );
 
-    $fp = @fopen($serendipity['serendipityPath'] . '.htaccess', 'w');
+    $fp = @fopen($serendipity_core . '.htaccess', 'w');
     if (!$fp) {
-        $errs[] = sprintf(FILE_WRITE_ERROR, $serendipity['serendipityPath'] . '.htaccess') . ' ' . FILE_CREATE_YOURSELF;
-        $errs[] = sprintf(COPY_CODE_BELOW , $serendipity['serendipityPath'] . '.htaccess', 'serendipity', htmlspecialchars($content));
+        $errs[] = sprintf(FILE_WRITE_ERROR, $serendipity_core . '.htaccess') . ' ' . FILE_CREATE_YOURSELF;
+        $errs[] = sprintf(COPY_CODE_BELOW , $serendipity_core . '.htaccess', 'serendipity', htmlspecialchars($content));
         return $errs;
     } else {
         // Check if an old htaccess file existed and try to preserve its contents. Otherwise completely wipe the file.
@@ -751,4 +758,4 @@
         return true;
     }
 }
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_xhtmlcleanup serendipity_event_xhtmlcleanup.php,1.5,1.6

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

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

Modified Files:
	serendipity_event_xhtmlcleanup.php 
Log Message:
debugging code, anyone? ;)


Index: serendipity_event_xhtmlcleanup.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_xhtmlcleanup/serendipity_event_xhtmlcleanup.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_event_xhtmlcleanup.php	9 Aug 2004 08:47:01 -0000	1.5
+++ serendipity_event_xhtmlcleanup.php	9 Aug 2004 08:49:08 -0000	1.6
@@ -85,9 +85,7 @@
             switch($event) {
                 case 'frontend_display':
                     foreach ($this->markup_elements as $temp) {
-                        echo 'Checkking XHTML cleanup<br/>';
                         if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']])) {
-                            echo 'Applying XHTLM cleanup.<br />';
                             $element = $temp['element'];
                             $this->cleanup_tag      = 'IMG';
                             $this->cleanup_checkfor = 'ALT';
@@ -113,7 +111,6 @@
 
     // Takes an input tag and search for ommitted attributes. Expects a single tag (array, index 0)
     function clean_tag($data) {
-        echo 'Clean tag:<br/>' . htmlentities(print_r($data, true)) . '<br/>';
         // Restore tags from preg_replace_callback buffer, as those can't be passed in the function header
         $tag      = &$this->cleanup_tag;
         $checkfor = &$this->cleanup_checkfor;

[php-blog-cvs] serendipity/plugins/serendipity_event_xhtmlcleanup serendipity_event_xhtmlcleanup.php,1.4,1.5

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

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

Modified Files:
	serendipity_event_xhtmlcleanup.php 
Log Message:
fix xhtmlcleanup plugin to fully cleanup xhtml-code and to properly match non-closed <img> tags.


Index: serendipity_event_xhtmlcleanup.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_xhtmlcleanup/serendipity_event_xhtmlcleanup.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_event_xhtmlcleanup.php	1 Jul 2004 18:35:18 -0000	1.4
+++ serendipity_event_xhtmlcleanup.php	9 Aug 2004 08:47:01 -0000	1.5
@@ -85,12 +85,16 @@
             switch($event) {
                 case 'frontend_display':
                     foreach ($this->markup_elements as $temp) {
+                        echo 'Checkking XHTML cleanup<br/>';
                         if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']])) {
+                            echo 'Applying XHTLM cleanup.<br />';
                             $element = $temp['element'];
                             $this->cleanup_tag      = 'IMG';
                             $this->cleanup_checkfor = 'ALT';
                             $this->cleanup_val      = '';
-                            $eventData[$element]    = preg_replace_callback('@(<img.+/>)@imsU', array($this, 'clean_tag'), $eventData[$element]);
+                            // Basic cleanup (core s9y functionality)
+                            $eventData[$element]    = xhtml_cleanup($eventData[$element]);
+                            $eventData[$element]    = preg_replace_callback('@(<img.+/?>)@imsU', array($this, 'clean_tag'), $eventData[$element]);
                             $eventData[$element]    = preg_replace_callback("@<a(.*)href=(\"|')([^\"']+)(\"|')@isUm", array($this, 'clean_htmlspecialchars'), $eventData[$element]);
                         }
                     }
@@ -109,17 +113,15 @@
 
     // Takes an input tag and search for ommitted attributes. Expects a single tag (array, index 0)
     function clean_tag($data) {
+        echo 'Clean tag:<br/>' . htmlentities(print_r($data, true)) . '<br/>';
         // Restore tags from preg_replace_callback buffer, as those can't be passed in the function header
         $tag      = &$this->cleanup_tag;
         $checkfor = &$this->cleanup_checkfor;
         $val      = &$this->cleanup_val;
 
-        // Basic cleanup (core s9y functionality)
-        $pdata = xhtml_cleanup($data[0]);
-
         // Instead of nasty regex-mangling we use the XML parser to get the attribute list of our input tag
         $p = xml_parser_create();
-        @xml_parse_into_struct($p, $pdata, $vals, $index);
+        @xml_parse_into_struct($p, $data[0], $vals, $index);
         xml_parser_free($p);
 
         // Check if the xml parser returned anything useful

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.388,1.389

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
After the user decides to no longer remember his details, we shouldn't select the "Remember details" checkbox anymore


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -d -r1.388 -r1.389
--- serendipity_functions.inc.php	8 Aug 2004 22:22:34 -0000	1.388
+++ serendipity_functions.inc.php	8 Aug 2004 22:39:58 -0000	1.389
@@ -329,7 +329,7 @@
           )
         );
     } elseif (isset($serendipity['POST']['comment'])) {
-        serendipity_forgetCommentDetails(array('url', 'name', 'email'));
+        serendipity_forgetCommentDetails(array('url', 'name', 'email', 'remember'));
     }
 }
 

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.387,1.388

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Always look in default/ as a last resort


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -d -r1.387 -r1.388
--- serendipity_functions.inc.php	8 Aug 2004 22:01:38 -0000	1.387
+++ serendipity_functions.inc.php	8 Aug 2004 22:22:34 -0000	1.388
@@ -121,7 +121,8 @@
 
     $directories = array(
       (isset($serendipity['template']) ? $serendipity['template'] . '/' : ''),
-      $serendipity['defaultTemplate'] .'/'
+      $serendipity['defaultTemplate'] .'/',
+      'default/'
     );
 
     foreach ($directories as $directory) {

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.2,1.3 serendipity_lang_cs.inc.php,1.49,1.50 serendipity_lang_cz.inc.php,1.49,1.50 serendipity_lang_da.inc.php,1.66,1.67 serendipity_lang_de.inc.php,1.83,1.84 serendipity_lang_en.inc.php,1.67,1.68 serendipity_lang_es.inc.php,1.65,1.66 serendipity_lang_fr.inc.php,1.45,1.46 serendipity_lang_nl.inc.php,1.23,1.24 serendipity_lang_pt.inc.php,1.23,1.24

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

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

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php 
	serendipity_lang_cz.inc.php serendipity_lang_da.inc.php 
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_nl.inc.php serendipity_lang_pt.inc.php 
Log Message:
Rename image manager to Media Library, and all (I hope) associated strings
(Removal of old string are pending)


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- serendipity_lang_cs.inc.php	5 Aug 2004 16:34:17 -0000	1.49
+++ serendipity_lang_cs.inc.php	8 Aug 2004 22:01:39 -0000	1.50
@@ -247,7 +247,6 @@
 @define('ABOUT_TO_DELETE_FILE', 'Chcete vymazat <b>%s</b>.<br />Pokud je tento soubor použit v nìkterém vašem záznamu, bude zobrazen prázdný obrázek.<br />Jste si jist touto akcí?<br /><br />');
 @define('IMAGE_FULLSIZE', 'Plný rozmìr');
 @define('IMAGE_RENAME', 'Pøejmenovat obrázek');
-@define('IMAGE_RESIZE', 'Zmìnit rozmìr obrázku');
 @define('IMAGE_DELETE', 'Vymazat obrázek');
 @define('ABORT_NOW', 'Zrušit');
 @define('REMOTE_FILE_NOT_FOUND', 'Soubor nebyl na vzdáleném serveru nalezen, jste si jist že URL: <b>%s</b> je správné?');
@@ -383,7 +382,6 @@
 @define('PARENT_DIRECTORY', 'Základní adresáø');
 @define('DELETE_DIRECTORY', 'Vymazat adresáø');
 @define('CONFIRM_DELETE_DIRECTORY', 'Jste si jist, že chcete odstranit všechen obsah adresáøe %s?');
-@define('STORE_IN_DIRECTORY', 'Uložit v tomto adresáøi: ');
 @define('ERROR_NO_DIRECTORY', 'Chyba: Adresáø %s neexistuje');
 @define('FORCE_DELETE', 'Vynucené mazání souborù, které nejsou v databázi');
 @define('CHECKING_DIRECTORY', 'Kontrola souborù v adresáøi %s');
@@ -563,6 +561,20 @@
 @define('FILTER_DIRECTORY', 'Directory'); // Translate
 @define('SORT_BY', 'Sort by'); // Translate
 @define('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate
+@define('MEDIA', 'Media'); // Translate
+@define('MEDIA_LIBRARY', 'Media library'); // Translate
+@define('ADD_MEDIA', 'Add media'); // Translate
+@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate
+@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate
+@define('SAVE_FILE_AS', 'Save the file as:'); // Translate
+@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate
+@define('MEDIA_RENAME', 'Rename this file'); // Translate
+@define('IMAGE_RESIZE', 'Resize this image'); // Translate
+@define('MEDIA_DELETE', 'Delete this file'); // Translate
+@define('FILES_PER_PAGE', 'Files per page'); // Translate
+@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate
+@define('SELECT_FILE', 'Select file to insert'); // Translate
+@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- serendipity_lang_da.inc.php	5 Aug 2004 16:34:17 -0000	1.66
+++ serendipity_lang_da.inc.php	8 Aug 2004 22:01:39 -0000	1.67
@@ -242,7 +242,6 @@
 @define('ABOUT_TO_DELETE_FILE', 'Du er ved at slette <b>%s</b><br />Hvis du bruger denne fil i nogle af dine artikler, vil det forasage døde billeder<br />Er du sikker på du vil foresætte?<br /><br />');
 @define('IMAGE_FULLSIZE', 'Fuld størrelse');
 @define('IMAGE_RENAME', 'Omdøb dette billede');
-@define('IMAGE_RESIZE', 'Ændre størrelse på dette billede');
 @define('IMAGE_DELETE', 'Slet dette billede');
 @define('ABORT_NOW', 'Afbryd nu');
 @define('REMOTE_FILE_NOT_FOUND', 'Filen kunne ikke findes på serveren, er du sikker på URLen: <b>%s</b> er korrekt?');
@@ -486,7 +485,6 @@
 @define('PARENT_DIRECTORY', 'Hovedmappe');
 @define('DELETE_DIRECTORY', 'Slet denne mappe');
 @define('CONFIRM_DELETE_DIRECTORY', 'Er du sikker på du vil slette al indholdet af mappen %s?');
-@define('STORE_IN_DIRECTORY', 'Gem i denne mappe: ');
 @define('ERROR_NO_DIRECTORY', 'Fejl: Mappen %s eksistere ikke');
 @define('FORCE_DELETE', 'Gennemtving sletning af filer der ikke befinder sig i media databasen');
 @define('CHECKING_DIRECTORY', 'Checker filer i mappen %s');
@@ -560,6 +558,20 @@
 @define('FILTER_DIRECTORY', 'Directory'); // Translate
 @define('SORT_BY', 'Sort by'); // Translate
 @define('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate
+@define('MEDIA', 'Media'); // Translate
+@define('MEDIA_LIBRARY', 'Media library'); // Translate
+@define('ADD_MEDIA', 'Add media'); // Translate
+@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate
+@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate
+@define('SAVE_FILE_AS', 'Save the file as:'); // Translate
+@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate
+@define('MEDIA_RENAME', 'Rename this file'); // Translate
+@define('IMAGE_RESIZE', 'Resize this image'); // Translate
+@define('MEDIA_DELETE', 'Delete this file'); // Translate
+@define('FILES_PER_PAGE', 'Files per page'); // Translate
+@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate
+@define('SELECT_FILE', 'Select file to insert'); // Translate
+@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_lang_fr.inc.php	5 Aug 2004 16:34:18 -0000	1.45
+++ serendipity_lang_fr.inc.php	8 Aug 2004 22:01:40 -0000	1.46
@@ -243,7 +243,6 @@
 @define('ABOUT_TO_DELETE_FILE', 'Vous allez supprimer <b>%s</b><br />Si vous utilisez ce fichier dans des news, cela causera des liens morts<br />Etes vous sûr de vouloir continuer?<br /><br />');
 @define('IMAGE_FULLSIZE', 'Pleine taille');
 @define('IMAGE_RENAME', 'Renommer cette image');
-@define('IMAGE_RESIZE', 'Redimensionner cette image');
 @define('IMAGE_DELETE', 'Supprimer cette image');
 @define('ABORT_NOW', 'Annuler maintenant');
 @define('REMOTE_FILE_NOT_FOUND', 'Le fichier n\'a pas été trouvé sur le serveur, êtes vous sûr que l\'URL: <b>%s</b> est correcte?');
@@ -473,7 +472,6 @@
 @define('PARENT_DIRECTORY', 'Parent directory');
 @define('DELETE_DIRECTORY', 'Delete this directory');
 @define('CONFIRM_DELETE_DIRECTORY', 'Are you sure you want to remove all the contents of directory %s?');
-@define('STORE_IN_DIRECTORY', 'Store inside this directory: ');
 @define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
 @define('FORCE_DELETE', 'Force deletion of files not inside the media database');
 @define('CHECKING_DIRECTORY', 'Checking files in directory %s');
@@ -552,6 +550,20 @@
 @define('FILTER_DIRECTORY', 'Directory'); // Translate
 @define('SORT_BY', 'Sort by'); // Translate
 @define('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate
+@define('MEDIA', 'Media'); // Translate
+@define('MEDIA_LIBRARY', 'Media library'); // Translate
+@define('ADD_MEDIA', 'Add media'); // Translate
+@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate
+@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate
+@define('SAVE_FILE_AS', 'Save the file as:'); // Translate
+@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate
+@define('MEDIA_RENAME', 'Rename this file'); // Translate
+@define('IMAGE_RESIZE', 'Resize this image'); // Translate
+@define('MEDIA_DELETE', 'Delete this file'); // Translate
+@define('FILES_PER_PAGE', 'Files per page'); // Translate
+@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate
+@define('SELECT_FILE', 'Select file to insert'); // Translate
+@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- serendipity_lang_cz.inc.php	5 Aug 2004 16:34:17 -0000	1.49
+++ serendipity_lang_cz.inc.php	8 Aug 2004 22:01:39 -0000	1.50
@@ -247,7 +247,6 @@
 @define('ABOUT_TO_DELETE_FILE', 'Chcete vymazat <b>%s</b>.<br />Pokud je tento soubor pou¾it v nìkterém va¹em záznamu, bude zobrazen prázdný obrázek.<br />Jste si jist touto akcí?<br /><br />');
 @define('IMAGE_FULLSIZE', 'Plný rozmìr');
 @define('IMAGE_RENAME', 'Pøejmenovat obrázek');
-@define('IMAGE_RESIZE', 'Zmìnit rozmìr obrázku');
 @define('IMAGE_DELETE', 'Vymazat obrázek');
 @define('ABORT_NOW', 'Zru¹it');
 @define('REMOTE_FILE_NOT_FOUND', 'Soubor nebyl na vzdáleném serveru nalezen, jste si jist ¾e URL: <b>%s</b> je správné?');
@@ -383,7 +382,6 @@
 @define('PARENT_DIRECTORY', 'Základní adresáø');
 @define('DELETE_DIRECTORY', 'Vymazat adresáø');
 @define('CONFIRM_DELETE_DIRECTORY', 'Jste si jist, ¾e chcete odstranit v¹echen obsah adresáøe %s?');
-@define('STORE_IN_DIRECTORY', 'Ulo¾it v tomto adresáøi: ');
 @define('ERROR_NO_DIRECTORY', 'Chyba: Adresáø %s neexistuje');
 @define('FORCE_DELETE', 'Vynucené mazání souborù, které nejsou v databázi');
 @define('CHECKING_DIRECTORY', 'Kontrola souborù v adresáøi %s');
@@ -561,6 +559,20 @@
 @define('FILTER_DIRECTORY', 'Directory'); // Translate
 @define('SORT_BY', 'Sort by'); // Translate
 @define('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate
+@define('MEDIA', 'Media'); // Translate
+@define('MEDIA_LIBRARY', 'Media library'); // Translate
+@define('ADD_MEDIA', 'Add media'); // Translate
+@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate
+@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate
+@define('SAVE_FILE_AS', 'Save the file as:'); // Translate
+@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate
+@define('MEDIA_RENAME', 'Rename this file'); // Translate
+@define('IMAGE_RESIZE', 'Resize this image'); // Translate
+@define('MEDIA_DELETE', 'Delete this file'); // Translate
+@define('FILES_PER_PAGE', 'Files per page'); // Translate
+@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate
+@define('SELECT_FILE', 'Select file to insert'); // Translate
+@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_lang_nl.inc.php	5 Aug 2004 16:34:18 -0000	1.23
+++ serendipity_lang_nl.inc.php	8 Aug 2004 22:01:40 -0000	1.24
@@ -245,7 +245,6 @@
 @define('ABOUT_TO_DELETE_FILE', 'Je gaat nu het bestand <b>%s</b><br />verwijderen Als je het gebruikt in sommige van je logs is het beter het te behouden. <br />Wil je toch doorgaan?<br /><br />');
 @define('IMAGE_FULLSIZE', 'Volledige grootte');
 @define('IMAGE_RENAME', 'Beeld nieuwe naam geven');
-@define('IMAGE_RESIZE', 'Beeldgrootte aanpassen');
 @define('IMAGE_DELETE', 'Beeld verwijderen');
 @define('ABORT_NOW', 'Stop nu');
 @define('REMOTE_FILE_NOT_FOUND', 'Bestand niet gevonden op de server. Ben je zeker dat de URL: <b>%s</b> juist is?');
@@ -373,7 +372,6 @@
 @define('PARENT_DIRECTORY', 'Parent directory');
 @define('DELETE_DIRECTORY', 'Delete this directory');
 @define('CONFIRM_DELETE_DIRECTORY', 'Are you sure you want to remove all the contents of directory %s?');
-@define('STORE_IN_DIRECTORY', 'Store inside this directory: ');
 @define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
 @define('FORCE_DELETE', 'Force deletion of files not inside the media database');
 @define('CHECKING_DIRECTORY', 'Checking files in directory %s');
@@ -551,6 +549,20 @@
 @define('FILTER_DIRECTORY', 'Directory'); // Translate
 @define('SORT_BY', 'Sort by'); // Translate
 @define('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate
+@define('MEDIA', 'Media'); // Translate
+@define('MEDIA_LIBRARY', 'Media library'); // Translate
+@define('ADD_MEDIA', 'Add media'); // Translate
+@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate
+@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate
+@define('SAVE_FILE_AS', 'Save the file as:'); // Translate
+@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate
+@define('MEDIA_RENAME', 'Rename this file'); // Translate
+@define('IMAGE_RESIZE', 'Resize this image'); // Translate
+@define('MEDIA_DELETE', 'Delete this file'); // Translate
+@define('FILES_PER_PAGE', 'Files per page'); // Translate
+@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate
+@define('SELECT_FILE', 'Select file to insert'); // Translate
+@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- serendipity_lang_en.inc.php	5 Aug 2004 16:34:17 -0000	1.67
+++ serendipity_lang_en.inc.php	8 Aug 2004 22:01:40 -0000	1.68
@@ -37,7 +37,6 @@
 @define('NAME', 'Name');
 @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');
@@ -52,7 +51,6 @@
 @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');
@@ -115,9 +113,6 @@
 @define('THUMB_CREATED_DONE', 'Thumbnail created.<br>Done.');
 @define('ERROR_FILE_EXISTS_ALREADY', 'Error: File already exists on your machine!');
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occured, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
-@define('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>');
@@ -246,10 +241,6 @@
 @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 as %s');
@@ -325,7 +316,6 @@
 @define('SORT_ORDER_DESC', 'Descending');
 @define('THUMBNAIL_SHORT', 'Thumb');
 @define('ORIGINAL_SHORT', 'Orig.');
-@define('IMAGES_PER_PAGE', 'images per page');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevent HTTP caching');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".');
 @define('APPLY_MARKUP_TO', 'Apply markup to %s');
@@ -347,7 +337,6 @@
 @define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'You have ignored the upgrade stage of Serendipity, please make sure your database is correctly installed, and scheduled functions are run');
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Your Serendipity installation is now upgraded to version %s');
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'You can return to your blog by clicking %shere%s');
-@define('IMAGE_NAME', 'Save the image using filename (empty: use original file name): ');
 @define('MANAGE_USERS', 'Manage users');
 @define('EDIT_USERS', 'Edit users');
 @define('CREATE_USERS', 'Create users');
@@ -374,7 +363,6 @@
 @define('PARENT_DIRECTORY', 'Parent directory');
 @define('DELETE_DIRECTORY', 'Delete this directory');
 @define('CONFIRM_DELETE_DIRECTORY', 'Are you sure you want to remove all the contents of directory %s?');
-@define('STORE_IN_DIRECTORY', 'Store inside this directory: ');
 @define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
 @define('FORCE_DELETE', 'Force deletion of files not inside the media database');
 @define('CHECKING_DIRECTORY', 'Checking files in directory %s');
@@ -550,6 +538,21 @@
 @define('FILTER_DIRECTORY', 'Directory');
 @define('SORT_BY', 'Sort by');
 @define('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d');
+@define('MEDIA', 'Media');
+@define('MEDIA_LIBRARY', 'Media library');
+@define('ADD_MEDIA', 'Add media');
+@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:');
+@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:');
+@define('SAVE_FILE_AS', 'Save the file as:');
+@define('STORE_IN_DIRECTORY', 'Store inside the following directory: ');
+@define('ADD_MEDIA_BLAHBLAH', '<b>Add a file to your media repository:</b><p>Here you can upload mediafiles, or tell me to fetch them from somewhere in the web! If you don\'t have an appropriate image, <a href="http://images.google.com" target="_blank">search for images on google</a> matching your thoughts, the results are often useful and funny :)<p><b>Select method:</b><br>');
+@define('MEDIA_RENAME', 'Rename this file');
+@define('IMAGE_RESIZE', 'Resize this image');
+@define('MEDIA_DELETE', 'Delete this file');
+@define('FILES_PER_PAGE', 'Files per page');
+@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:');
+@define('SELECT_FILE', 'Select file to insert');
+@define('MEDIA_FULLSIZE', 'Fullsize');
 
 /* 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.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- serendipity_lang_es.inc.php	5 Aug 2004 16:34:17 -0000	1.65
+++ serendipity_lang_es.inc.php	8 Aug 2004 22:01:40 -0000	1.66
@@ -242,7 +242,6 @@
 @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?');
@@ -361,7 +360,6 @@
 @define('PARENT_DIRECTORY', 'Parent directory');
 @define('DELETE_DIRECTORY', 'Delete this directory');
 @define('CONFIRM_DELETE_DIRECTORY', 'Are you sure you want to remove all the contents of directory %s?');
-@define('STORE_IN_DIRECTORY', 'Store inside this directory: ');
 @define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
 @define('FORCE_DELETE', 'Force deletion of files not inside the media database');
 @define('CHECKING_DIRECTORY', 'Checking files in directory %s');
@@ -545,6 +543,20 @@
 @define('FILTER_DIRECTORY', 'Directory'); // Translate
 @define('SORT_BY', 'Sort by'); // Translate
 @define('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate
+@define('MEDIA', 'Media'); // Translate
+@define('MEDIA_LIBRARY', 'Media library'); // Translate
+@define('ADD_MEDIA', 'Add media'); // Translate
+@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate
+@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate
+@define('SAVE_FILE_AS', 'Save the file as:'); // Translate
+@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate
+@define('MEDIA_RENAME', 'Rename this file'); // Translate
+@define('IMAGE_RESIZE', 'Resize this image'); // Translate
+@define('MEDIA_DELETE', 'Delete this file'); // Translate
+@define('FILES_PER_PAGE', 'Files per page'); // Translate
+@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate
+@define('SELECT_FILE', 'Select file to insert'); // Translate
+@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_lang_bg.inc.php	5 Aug 2004 16:34:17 -0000	1.2
+++ serendipity_lang_bg.inc.php	8 Aug 2004 22:01:39 -0000	1.3
@@ -242,7 +242,6 @@
 @define('ABOUT_TO_DELETE_FILE', 'Âèå èñêàòå äà èçòðèåòå <b>%s</b><br />Àêî ïîëçâàòå òîçè ôàéë â íÿêîå âàøå ñúîáùåíèå, ìîæå äà ñå ïîëó÷è ãðåøêà<br />Ñèãóðåí ëè ñòå, ÷å èñêàòå äà ïðîäúëæèòå?<br /><br />');
 @define('IMAGE_FULLSIZE', 'Ïúëåí ðàçìåð');
 @define('IMAGE_RENAME', 'Ïðåèìåíîâàéòå òàçè êàðòèíêà');
-@define('IMAGE_RESIZE', 'Ïðîìåíåòå ðàçìåðèòå íà òàçè êàðòèíêà');
 @define('IMAGE_DELETE', 'Èçòðèéòå òàçè êàðòèíêà');
 @define('ABORT_NOW', 'Ñïðåòå äåéñòâèåòî ñåãà');
 @define('REMOTE_FILE_NOT_FOUND', 'Ôàéëà íå å íàìåðåí íà îòäàëå÷åíèÿ ñúðâúð, ñèãóðåí ëè ñòå ÷ð àäðåñà: <b>%s</b> å âåðåí?');
@@ -343,6 +342,20 @@
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Ìîæåòå äà ñå âúðíåòå êúì áëîãà Âè êàòî êëèêíåòå  %sòóê%s');
 @define('IMAGE_NAME', 'Çàïàçåòå èçîáðàæåíèåòî ïîä èìåòî: (empty: use original file name): ');
 @define('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate
+@define('MEDIA', 'Media'); // Translate
+@define('MEDIA_LIBRARY', 'Media library'); // Translate
+@define('ADD_MEDIA', 'Add media'); // Translate
+@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate
+@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate
+@define('SAVE_FILE_AS', 'Save the file as:'); // Translate
+@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate
+@define('MEDIA_RENAME', 'Rename this file'); // Translate
+@define('IMAGE_RESIZE', 'Resize this image'); // Translate
+@define('MEDIA_DELETE', 'Delete this file'); // Translate
+@define('FILES_PER_PAGE', 'Files per page'); // Translate
+@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate
+@define('SELECT_FILE', 'Select file to insert'); // Translate
+@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- serendipity_lang_de.inc.php	5 Aug 2004 16:34:17 -0000	1.83
+++ serendipity_lang_de.inc.php	8 Aug 2004 22:01:39 -0000	1.84
@@ -242,7 +242,6 @@
 @define('ABOUT_TO_DELETE_FILE', 'Die Datei <b>%s</b> soll gelöscht werde.<br />Wenn das Bild in einem Eintrag verwendet wurde, so wird durch das Löschen eine Lücke erzeugt.<br />Soll das Bild dennoch gelöscht werde?<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 sicher, dass die URL <b>%s</b> korrekt ist?');
@@ -369,7 +368,6 @@
 @define('PARENT_DIRECTORY', 'Stammverzeichnis');
 @define('DELETE_DIRECTORY', 'Dieses Verzeichnis löschen');
 @define('CONFIRM_DELETE_DIRECTORY', 'Wirklich alle Inhalte von Verzeichnis %s löschen?');
-@define('STORE_IN_DIRECTORY', 'In diesem Verzeichnis speichern: ');
 @define('ERROR_NO_DIRECTORY', 'Fehler: Verzeichnis %s existiert nicht.');
 @define('FORCE_DELETE', 'Alle Dateien ausserhalb der Mediendatenbank löschen');
 @define('CHECKING_DIRECTORY', 'Prüfe Dateien im Verzeichnis %s');
@@ -547,6 +545,20 @@
 @define('FILTER_DIRECTORY', 'Directory'); // Translate
 @define('SORT_BY', 'Sort by'); // Translate
 @define('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate
+@define('MEDIA', 'Media'); // Translate
+@define('MEDIA_LIBRARY', 'Media library'); // Translate
+@define('ADD_MEDIA', 'Add media'); // Translate
+@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate
+@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate
+@define('SAVE_FILE_AS', 'Save the file as:'); // Translate
+@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate
+@define('MEDIA_RENAME', 'Rename this file'); // Translate
+@define('IMAGE_RESIZE', 'Resize this image'); // Translate
+@define('MEDIA_DELETE', 'Delete this file'); // Translate
+@define('FILES_PER_PAGE', 'Files per page'); // Translate
+@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate
+@define('SELECT_FILE', 'Select file to insert'); // Translate
+@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_lang_pt.inc.php	5 Aug 2004 16:34:18 -0000	1.23
+++ serendipity_lang_pt.inc.php	8 Aug 2004 22:01:40 -0000	1.24
@@ -243,7 +243,6 @@
 @define('ABOUT_TO_DELETE_FILE', 'Você está prestes a excluir <b>%s</b><br />Se você está usando esse arquivo em alguma das seus artigos, a imagem não será mais exibida<br />Deseja realmente prosseguir com a exclusão?<br /><br />');
 @define('IMAGE_FULLSIZE', 'Tamanho total');
 @define('IMAGE_RENAME', 'Renomear esta imagem');
-@define('IMAGE_RESIZE', 'Redimensionar esta imagem');
 @define('IMAGE_DELETE', 'Excluir esta imagem');
 @define('ABORT_NOW', 'Cancelar agora');
 @define('REMOTE_FILE_NOT_FOUND', 'O arquivo não foi localizado no servidor, tem certeza sobre a URL: <b>%s</b> está correta?');
@@ -371,7 +370,6 @@
 @define('PARENT_DIRECTORY', 'Diretório superior');
 @define('DELETE_DIRECTORY', 'Excluir ese diretório');
 @define('CONFIRM_DELETE_DIRECTORY', 'Tem certeza que quer excluir todo o conteúdo do diretório %s?');
-@define('STORE_IN_DIRECTORY', 'Guardar nesse diretório: ');
 @define('ERROR_NO_DIRECTORY', 'Erro: Diretório %s não existe');
 @define('FORCE_DELETE', 'Forçar exclusão de arquivos que não estão no banco de dados da mídias ("media")');
 @define('CHECKING_DIRECTORY', 'Verificando arquivos no diretório %s');
@@ -547,6 +545,20 @@
 @define('FILTER_DIRECTORY', 'Directory'); // Translate
 @define('SORT_BY', 'Sort by'); // Translate
 @define('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate
+@define('MEDIA', 'Media'); // Translate
+@define('MEDIA_LIBRARY', 'Media library'); // Translate
+@define('ADD_MEDIA', 'Add media'); // Translate
+@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate
+@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate
+@define('SAVE_FILE_AS', 'Save the file as:'); // Translate
+@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate
+@define('MEDIA_RENAME', 'Rename this file'); // Translate
+@define('IMAGE_RESIZE', 'Resize this image'); // Translate
+@define('MEDIA_DELETE', 'Delete this file'); // Translate
+@define('FILES_PER_PAGE', 'Files per page'); // Translate
+@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate
+@define('SELECT_FILE', 'Select file to insert'); // Translate
+@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_admin_image_selector.php,1.28,1.29 serendipity_admin_images.inc.php,1.26,1.27 serendipity_entries.php,1.38,1.39 serendipity_functions.inc.php,1.386,1.387 serendipity_functions_images.inc.php,1.26,1.27

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

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

Modified Files:
	serendipity_admin_image_selector.php 
	serendipity_admin_images.inc.php serendipity_entries.php 
	serendipity_functions.inc.php 
	serendipity_functions_images.inc.php 
Log Message:
Rename image manager to Media Library, and all (I hope) associated strings
(Removal of old string are pending)


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -d -r1.386 -r1.387
--- serendipity_functions.inc.php	8 Aug 2004 15:30:33 -0000	1.386
+++ serendipity_functions.inc.php	8 Aug 2004 22:01:38 -0000	1.387
@@ -2948,7 +2948,7 @@
                         <input type="button" name="insB" value="B" accesskey="i" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<b>','</b>')" />
                         <input type="button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<u>','</u>')" />
                         <input type="button" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[body]'])" />
-                        <input type="button" name="insImage" value="<?php echo IMAGE ; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=body', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
+                        <input type="button" name="insImage" value="<?php echo MEDIA ; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=body', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
                         <input type="button" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[body]'])" />
 <?php
         /* Do the "old" non-WYSIWYG editor */
@@ -2957,7 +2957,7 @@
                         <input type="button" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'u')">
                         <input type="button" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'i')">
                         <input type="button" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[body]'])">
-                        <input type="button" value="<?php echo IMAGE; ?>" onclick="window.open('serendipity_admin_image_selector.php'?serendipity[textarea]=body, 'ImageSel', 'width=800,height=600,toolbar=no');">
+                        <input type="button" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php'?serendipity[textarea]=body, 'ImageSel', 'width=800,height=600,toolbar=no');">
                         <input type="button" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[body]'])">
 <?php   }
     } else {

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- serendipity_entries.php	18 Jul 2004 01:44:16 -0000	1.38
+++ serendipity_entries.php	8 Aug 2004 22:01:38 -0000	1.39
@@ -67,10 +67,10 @@
                 </div>
 
                 <div class="serendipitySideBarItem">
-                    <div class="serendipitySideBarTitle"><?php echo IMAGES; ?></div>
+                    <div class="serendipitySideBarTitle"><?php echo MEDIA; ?></div>
                     <div class="serendipitySideBarContent">
-                        &bull; <a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=addSelect"><?php echo ADD_IMAGES; ?></a><br />
-                        &bull; <a href="?serendipity[adminModule]=images"><?php echo MANAGE_IMAGES; ?></a><br />
+                        &bull; <a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=addSelect"><?php echo ADD_MEDIA; ?></a><br />
+                        &bull; <a href="?serendipity[adminModule]=images"><?php echo MEDIA_LIBRARY; ?></a><br />
                         <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
                         &bull; <a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a><br />
                         <?php } ?>

Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_functions_images.inc.php	6 Aug 2004 20:18:22 -0000	1.26
+++ serendipity_functions_images.inc.php	8 Aug 2004 22:01:38 -0000	1.27
@@ -752,7 +752,7 @@
                     <option value="ASC"  <?php echo (isset($serendipity['GET']['sortorder']['ordermode']) && $serendipity['GET']['sortorder']['ordermode'] == 'ASC'  ? 'selected="selected"' : '') ?>><?php echo SORT_ORDER_ASC  ?></option>
                 </select>
             </td>
-            <td><?php echo IMAGES_PER_PAGE ?></td>
+            <td><?php echo FILES_PER_PAGE ?></td>
             <td><select name="serendipity[sortorder][perpage]">
 <?php
         foreach($sort_row_interval AS $so_val) {
@@ -819,10 +819,10 @@
 <?php
                 if ($serendipity['authorid'] == $file['authorid'] || $file['authorid'] == '0' || $serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) {
 ?>
-        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_FULLSIZE; ?>" alt="<?php echo IMAGE_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo ($file['dimensions_height'] + 20); ?>,width=<?php echo ($file['dimensions_width'] + 20); ?>,toolbar=no,menubar=no,location=no,resize=1,resizable=1');" /></td>
-        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_RENAME; ?>"   alt="<?php echo IMAGE_RENAME; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/rename.png" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /></td>
+        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo ($file['dimensions_height'] + 20); ?>,width=<?php echo ($file['dimensions_width'] + 20); ?>,toolbar=no,menubar=no,location=no,resize=1,resizable=1');" /></td>
+        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_RENAME; ?>"   alt="<?php echo MEDIA_RENAME; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/rename.png" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /></td>
         <?php if ($is_image) { ?><td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>"   alt="<?php echo IMAGE_RESIZE; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/scale.png"  border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fid]=<?php echo $file['id']; ?>';" /></td><?php } ?>
-        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_DELETE; ?>"   alt="<?php echo IMAGE_DELETE; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]=<?php echo $file['id']; ?>';" /></td>
+        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>"   alt="<?php echo MEDIA_DELETE; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]=<?php echo $file['id']; ?>';" /></td>
 <?php
                 }
 ?>

Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_admin_image_selector.php	7 Aug 2004 09:43:54 -0000	1.28
+++ serendipity_admin_image_selector.php	8 Aug 2004 22:01:38 -0000	1.29
@@ -25,7 +25,7 @@
 ?>
 <html>
     <head>
-        <title><?php echo SELECT_IMAGE; ?></title>
+        <title><?php echo SELECT_FILE; ?></title>
         <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" />
         <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php">
     </head>
@@ -124,10 +124,10 @@
             $add_url .= '&amp;serendipity[filename_only]=' . $serendipity['GET']['filename_only'];
         }
 ?>
-    <b><?php echo SELECT_IMAGE; ?></b>
+    <b><?php echo SELECT_FILE; ?></b>
     <br />
 
-    <?php echo CLICK_IMAGE_TO_INSERT; ?>
+    <?php echo CLICK_FILE_TO_INSERT; ?>
     <br />
 
     <?php
@@ -145,4 +145,4 @@
 
 <?php
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_admin_images.inc.php	6 Aug 2004 20:18:18 -0000	1.26
+++ serendipity_admin_images.inc.php	8 Aug 2004 22:01:38 -0000	1.27
@@ -279,7 +279,7 @@
 
     case 'addSelect':
 ?>
-    <?php echo ADD_IMAGE_BLAHBLAH; ?>
+    <?php echo ADD_MEDIA_BLAHBLAH; ?>
 
     <script type="text/javascript">
     function getfilename(field, value) {
@@ -297,7 +297,7 @@
 
             <table>
                 <tr>
-                    <td nowrap="nowrap"><?php echo ENTER_IMAGE_URL; ?></td>
+                    <td nowrap="nowrap"><?php echo ENTER_MEDIA_URL; ?></td>
                     <td><input type="text" name="serendipity[imageurl]" onblur="getfilename('target_filename', this.value);" onchange="getfilename('target_filename', this.value);" onkeyup="getfilename('target_filename', this.value);" value="" size="40" /></td>
                 </tr>
 
@@ -306,7 +306,7 @@
                 </tr>
 
                 <tr>
-                    <td nowrap='nowrap'><?php echo ENTER_IMAGE_TO_UP; ?></td>
+                    <td nowrap='nowrap'><?php echo ENTER_MEDIA_UPLOAD; ?></td>
                     <td><input name="userfile" onchange="getfilename('target_filename', this.value);" onblur="getfilename('target_filename', this.value);" onkeyup="getfilename('target_filename', this.value);" type="file" /></td>
                 </tr>
 
@@ -315,7 +315,7 @@
                 </tr>
 
                 <tr>
-                    <td><?php echo IMAGE_NAME; ?></td>
+                    <td><?php echo SAVE_FILE_AS; ?></td>
                     <td><input type="text" id="target_filename" name="serendipity[target_filename]" value="" size="40" /></td>
                 </tr>
 

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.385,1.386

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Use mail_trackbacks for something


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -d -r1.385 -r1.386
--- serendipity_functions.inc.php	8 Aug 2004 15:24:49 -0000	1.385
+++ serendipity_functions.inc.php	8 Aug 2004 15:30:33 -0000	1.386
@@ -1753,14 +1753,16 @@
         serendipity_db_query($query);
         $cid = serendipity_db_insert_id();
 
-        $query = "SELECT email, title, mail_comments, e.moderate_comments
+        $query = "SELECT a.email, e.title, a.mail_comments, a.mail_trackbacks, e.moderate_comments
                  FROM {$serendipity['dbPrefix']}entries e, {$serendipity['dbPrefix']}authors a
                  WHERE e.id  = '$id'
                  AND e.authorid = a.authorid";
         $row = serendipity_db_query($query, true); // Get info on author/entry
 
         // Send mail to the author if he chose to receive these mails, or if the comment is awaiting moderation
-        if (serendipity_db_bool($ca['moderate_comments']) || serendipity_db_bool($row['mail_comments'])) {
+        if (serendipity_db_bool($ca['moderate_comments']) 
+            || ($type == 'NORMAL' && serendipity_db_bool($row['mail_comments']))
+            || ($type == 'TRACKBACK' && serendipity_db_bool($row['mail_trackbacks']))) {
             serendipity_sendComment($cid, $row['email'], $name, $email, $url, $id, $row['title'], $comments, $type, serendipity_db_bool($row['moderate_comments']));
         }
 

[php-blog-cvs] serendipity NEWS,1.196,1.197 serendipity_functions.inc.php,1.384,1.385

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

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

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
RFE #832040 - Allow for easier handling of Calendar CSS classes
Remove hardcoded attributes for "today"


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -d -r1.384 -r1.385
--- serendipity_functions.inc.php	5 Aug 2004 16:38:17 -0000	1.384
+++ serendipity_functions.inc.php	8 Aug 2004 15:24:49 -0000	1.385
@@ -452,7 +452,7 @@
     // Prepare the table
     $link = serendipity_archiveDateUrl($year . sprintf('%02d', $month)) . $base_query;
 ?>
-<table width="100%" class="serendipity_calendar" cellspacing="1">
+<table width="100%" class="serendipity_calendar" cellspacing="0" cellpadding="0">
     <tr>
         <td align="left" class="serendipity_calendarHeader">
 <?php
@@ -486,7 +486,7 @@
     for ($i = 1; $i <= 7; $i++) {
         $date = mktime(0,0,0,3,$bow+$i-1,2004);
 ?>
-        <td class="serendipity_weekDayName" align="center"><?php echo substr(strftime("%a", $date),0,2); ?></td>
+        <td class="serendipity_weekDayName" align="center"><?php echo substr(serendipity_formatTime("%a", $date),0,2); ?></td>
 <?php
     }
 ?>
@@ -509,54 +509,47 @@
 <?php
         // Prepare row
         for ($y = 0; $y < 7; $y++) {
-            // Be able to print borders nicely
-            if ($x == $nrOfRows-1 && $y == 6) {
-                $cellProp = 'LastInLastRow';
-            } else if ($y == 0) {
-                $cellProp = 'FirstInRow';
-            } else if ($y == 6) {
-                $cellProp = 'LastInRow';
-            } else if ($x == $nrOfRows-1) {
-                $cellProp = 'LastRow';
-            } else {
-                $cellProp = '';
+            $cellProps = array();
+            $link = '';
+
+            if ($x == 0) {
+                $cellProps[] = 'FirstRow';
             }
+            if ($y == 0) {
+                $cellProps[] = 'FirstInRow';
+            }
+            if ($y == 6) {
+                $cellProps[] = 'LastInRow';
+            } 
+            if ($x == $nrOfRows-1) {
+                $cellProps[] = 'LastRow';
+            } 
 
-            // Start printing
-            if (($x > 0 || $y >= $firstDayWeekDay)
-                 && $currDay <= $nrOfDays) {
+            // If it's not a blank day, we print the day
+            if (($x > 0 || $y >= $firstDayWeekDay) && $currDay <= $nrOfDays) {
 
-                if (isset($activeDays[$currDay]) && $activeDays[$currDay] > 1) {
-                    $cellProp .= 'Active';
+                $printDay = $currDay;
+ 
+                if ($today_year == $year && $today_month == $month && $today_day == $currDay) {
+                    $cellProps[] = 'Today';
                 }
 
-                if ($today_year     == $year
-                    && $today_month == $month
-                    && $today_day   == $currDay) {
-                    $att_start = '<i>';
-                    $att_end   = '</i>';
-                } else {
-                    $att_start = '';
-                    $att_end   = '';
+                if (isset($activeDays[$currDay]) && $activeDays[$currDay] > 1) {
+                    $cellProps[] = 'Active';
                 }
 
                 if (isset($activeDays[$currDay]) && $activeDays[$currDay] > 1) {
-                    $lnk_start = '<a href="' . serendipity_archiveDateUrl(sprintf('%4d%02d%02d', $year, $month, $currDay)) . $base_query . '">'; //?month=".sprintf("%02d",$month)."&year=$year'>");
-                    $lnk_end   = '</a>';
-                } else {
-                    $lnk_start = '';
-                    $lnk_end   = '';
+                    $printDay = '<a href="' . serendipity_archiveDateUrl(sprintf('%4d%02d%02d', $year, $month, $currDay)) . $base_query . '">'. $printDay .'</a>';
                 }
 
                 $currDay++;
 ?>
-        <td class="serendipity_calendarDay<?php echo $cellProp; ?>">
-            <?php echo $att_start . $lnk_start . ($currDay - 1) . $lnk_end . $att_end; ?>
-        </td>
+        <td class="serendipity_calendarDay <?php echo implode(' ', $cellProps); ?>"><?php echo $printDay ?></td>
 <?php
+            // If it's a blank day (a day outside the month)
             } else {
 ?>
-        <td class="serendipity_calendarBlankDay<?php echo $cellProp; ?>">&nbsp;</td>
+        <td class="serendipity_calendarDay BlankDay <?php echo implode(' ', $cellProps); ?>">&nbsp;</td>
 <?php
             } // end if (print day)
         } // end for-loop (inner: days)

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- NEWS	5 Aug 2004 22:31:10 -0000	1.196
+++ NEWS	8 Aug 2004 15:24:49 -0000	1.197
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * RFE #832040 - Allow for easier handling of Calendar CSS classes
+      and remove hardcoded attributes for "today" (tomsommer)
+
     * Add detection for support of php_value directives in .htaccess 
       files (tomsommer)
 

[php-blog-cvs] serendipity/templates/default layout.php,1.17,1.18

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

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

Modified Files:
	layout.php 
Log Message:
Remove fragments from upcomming archive changes, not suppose to go in now


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/layout.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- layout.php	7 Aug 2004 16:33:51 -0000	1.17
+++ layout.php	7 Aug 2004 16:38:30 -0000	1.18
@@ -34,6 +34,10 @@
 ?>
         <td id="content" valign="top">
 <?php
+if (!isset($serendipity['GET']['range']) || !is_numeric($serendipity['GET']['range'])) {
+    $serendipity['GET']['range'] = date('Ymd');
+}
+
 // The main area
 switch ($serendipity['GET']['action']) {
     // User wants to read the diary
@@ -41,7 +45,7 @@
         if (isset($serendipity['GET']['id'])) {
             serendipity_printEntries(array(serendipity_fetchEntry('id', $serendipity['GET']['id'])), 1);
         } else {
-            serendipity_printEntries(serendipity_fetchEntries('', true, 15));
+            serendipity_printEntries(serendipity_fetchEntries($serendipity['GET']['range'], true, 15));
         }
         break;
 

[php-blog-cvs] serendipity/templates/moz-modern style.css,1.13,1.14

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

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

Modified Files:
	style.css 
Log Message:
- Remove serendipity_imageCommentClosing_center
- Center content of Image-Comment boxes


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/moz-modern/style.css,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- style.css	3 Aug 2004 18:04:38 -0000	1.13
+++ style.css	7 Aug 2004 16:33:52 -0000	1.14
@@ -407,6 +407,7 @@
     margin: 0px;
     padding: 0px;
     border: 0px;
+    text-align: center;
 }
 
 .serendipity_imageComment_txt {
@@ -414,11 +415,7 @@
     padding: 3px;
     clear: both;
     font-size: 9pt;
-}
-
-.serendipity_imageCommentClosing_center {
-    clear: both;
-    display: block;
+    text-align: center;
 }
 
 .serendipity_admin_list_item_even {

[php-blog-cvs] serendipity/templates/idea style.css,1.4,1.5

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

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

Modified Files:
	style.css 
Log Message:
- Remove serendipity_imageCommentClosing_center
- Center content of Image-Comment boxes


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/idea/style.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- style.css	3 Aug 2004 18:04:38 -0000	1.4
+++ style.css	7 Aug 2004 16:33:52 -0000	1.5
@@ -308,6 +308,7 @@
     margin: 0px;
     padding: 0px;
     border: 0px;
+    text-align: center;
 }
 
 .serendipity_imageComment_txt {
@@ -315,6 +316,7 @@
     padding: 3px;
     clear: both;
     font-size: 9pt;
+    text-align: center;
 }
 
 img.serendipity_entryIcon {
@@ -322,11 +324,6 @@
     border: 0px;
 }
 
-.serendipity_imageCommentClosing_center {
-    clear: both;
-    display: block;
-}
-
 .serendipity_admin_list_item_even {
 }
 

[php-blog-cvs] serendipity/templates/default layout.php,1.16,1.17 style.css,1.27,1.28

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

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

Modified Files:
	layout.php style.css 
Log Message:
- Remove serendipity_imageCommentClosing_center
- Center content of Image-Comment boxes


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/layout.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- layout.php	7 Apr 2004 12:42:44 -0000	1.16
+++ layout.php	7 Aug 2004 16:33:51 -0000	1.17
@@ -34,10 +34,6 @@
 ?>
         <td id="content" valign="top">
 <?php
-if (!isset($serendipity['GET']['range']) || !is_numeric($serendipity['GET']['range'])) {
-    $serendipity['GET']['range'] = date('Ymd');
-}
-
 // The main area
 switch ($serendipity['GET']['action']) {
     // User wants to read the diary
@@ -45,7 +41,7 @@
         if (isset($serendipity['GET']['id'])) {
             serendipity_printEntries(array(serendipity_fetchEntry('id', $serendipity['GET']['id'])), 1);
         } else {
-            serendipity_printEntries(serendipity_fetchEntries($serendipity['GET']['range'], true, 15));
+            serendipity_printEntries(serendipity_fetchEntries('', true, 15));
         }
         break;
 

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/style.css,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- style.css	3 Aug 2004 18:04:38 -0000	1.27
+++ style.css	7 Aug 2004 16:33:51 -0000	1.28
@@ -341,6 +341,7 @@
     margin: 0px;
     padding: 0px;
     border: 0px;
+    text-align: center;
 }
 
 .serendipity_imageComment_txt {
@@ -348,11 +349,7 @@
     padding: 3px;
     clear: both;
     font-size: 9pt;
-}
-
-.serendipity_imageCommentClosing_center {
-    clear: both;
-    display: block;
+    text-align: center;
 }
 
 .serendipity_admin_list_item_even {

[php-blog-cvs] serendipity/templates/blue style.css,1.13,1.14

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

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

Modified Files:
	style.css 
Log Message:
- Remove serendipity_imageCommentClosing_center
- Center content of Image-Comment boxes


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/blue/style.css,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- style.css	3 Aug 2004 18:04:37 -0000	1.13
+++ style.css	7 Aug 2004 16:33:51 -0000	1.14
@@ -271,6 +271,7 @@
     margin: 0px;
     padding: 0px;
     border: 0px;
+    text-align: center;
 }
 
 .serendipity_imageComment_txt {
@@ -278,11 +279,7 @@
     padding: 3px;
     clear: both;
     font-size: 9pt;
-}
-
-.serendipity_imageCommentClosing_center {
-    clear: both;
-    display: block;
+    text-align: center;
 }
 
 .serendipity_admin_list_item_even {

[php-blog-cvs] serendipity/templates/mt3-squash style.css,1.3,1.4

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

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

Modified Files:
	style.css 
Log Message:
- Remove serendipity_imageCommentClosing_center
- Center content of Image-Comment boxes


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt3-squash/style.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- style.css	3 Aug 2004 18:04:41 -0000	1.3
+++ style.css	7 Aug 2004 16:33:54 -0000	1.4
@@ -357,6 +357,7 @@
     margin: 0px;
     padding: 0px;
     border: 0px;
+    text-align: center;
 }
 
 .serendipity_imageComment_txt {
@@ -364,11 +365,7 @@
     padding: 3px;
     clear: both;
     font-size: xx-small;
-}
-
-.serendipity_imageCommentClosing_center {
-    clear: both;
-    display: block;
+    text-align: center;
 }
 
 .serendipity_admin_list_item_even {

[php-blog-cvs] serendipity/templates/newspaper style.css,1.12,1.13

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

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

Modified Files:
	style.css 
Log Message:
- Remove serendipity_imageCommentClosing_center
- Center content of Image-Comment boxes


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/style.css,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- style.css	26 Jul 2004 03:23:09 -0000	1.12
+++ style.css	7 Aug 2004 16:33:54 -0000	1.13
@@ -297,6 +297,7 @@
     margin: 0px;
     padding: 0px;
     border: 0px;
+    text-align: center;
 }
 
 .serendipity_imageComment_txt {
@@ -304,6 +305,7 @@
     padding: 3px;
     clear: both;
     font-size: 9pt;
+    text-align: center;
 }
 
 img.serendipity_entryIcon {
@@ -311,11 +313,6 @@
     border: 0px;
 }
 
-.serendipity_imageCommentClosing_center {
-    clear: both;
-    display: block;
-}
-
 .serendipity_admin_list_item_even {
     background-color: #ffffff;
 }
@@ -344,4 +341,4 @@
 
 .serendipity_msg_notice {
     color: green;
-}
\ No newline at end of file
+}