php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/lang serendipity_lang_fr.inc.php,1.57,1.58

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

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

Modified Files:
	serendipity_lang_fr.inc.php 
Log Message:
Updated french language file, many thanks to Sebastian 'The Argh' Mordziol!


Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- serendipity_lang_fr.inc.php	5 Sep 2004 19:56:57 -0000	1.57
+++ serendipity_lang_fr.inc.php	8 Sep 2004 08:37:41 -0000	1.58
@@ -7,6 +7,8 @@
 # (c) 2003 Jannis Hermanns <J...@ha...>                                 #
 # http://www.jannis.to/programming/serendipity.html                      #
 #                                                                        #
+# French translation by Sebasian Mordziol <ar...@ph...>           #
+# http://sebastian.mordziol.de                                           #
 ##########################################################################
 
 @define('LANG_CHARSET', 'ISO-8859-1');
@@ -14,39 +16,42 @@
 @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'fr');
+@define('NUMBER_FORMAT_DECIMALS', '2');
+@define('NUMBER_FORMAT_DECPOINT', '.');
+@define('NUMBER_FORMAT_THOUSANDS', ',');
 
-@define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administration (Suite)');
-@define('HAVE_TO_BE_LOGGED_ON', 'Vous devez être loggué pour voir cette page');
+@define('SERENDIPITY_ADMIN_SUITE', 'Administration de Serendipity');
+@define('HAVE_TO_BE_LOGGED_ON', 'Vous devez être authentifié pour accéder à cette page');
 @define('WRONG_USERNAME_OR_PASSWORD', 'Vous avez entré un nom d\'utilisateur ou un mot de passe erroné');
 @define('APPEARANCE', 'Apparence');
 @define('MANAGE_STYLES', 'Configurer les Styles');
 @define('CONFIGURE_PLUGINS', 'Configurer les Plugins');
 @define('ADMIN', 'Administrateur:');
 @define('CONFIGURATION', 'Configuration');
-@define('IMPORT_EXPORT_ENTRIES', 'Importer/Exporter des news');
+@define('IMPORT_EXPORT_ENTRIES', 'Importer/Exporter des billets');
 @define('BACK_TO_BLOG', 'Revenir au Weblog');
 @define('LOGIN', 'Se connecter');
 @define('LOGOUT', 'Se déconnecter');
 @define('LOGGEDOUT', 'Déconnecté.');
 @define('CREATE', 'Créer');
-@define('EDIT_THIS_CAT', 'Editer "%s - %s"');
+@define('EDIT_THIS_CAT', 'Éditer "%s - %s"');
 @define('SAVE', 'Enregistrer');
 @define('NAME', 'Nom');
 @define('CLICK_CAT_TO_EDIT', 'Cliquez sur une catégorie pour l\'éditer');
 @define('CREATE_NEW_CAT', 'Créer une nouvelle catégorie');
-@define('I_WANT_THUMB', 'Je veux utiliser un aperçu d\'images dans ma news.');
-@define('I_WANT_BIG_IMAGE', 'Je veux utiliser l\'image la plus large dans ma news.');
-@define('I_WANT_NO_LINK', ' Je veux l\'afficher comme une étant une image');
-@define('I_WANT_IT_TO_LINK', 'Je veux l\'afficher comme étant un lien vers cette adresse internet:');
+@define('I_WANT_THUMB', 'Je veux utiliser une miniature dans ma news.');
+@define('I_WANT_BIG_IMAGE', 'Je veux utiliser l\'image en taille rélle dans mon billet.');
+@define('I_WANT_NO_LINK', ' Je veux l\'afficher en tant qu\'image');
+@define('I_WANT_IT_TO_LINK', 'Je veux l\'afficher en tant que lien vers cette adresse:');
 @define('BACK', 'Précédent');
 @define('FORWARD', 'Suivant');
-@define('ANONYMOUS', 'Anonymes');
+@define('ANONYMOUS', 'Anonyme');
 @define('LINK_TO_COMMENT', 'Lien vers le commentaire #');
 @define('SEND_MAIL_TO', 'Envoyer un mail à');
 @define('NEW_TRACKBACK_TO', 'Nouveau traçage fait sur');
 @define('NEW_COMMENT_TO', 'Nouveau commentaire posté sur');
-@define('RECENT', 'Récemment...');
-@define('OLDER', 'Précédemment...');
+@define('RECENT', 'Récentes...');
+@define('OLDER', 'Plus anciennes...');
 @define('DONE', 'Effectué');
 @define('WELCOME_BACK', 'Bienvenue,');
 @define('RUNNING', 'Vous utilisez Serendipity v.');
@@ -57,56 +62,56 @@
 @define('DELETE', 'Supprimer');
 @define('SAVE', 'Enregistrer');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Sélectionnez un plugin à ajouter');
-@define('UP', 'REMONTER');
-@define('DOWN', 'DESCENDRE');
-@define('ENTRIES', 'news');
-@define('NEW_ENTRY', 'Poster une news');
-@define('AUTHOR_SUITE', 'Suite des auteurs');
-@define('EDIT_ENTRIES', 'Editer les news');
+@define('UP', '+HAUT');
+@define('DOWN', '+BAS');
+@define('ENTRIES', 'billets');
+@define('NEW_ENTRY', 'Poster un billet');
+@define('AUTHOR_SUITE', 'Administration des auteurs');
+@define('EDIT_ENTRIES', 'Éditer les billets');
 @define('CATEGORIES', 'Catégories');
 @define('EDIT_CATEGORIES', 'Configurer les catégories');
-@define('WARNING_THIS_BLAHBLAH', "ATTENTION:\\nCela peut prendre du temps si vous avez beaucoup d\'images.");
-@define('CREATE_THUMBS', 'Reconstruire les aperçus');
+@define('WARNING_THIS_BLAHBLAH', "ATTENTION:\\nCeci peut prende du temps si il y beaucoup d\'images sans miniatures.");
+@define('CREATE_THUMBS', 'Recréer les miniatures');
 @define('MANAGE_IMAGES', 'Configurer les images');
 @define('ADMIN_INTERFACE', 'Interface administrateur');
-@define('SERENDIPITY_AUTHORING_SUITE', 'Suite de l\'administration Serendipity');
+@define('SERENDIPITY_AUTHORING_SUITE', 'Administration de Serendipity');
 @define('NAME', 'Nom');
 @define('EMAIL', 'Email');
-@define('HOMEPAGE', 'Page web');
+@define('HOMEPAGE', 'Site');
 @define('COMMENT', 'Commentaire');
 @define('REMEMBER_INFO', 'Enregistrer ses informations?');
 @define('SUBMIT_COMMENT', 'Poster le commentaire');
-@define('NO_ENTRIES_TO_PRINT', 'Aucune news à afficher.');
+@define('NO_ENTRIES_TO_PRINT', 'Aucun billet à afficher.');
 @define('COMMENTS', 'Commentaires');
 @define('ADD_COMMENT', 'Ajouter un commentaire');
 @define('NO_COMMENTS', 'Pas de commentaires.');
 @define('POSTED_BY', 'Posté par');
 @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('A_NEW_COMMENT_BLAHBLAH', 'Un nouveau commentaire a été posté sur votre blog "%s", pour le billet intitulé "%s".');
+@define('A_NEW_TRACKBACK_BLAHBLAH', 'Un nouveau suivi a été fait sur votre blog au billet intitulée "%s".');
 @define('NO_CATEGORY', 'Pas de Catégorie');
-@define('ENTRY_BODY', 'Corps de la news');
-@define('EXTENDED_BODY', 'Extension de la news');
+@define('ENTRY_BODY', 'Introduction');
+@define('EXTENDED_BODY', 'Corps du billet');
 @define('CATEGORY', 'Catégorie');
-@define('EDIT', 'Editer');
-@define('NO_ENTRIES_BLAHBLAH', 'Aucune news trouvée pour la requête %s' . "\n");
+@define('EDIT', 'Éditer');
+@define('NO_ENTRIES_BLAHBLAH', 'Aucun billet trouvé 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');
+@define('SEARCH_TOO_SHORT', 'Vos critères de recherche doivent avoir un minimum de %s caractères');
 @define('IMAGE', 'Image');
-@define('ERROR_FILE_NOT_EXISTS', 'Erreur: Le fichier n\'existe pas!');
-@define('ERROR_FILE_EXISTS', 'Erreur: Le fichier est déjà pris, prenez en un autre !');
+@define('ERROR_FILE_NOT_EXISTS', 'Erreur: Ce fichier n\'existe pas.');
+@define('ERROR_FILE_EXISTS', 'Erreur: Il existe déjà un fichier portant ce nom. Choisissez un nouveau nom.');
 @define('ERROR_SOMETHING', 'Erreur: Quelque chose ne va pas.');
 @define('ADDING_IMAGE', 'Ajout d\'une image...');
-@define('THUMB_CREATED_DONE', 'Aperçu crée.<br>Terminé.');
-@define('ERROR_FILE_EXISTS_ALREADY', 'Erreur: Le fichier existe déjà sur votre machine!');
+@define('THUMB_CREATED_DONE', 'Miniature créee.<br>Terminé.');
+@define('ERROR_FILE_EXISTS_ALREADY', 'Erreur: Le fichier existe déjà sur votre machine.');
 @define('GO', 'Go!');
 @define('NEWSIZE', 'Nouvelle taille: ');
 @define('RESIZE_BLAHBLAH', '<b>Redimensionner %s</b><p>');
 @define('ORIGINAL_SIZE', 'Taille d\'origine: <i>%sx%s</i> pixel');
-@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Ici vous pouvez ajuster la nouvelle taille des images. Si vous voulez conserver les proportions, entrez juste une valeur et pressez la touche TAB, je calculerais la nouvelle taille donc les proportions ne seront pas oubliées:');
+@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Ici vous pouvez ajuster la taille de l\'image sélectionnée. Si vous voulez respecter les proportions de l\'image, entrez juste la hauteur ou la largeur, et pressez la touche TAB - la valeur correspondante sera insérée automatiquement:');
 @define('QUICKJUMP_CALENDAR', 'Saut rapide vers le Calendrier');
 @define('QUICKSEARCH', 'Recherche rapide');
-@define('SEARCH_FOR_ENTRY', 'Recherche d\'une news');
+@define('SEARCH_FOR_ENTRY', 'Recherche d\'un billet');
 @define('ARCHIVES', 'Archives');
 @define('BROWSE_ARCHIVES', 'Afficher les archives par mois');
 @define('TOP_REFERRER', 'Top des liens entrants');
@@ -117,15 +122,15 @@
 @define('SHOWS_RSS_BLAHBLAH', 'Montrer les liens de syndication RSS');
 @define('PLUG', 'Plug');
 @define('ADVERTISES_BLAHBLAH', 'Publicité sur l\'origine de votre blog');
-@define('HTML_NUGGET', 'Bloc en HTML');
-@define('HOLDS_A_BLAHBLAH', 'Affiche quelque chose en HTML sur le côté');
-@define('TITLE_FOR_NUGGET', 'Titre du bloc');
-@define('THE_NUGGET', 'Contenu du bloc HTML!');
+@define('HTML_NUGGET', 'Bloc HTML');
+@define('HOLDS_A_BLAHBLAH', 'Permet d\'afficher des contenus personnalisés au format HTML dans la barre latérale');
+@define('TITLE_FOR_NUGGET', 'Titre du bloc HTML');
+@define('THE_NUGGET', 'Contenu du bloc HTML');
 @define('SYNDICATE_THIS_BLOG', 'Syndiquer Ce Blog');
 @define('YOU_CHOSE', 'Vous avez choisi %s');
 @define('IMAGE_SIZE', 'Taille de l\'image');
 @define('IMAGE_AS_A_LINK', 'Insérer l\'image');
-@define('POWERED_BY', 'Powered by');
+@define('POWERED_BY', 'propulsé par');
 @define('TRACKBACKS', 'Suivis');
 @define('TRACKBACK', 'Suivi');
 @define('NO_TRACKBACKS', 'Pas de suivis');
@@ -133,33 +138,33 @@
 @define('VIEW_FULL', 'Voir la totalité');
 @define('VIEW_TOPICS', 'Voir les sujets');
 @define('AT', 'à');
-@define('SET_AS_TEMPLATE', 'Définir comme thème');
+@define('SET_AS_TEMPLATE', 'Choisir ce thème');
 @define('IN', 'dans');
 @define('EXCERPT', 'Excepté');
-@define('TRACKED', 'Traqué');
-@define('LINK_TO_ENTRY', 'Liens vers la news');
-@define('LINK_TO_REMOTE_ENTRY', 'Lien vers la news haute');
+@define('TRACKED', 'Suivi');
+@define('LINK_TO_ENTRY', 'Liens vers le billet');
+@define('LINK_TO_REMOTE_ENTRY', 'Lien vers le billet externe');
 @define('IP_ADDRESS', 'Adresse IP');
 @define('USER', 'Utilisateur');
-@define('THUMBNAIL_USING_OWN', 'Utiliser %s comme aperçu car elle est déjà trop petite.');
-@define('THUMBNAIL_FAILED_COPY', 'Essai d\'utilisation de %s comme aperçu, mais copie échouée!');
+@define('THUMBNAIL_USING_OWN', 'L\'image %s est si petite qu\'elle va être utilisée comme sa propre miniature.');
+@define('THUMBNAIL_FAILED_COPY', 'La minitaure pour %s n\'a pas pu être copiée.');
 @define('AUTHOR', 'Auteur');
 @define('LAST_UPDATED', 'Dernière mise à jour');
-@define('TRACKBACK_SPECIFIC', 'Suivi spécifique de l\'url de cette news');
-@define('DIRECT_LINK', 'Lien direct pour cette news');
-@define('COMMENT_ADDED', 'Votre commentaire a été ajouté avec succès.');
+@define('TRACKBACK_SPECIFIC', 'Adresse de suivi spécifique pour ce billet');
+@define('DIRECT_LINK', 'Lien direct à ce billet');
+@define('COMMENT_ADDED', 'Votre commentaire a été ajouté.');
 @define('COMMENT_ADDED_CLICK', 'Cliquez %sici pour retourner%s aux commentaires, et %sici pour fermer%s cette fenêtre.');
-@define('COMMENT_NOT_ADDED', 'Votre commentaire n\'a pas pû être ajouté, car les commentaires pour cette news ont été désactivés. ');
+@define('COMMENT_NOT_ADDED', 'Votre commentaire n\'a pas pû être ajouté, car les commentaires pour ce billet ont été désactivés. ');
 @define('COMMENT_NOT_ADDED_CLICK', 'Cliquez %sici pour retourner%s aux commentaires, et %sici pour fermer%s cette fenêtre.');
-@define('COMMENTS_DISABLE', 'Ne pas autoriser de commentaires pour cette news');
-@define('COMMENTS_ENABLE', 'Autoriser des commentaires pour cette news');
-@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('COMMENTS_DISABLE', 'Ne pas autoriser de commentaires pour ce billet');
+@define('COMMENTS_ENABLE', 'Autoriser les commentaires pour ce billet');
+@define('COMMENTS_CLOSED', 'L\'auteur n\'a pas autorisé l\'ajout de commentaires pour ce billet.');
+@define('EMPTY_COMMENT', 'Votre commentaire est vide, %sretournez en arrière%s et réessayez');
+@define('ENTRIES_FOR', 'Billets pour %s');
 @define('DOCUMENT_NOT_FOUND', 'Le document %s n\'a pas été trouvé.');
 @define('USERNAME', 'Nom d\'utilisateur');
 @define('PASSWORD', 'Mot de passe');
-@define('AUTOMATIC_LOGIN', 'Enregistrer les informations');
+@define('AUTOMATIC_LOGIN', 'Garder en mémoire');
 @define('SERENDIPITY_INSTALLATION', 'Installation de Serendipity');
 @define('LEFT', 'gauche');
 @define('RIGHT', 'droite');
@@ -170,114 +175,114 @@
 @define('ERROR', 'Erreur');
 @define('DELETE_SURE', 'Etes vous sûr de vouloir supprimer #%s définitivement?');
 @define('NOT_REALLY', 'Pas vraiment...');
-@define('DUMP_IT', 'A mort!');
-@define('RIP_ENTRY', 'La news #%s est annihilée');
-@define('CATEGORY_DELETED_ARTICLES_MOVED', 'Catégorie #%s supprimée. Les anciens articles ont été déplacés dans la catégorie #%s');
+@define('DUMP_IT', 'À la poubelle!');
+@define('RIP_ENTRY', 'Le billet #%s a rejoint l\'éternel.');
+@define('CATEGORY_DELETED_ARTICLES_MOVED', 'Catégorie #%s supprimée. Les billets ont été déplacés dans la catégorie #%s');
 @define('CATEGORY_DELETED', 'Catégorie #%s supprimée.');
-@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category: %s');
+@define('CATEGORY_REMAINING', 'Supprimer cette catégorie et déplacer les billets dans la catégorie: %s');
 @define('INVALID_CATEGORY', 'Aucune catégorie sélectionnée pour la suppression');
 @define('CATEGORY_SAVED', 'Catégorie sauvegardée');
 @define('SELECT_TEMPLATE', 'Sélectionnez le thème que vous voulez utiliser pour votre blog');
-@define('ENTRIES_SUCCESSFULLY_INSERTED', 'News insérées avec succès!');
-@define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Les news n\'ont pas été insérées!');
-@define('VIEW_FEED_EXPORT', 'Voir l\'export');
+@define('ENTRIES_SUCCESSFULLY_INSERTED', 'Billets importés avec succès!');
+@define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Les billets n\'ont pas pu être importés.');
+@define('VIEW_FEED_EXPORT', 'Voir l\'export du fil');
 @define('IMPORT', 'Importer');
 @define('EXPORT', 'Exporter');
 @define('YES', 'Oui');
 @define('NO', 'Non');
 @define('USE_DEFAULT', 'Default');
 @define('CHECK_N_SAVE', 'Vérifier &amp; sauvegarder');
-@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_WRITE_ERROR', 'Je ne peux pas écrire dans le répertoire %s. Il faudrait que vous me donniez les droits d\'accès nécessaires manuellement.');
+@define('DIRECTORY_CREATE_ERROR', 'Le répertoire %s n\'existe pas et ne peut pas être crée automatiquement. Veuillez le créer manuellement, ou me donner les droits d\'accès nécessaires.');
 @define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; exécute <i>%s %s</i>');
-@define('CANT_EXECUTE_BINARY', 'Ne peux exécuter le binaire %s');
-@define('FILE_WRITE_ERROR', 'Ne peux écrire sur le fichier %s.');
-@define('FILE_CREATE_YOURSELF', 'Merci de créer le fichier vous même ou de vérifier les permissions');
-@define('COPY_CODE_BELOW', '<br />* Copiez juste le code ci dessous et placez le %s dans votre %s répertoire:<b><pre>%s</pre></b>' . "\n");
-@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('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.');
-@define('ATTEMPT_SETUP_DATABASE', 'Attente de l\'installation de la base de données...');
-@define('CHECK_DATABASE_EXISTS', 'Vérification en cours pour voir si la base de données est en place. Si vous voyez une requête d\'erreur ici, ignorez la...');
-@define('CREATE_DATABASE', 'Création de la base de données par défaut...');
+@define('CANT_EXECUTE_BINARY', 'Je ne peux pas exécuter le programme %s');
+@define('FILE_WRITE_ERROR', 'Je ne peux pas ouvrir le fichier %s pour écriture.');
+@define('FILE_CREATE_YOURSELF', 'Merci de créer le fichier vous-même ou de me donner les droits d\'accès nécessaires.');
+@define('COPY_CODE_BELOW', '<br />* Copiez le code ci-dessous et placez le %s dans votre %s répertoire:<b><pre>%s</pre></b>' . "\n");
+@define('WWW_USER', 'Changez www dans le nom d\'utilisateur sous lequel fonctionne le serveur apache (nobody, par ex).');
+@define('BROWSER_RELOAD', 'Une fois ceci effectué, rechargez la page avec la touche "F5".');
+@define('DIAGNOSTIC_ERROR', 'J\'ai touvé quelques erreurs en vérifiant vos données:');
+@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity n\'est pas encore installé. Vous pouvez <a href="%s">l\'installer maintenant</a>.');
+@define('INCLUDE_ERROR', 'Erreur Serendipity: impossible d\'inclure le fichier %s.');
+@define('DATABASE_ERROR', 'Erreur Serendipity: impossible d\'ouvrir une connexion avec la base de données.');
+@define('ATTEMPT_SETUP_DATABASE', 'Essai de configuration de la base de données...');
+@define('CHECK_DATABASE_EXISTS', 'Vérification en cours pour voir si la base de données est déjà configurée. Si vous voyez un message d\'erreur ici, vous pouvez l\'ignorer.');
+@define('CREATE_DATABASE', 'Création de la structure de la base de données...');
 @define('DATABASE_DONE', 'Création de la base de données effectuée');
-@define('ATTEMPT_WRITE_FILE', 'Attente de l\'écriture du fichier %s ...');
-@define('SERENDIPITY_INSTALLED', '%sSerendipity a été installé avec succès sur votre système.%s Merci de vous souvenir de votre mot de passe: "%s", votre nom d\'utilisateur est "%s".%sVous pouvez visualiser votre nouveau blog PHP <a href="%s">en cliquant ici</a>');
+@define('ATTEMPT_WRITE_FILE', 'Essai d\'écriture sur le fichier %s...');
+@define('SERENDIPITY_INSTALLED', '%sSerendipity a été installé avec succès. %s N\'oubliez pas votre mot de passe: "%s", et votre nom d\'utilisateur "%s".%sVous pouvez accéder à votre nouveau blog en <a href="%s">cliquant ici</a>');
 @define('WRITTEN_N_SAVED', 'Configuration écrite &amp; sauvegardée');
-@define('IMAGE_ALIGNMENT', 'Alignement de l\'image');
+@define('IMAGE_ALIGNMENT', 'Position de l\'image');
 @define('ENTER_NEW_NAME', 'Entrez le nouveau nom pour: ');
 @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');
-@define('SYNC_DONE', 'Terminé (synchronisé %s images).');
-@define('DELETE_IMAGE_FAIL' , 'Impossible de supprimer l\'image <b>%s</b>');
-@define('DELETE_THUMBNAIL', 'Suppression de l\'aperçu de l\'image intitulée <b>%s</b>');
-@define('FILE_NOT_FOUND', 'Impossible de trouver le fichier intitulé <b>%s</b>, peut etre a t il déjà été supprimé?');
+@define('RESIZE_DONE', 'Terminé (%s images redimensionnées).');
+@define('SYNCING', 'Synchronisation de la base de données avec votre collection d\'images');
+@define('SYNC_DONE', 'Terminé (%s images synchronisées).');
+@define('DELETE_IMAGE_FAIL' , 'Impossible de supprimer l\'image intitulée <b>%s</b>');
+@define('DELETE_THUMBNAIL', 'Suppression de la miniatrure de l\'image intitulée <b>%s</b>');
+@define('FILE_NOT_FOUND', 'Impossible de trouver le fichier intitulé <b>%s</b>, peut-être qu\'il a déjà été supprimé?');
 @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?');
-@define('FILE_FETCHED', '%s transformé en %s');
-@define('FILE_UPLOADED', 'Le fichier %s a été uploadé avec succès en %s');
+@define('REMOTE_FILE_NOT_FOUND', 'Le fichier n\'a pas été trouvé sur le serveur distant, êtes vous sûr que l\'URL: <b>%s</b> est correcte?');
+@define('FILE_FETCHED', '%s téléchargé et savegardé sous %s');
+@define('FILE_UPLOADED', 'Le fichier %s a été uploadé avec succès sous %s');
 @define('WORD_OR', 'Ou');
-@define('SCALING_IMAGE', 'Transformation %s en %s x %s px');
+@define('SCALING_IMAGE', 'Redimensionnement %s en %s x %s px');
 @define('KEEP_PROPORTIONS', 'Conserver les proportions');
-@define('REALLY_SCALE_IMAGE', 'Réellement transformer l\'image ? Aucun moyen de retour, attention !');
-@define('TOGGLE_ALL', 'Développer tous les menus');
-@define('TOGGLE_OPTION', 'Développer ce menu');
-@define('SUBSCRIBE_TO_THIS_ENTRY', 'S\'inscrire à cette news');
+@define('REALLY_SCALE_IMAGE', 'Réellement redimensionner l\'image? Attention: cette opération est irréversible!');
+@define('TOGGLE_ALL', 'Afficher/Ne pas afficher les détails');
+@define('TOGGLE_OPTION', 'Afficher les détails');
+@define('SUBSCRIBE_TO_THIS_ENTRY', 'Souscrire à ce billet');
 @define('UNSUBSCRIBE_OK', "%s est maintenant désinscrit de cette news");
-@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Nouveau commentaire à votre inscription de news "%s"');
-@define('SUBSCRIPTION_MAIL', "Bonjour %s,\n\nUn nouveau commentaire a été posté dans la news que vous surveillez \"%s\", intitulé \"%s\"\nLe pseudo du posteur est: %s\n\nVous pouvez trouver la news ici: %s\n\nVous pouvez vous désinscrire en cliquant sur ce lien: %s\n");
-@define('SUBSCRIPTION_TRACKBACK_MAIL', "Bonjour %s,\n\nUn nouveau suivi a été enregistré dans la news que vous surveillez \"%s\", intitulé \"%s\"\nLe pseudo du posteur est: %s\n\nVous pouvez trouver la news ici: %s\n\nVous pouvez vous désinscrire en cliquant sur ce lien: %s\n");
-@define('SIGNATURE', "\n-- \n%s existe grâce à Serendipity.\nLe blog des blog, que vous pouvez aussi utiliser!.\nAllez sur <http://s9y.org> le site officiel.");
-@define('DATABASE_ALREADY_INSTALLED', 'PASSE: La base de données est déjà installée');
+@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Nouveau commentaire posté à votre souscription du billet "%s"');
+@define('SUBSCRIPTION_MAIL', "Bonjour %s,\n\nUn nouveau commentaire a été posté au billet que vous surveillez \"%s\", intitulé \"%s\"\nLe pseudo de l\'auteur est: %s\n\nVous pouvez trouver le billet ici: %s\n\nVous pouvez vous désinscrire en cliquant sur ce lien: %s\n");
+@define('SUBSCRIPTION_TRACKBACK_MAIL', "Bonjour %s,\n\nUn nouveau suivi a été ajouté au billet que vous surveillez \"%s\", intitulé \"%s\"\nLe pseudo de l\'auteur est: %s\n\nVous pouvez trouver le billet ici: %s\n\nVous pouvez vous désinscrire en cliquant sur ce lien: %s\n");
+@define('SIGNATURE', "\n-- \n%s est propulsé par Serendipity.\nLe blog des blogs que vous aussi pouvez utiliser!.\nAllez sur <http://s9y.org>, le site officiel.");
+@define('DATABASE_ALREADY_INSTALLED', 'IGNORÉ: la base de données est déjà configurée.');
 @define('SYNDICATION_PLUGIN_091', 'RSS 0.91');
 @define('SYNDICATION_PLUGIN_10', 'RSS 1.0');
 @define('SYNDICATION_PLUGIN_20', 'RSS 2.0');
 @define('SYNDICATION_PLUGIN_20c', 'Commentaires RSS 2.0');
 @define('SYNDICATION_PLUGIN_ATOM03', 'ATOM 0.3');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s');
-@define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Champ "EditeurAdministration"');
-@define('SYNDICATION_PLUGIN_WEBMASTER',  'Champ "Webmaster"');
-@define('SYNDICATION_PLUGIN_BANNERURL', 'Image pour les liens RSS');
-@define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Largeur de l\'image');
-@define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Hauteur de l\'image');
-@define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'Adresse E-Mail du webmaster, si disponible. (vide: caché) [RSS 2.0]');
-@define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', 'Adresse E-Mail de l\'éditeur d\'administration, si disponible. (vide: caché) [RSS 2.0]');
-@define('SYNDICATION_PLUGIN_BANNERURL_DESC', 'URL d\'une image au format GIF/JPEG/PNG, si disponible. (vide: logo serendipity)');
-@define('SYNDICATION_PLUGIN_BANNERWIDTH_DESC', 'En pixels, max.144');
-@define('SYNDICATION_PLUGIN_BANNERHEIGHT_DESC', 'En pixels, max. 400');
-@define('SYNDICATION_PLUGIN_TTL', 'Champ "ttl" (temps-réel)');
-@define('SYNDICATION_PLUGIN_TTL_DESC', 'Temps en minutes après lequel votre blog ne devrait pas être caché des autres programmes/sites (vide: caché) [RSS 2.0]');
-@define('SYNDICATION_PLUGIN_PUBDATE', 'Champ "pubDate"');
-@define('SYNDICATION_PLUGIN_PUBDATE_DESC', 'Est ce que le champ "pubDate"-doit être relu régulièrement pour un channel RSS, pour montrer la date de la dernière news?');
+@define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Champs "managingEditor"');
+@define('SYNDICATION_PLUGIN_WEBMASTER',  'Champs "webMaster"');
+@define('SYNDICATION_PLUGIN_BANNERURL', 'Image pour le fil RSS');
+@define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Largeur d\'image');
+@define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Hauteur d\'image');
+@define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'Adresse E-Mail du webmaster, si disponible. (aucun: invisible) [RSS 2.0]');
+@define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', 'Adresse E-Mail de l\'éditeur principal, si disponible. (aucun: invisible) [RSS 2.0]');
+@define('SYNDICATION_PLUGIN_BANNERURL_DESC', 'Adresse d\'une image au format GIF/JPEG/PNG, si disponible. (aucune: logo serendipity)');
+@define('SYNDICATION_PLUGIN_BANNERWIDTH_DESC', 'en pixels, maximum 144');
+@define('SYNDICATION_PLUGIN_BANNERHEIGHT_DESC', 'en pixels, maximum 400');
+@define('SYNDICATION_PLUGIN_TTL', 'Champs "ttl" (time-to-live = temps à vivre)');
+@define('SYNDICATION_PLUGIN_TTL_DESC', 'Laps de temps en minutes après lequel votre blog ne doit plus être pris du cache par des sites/programmes externes (aucun: invisible) [RSS 2.0]');
+@define('SYNDICATION_PLUGIN_PUBDATE', 'Champs "pubDate"');
+@define('SYNDICATION_PLUGIN_PUBDATE_DESC', 'Inclure le champs "pubDate" dans le fil RSS pour afficher la date de l\'entrée la plus récente?');
 @define('CONTENT', 'Contenu');
 @define('TYPE', 'Type');
-@define('DRAFT', 'Programmer');
-@define('PUBLISH', 'Publier');
-@define('PREVIEW', 'Prévisualiser');
+@define('DRAFT', 'Brouillon');
+@define('PUBLISH', 'Publication');
+@define('PREVIEW', 'Prévisualisation');
 @define('DATE', 'Date');
 @define('DATE_FORMAT_2', 'Y-m-d H:i'); // Needs to be ISO 8601 compliant for date conversion!
-@define('DATE_INVALID', 'Attention: La date entrée est invalide. Elle doit être donnée au format YYYY-MM-DD HH:MM .');
-@define('CATEGORY_PLUGIN_DESC', 'Montrer la liste des catégories.');
+@define('DATE_INVALID', 'Attention: La date entrée est invalide. Elle doit être au format YYYY-MM-DD HH:MM .');
+@define('CATEGORY_PLUGIN_DESC', 'Affiche la liste des catégories.');
 @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('CATEGORIES_TO_FETCH', 'Catégories à afficher');
+@define('CATEGORIES_TO_FETCH_DESC', 'Afficher les catégories par auteur(s) spécifique(s)');
 @define('PREVIOUS_PAGE', 'Page précédente');
 @define('NEXT_PAGE', 'Page suivante');
 @define('ALL_CATEGORIES', 'Toutes les catégories');
-@define('DO_MARKUP', 'Transformations de code');
-@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('DO_MARKUP', 'Transformation de balises dans le texte');
+@define('DO_MARKUP_DESCRIPTION', 'Transforme les balises dans le texte (smileys, raccourcis via *, /, _, ...). La 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('ERROR_TEMPLATE_FILE', 'Impossible d\'ouvrir le fichier du thème, merci de mettre Serendipity à jour!');
+@define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Le format dans lequel la date des billets doit être affichée. Toute syntaxe permise par la fonction PHP <a href="http://www.php.net/strftime" target="blank">strftime()</a> est possible. (Défaut: "%s")');
+@define('ERROR_TEMPLATE_FILE', 'Impossible d\'ouvrir le fichier du thème, merci de mettre à jour Serendipity!');
 @define('ADVANCED_OPTIONS', 'Options avancées');
-@define('EDIT_ENTRY', 'Editer les news');
-@define('HTACCESS_ERROR', 'Pour vérifier votre installation locale de serveur web, serendipity doit être autorisé à réécrire le fichier ".htaccess". Cela n\'a pas pû être possible à cause d\'erreurs de permission. Merci d\'ajuster les permissions comme ceci: <br />&nbsp;&nbsp;%s<br />et rechargez cette page en pressant la touche "F5".');
-@define('SIDEBAR_PLUGINS', 'Plugins sur le côté');
-@define('EVENT_PLUGINS', 'Plugins d\'évènements');
+@define('EDIT_ENTRY', 'Éditer le billet');
+@define('HTACCESS_ERROR', 'Pour vérifier l\'installation de Serendipity sur votre serveur, Serendipity doit pouvoir créer le fichier ".htaccess". Ceci n\'a pas été possible car Serendipity n\'a pas les droits d\'accès suffisants dans ce répertoire. Vous pouvez ajuster les droits d\'accès avec la commande suivante: <br />&nbsp;&nbsp;%s<br />. Après, rechargez cette page avec la touche "F5".');
+@define('SIDEBAR_PLUGINS', 'Plugins pour la barre latérale');
+@define('EVENT_PLUGINS', 'Plugins d\'évènement');
 @define('SORT_ORDER', 'Trier par ordre');
 @define('SORT_ORDER_NAME', 'Nom du fichier');
 @define('SORT_ORDER_EXTENSION', 'Extension du fichier');
@@ -285,125 +290,155 @@
 @define('SORT_ORDER_WIDTH', 'Largeur de l\'image');
 @define('SORT_ORDER_HEIGHT', 'Hauteur de l\'image');
 @define('SORT_ORDER_DATE', 'Date de l\'upload');
-@define('SORT_ORDER_ASC', 'Ascendant');
-@define('SORT_ORDER_DESC', 'Descendant');
-@define('THUMBNAIL_SHORT', 'Aperçu');
+@define('SORT_ORDER_ASC', 'Croissant');
+@define('SORT_ORDER_DESC', 'Décroissant' );
+@define('THUMBNAIL_SHORT', 'Miniature');
 @define('ORIGINAL_SHORT', 'Orig.');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prévenir les liens HTTP cachés');
-@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', 'Appliquer la marque à %s');
+@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Empêcher les liens HTTP d\'être cachés');
+@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Si activé avec "true", ceci va suggérer que le lien vers votre fil RSS ne permet pas d\'utiliser le cache des requêtes de fil RSS. Il est recommandé de le désactiver avec "false".');
+@define('APPLY_MARKUP_TO', 'Appliquer la transformation des balises à %s');
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Début de la semaine');
-@define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity a détecté que votre configuration est actuellement installée en version %s, et Serendipity lui même est installé en version %s, vous devez le mettre à jour! <a href="%s">Cliquez ici</a>');
-@define('SERENDIPITY_UPGRADER_WELCOME', 'Bonjour, et bienvenue dans l\'agent de mise à jour de Serendipity.');
-@define('SERENDIPITY_UPGRADER_PURPOSE', 'Je suis ici pour vous aider à mettre à jour votre installation %s de Serendipity.');
-@define('SERENDIPITY_UPGRADER_WHY', 'Vous voyez ce message car vous avez juste installé Serendipity %s, mais vous n\'avez pas encore mis à jour la base de données pour ladite version');
+@define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity a détecté que votre configuration (version %s) ne correspond pas à la version de votre installation de Serendipity (version %s). Pour continuer à utiliser Serendipity, l\'assistant de mise à jour va vous guider pour <a href="%s">mettre à jour</a> votre installation.');
+@define('SERENDIPITY_UPGRADER_WELCOME', 'Bonjour, et bienvenue dans l\'assistant de mise à jour de Serendipity.');
+@define('SERENDIPITY_UPGRADER_PURPOSE', 'Je vais vous guider pour la mise à jour de votre installation %s de Serendipity.');
+@define('SERENDIPITY_UPGRADER_WHY', 'Vous voyez ce message car vous avez installé Serendipity %s, mais la base de données doit être reconfigurée pour fonctionner correctement avec cette version.');
 @define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Mises à jour de la base de données (%s)');
-@define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'J\'ai trouvé le fichier .sql qui a besoin d\'être lancé avant de continuer l\'opération en cours de Serendipity');
-@define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Tâche spécifiques à la version');
-@define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'Aucune tâches spécifiques à la version n\'ont été trouvées');
-@define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', 'Voulez vous que je réalise les tâches suivantes?');
+@define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'Pour mettre à jour votre base de données, j\'ai trouvé les fichiers .sql suivants qui doivent être importés:');
+@define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Tâches spécifiques à la version');
+@define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'Aucune tâche spécifique à la nouvelle version n\'a été trouvée');
+@define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', 'Voulez-vous que j\'effectue les tâches suivantes?');
 @define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'Non, je vais le faire manuellement');
-@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Oui, faites le s\'il vous plait');
-@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'Il apparait que vous n\'avez besoin d\'aucune mise à jour pour fonctionner');
-@define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Considérez Serendipity comme mis à jour');
-@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Vous avez ignoré la mise à jour de Serendipity, merci de vérifier que votre base de données est installée correctement, et les fonctions planifiées s\'éxecuteront');
-@define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Votre installation de Serendipity est maintenant mise à jour à la version %s');
-@define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Vous pouvez retourner sur votre blog en %scliquant ici%s');
+@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Oui, faites-le s\'il vous plait');
+@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'Une mise à jour n\'est pas nécessaire pour votre installation de Serendipity, il n\'y a pas de tâches à effectuer.');
+@define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Considérez Serendipity comme mis à jour.');
+@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Vous avez ignoré la mise à jour de Serendipity, assurez-vous que la base de données est installée correctement, et que les tâches nécessaires sont effectuées.');
+@define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Votre installation de Serendipity a été mise à jour à la version %s.');
+@define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Vous pouvez retourner à votre blog en %scliquant ici%s');
 @define('MANAGE_USERS', 'Administrer les utilisateurs');
-@define('EDIT_USERS', 'Editer les utilisateurs');
+@define('EDIT_USERS', 'Éditer les utilisateurs');
 @define('CREATE_USERS', 'Créer des utilisateurs');
 @define('CREATE_NEW_USER', 'Créer un nouvel utilisateur');
-@define('CREATE_NOT_AUTHORIZED', 'Vous ne pouvez pas modifier les utilisateurs puisque vous avez le même niveau qu\'eux');
-@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Vous ne pouvez pas modifier les utilisateurs puisqu\'ils ont un niveau plus élevé que le vôtre');
+@define('CREATE_NOT_AUTHORIZED', 'Vous ne pouvez pas éditer des utilisateurs qui ont le même niveau d\'autorisation que le vôtre.');
+@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Vous ne pouvez pas créer d\'utilisateur avec un niveau d\'autorisation plus élevé que le vôtre.');
 @define('CREATED_USER', 'Un nouvel utilisateur %s a été crée');
 @define('MODIFIED_USER', 'Les propriétés de l\'utilisateur %s ont été changées');
-@define('USER_LEVEL', 'Niveau d\'utilisateur');
-@define('DELETE_USER', 'Vous allez supprimer l\'utilisateur #%d %s. Etes vous sérieux? Cela empêchera toute visualisation de ses news sur la page principale.');
+@define('USER_SELF_INFO', 'authentifié comme %s, niveau d\'autorisation %s');
+@define('USER_LEVEL', 'Niveau d\'autorisation');
+@define('DELETE_USER', 'Vous êtes sur le point de supprimer l\'utilisateur #%d %s. Êtes-vous sûr de vouloir continuer? Les billets de cet utilisateur ne seront plus visibles dans votre blog.');
 @define('DELETED_USER', 'Utilisateur #%d %s supprimé.');
+@define('LIMIT_TO_NUMBER', 'Limiter le nombre de billets à?');
+@define('FILTER', 'Filtre');
+@define('ENTRIES_PER_PAGE', 'billets par page');
+@define('XML_IMAGE_TO_DISPLAY', 'Bouton "XML"');
+@define('XML_IMAGE_TO_DISPLAY_DESC','Les liens vers les fils XML seront affichés avec cette image. Laisser vide pour l\'image par défaut, ou tapez \'none\' pour la désactiver.');
+
+@define('DIRECTORIES_AVAILABLE', 'Dans la liste des sous-dossiers disponibles, vous pouvez cliquer sur un nom de dossier pour en créer un nouveau à cet endroit.');
+@define('ALL_DIRECTORIES', 'tous les dossiers');
+@define('MANAGE_DIRECTORIES', 'Administrer les dossiers');
+@define('DIRECTORY_CREATED', 'Le dossier <strong>%s</strong> a été crée.');
+@define('NEW_DIRECTORY', 'Créer un nouveau dossier');
+@define('PARENT_DIRECTORY', 'Dossier parent');
+@define('DELETE_DIRECTORY', 'Supprimer ce dossier');
+@define('CONFIRM_DELETE_DIRECTORY', 'Êtes-vous sûr de vouloir supprimer tous les contenus du dossier %s?');
+@define('ERROR_NO_DIRECTORY', 'Erreur: Le dossier %s n\'existe pas');
+@define('FORCE_DELETE', 'Forcer la suppression de fichiers non inclus dans la médiathèque');
+@define('CHECKING_DIRECTORY', 'Vérification des fichiers dans le dossier %s');
+@define('DELETING_FILE', 'Suppression du fichier %s...');
+@define('ERROR_DIRECTORY_NOT_EMPTY', 'Impossible de supprimer un dossier non vide. Cochez la case "Forcer la suppression" si vous voulez supprimer les fichiers gênants, et puis effectuez l\'opération à nouveau. Les fichiers présents dans le dossier sont les suivants:');
+@define('DIRECTORY_DELETE_FAILED', 'La suppression du dossier %s a échoué. Vérifiez les droits d\'accès au répertoire et les messages ci-dessus.');
+@define('DIRECTORY_DELETE_SUCCESS', 'Suppression du dossier %s effectuée.');
+@define('SKIPPING_FILE_EXTENSION', 'Fichier ignoré: Pas d\'extension de fichier dans %s.');
+@define('SKIPPING_FILE_UNREADABLE', 'Fichier ignoré: impossible de lire à partir du fichier %s .');
+@define('FOUND_FILE', 'Fichier nouveau/modifié trouvé: %s.');
+@define('ALREADY_SUBCATEGORY', '%s est déjà une sous-catégorie de %s.');
+@define('PARENT_CATEGORY', 'Catégorie parent');
+@define('REPLY', 'Réponse');
+@define('IN_REPLY_TO', 'En réponse à');
+@define('TOP_LEVEL', 'Racine');
 
 /* DATABASE SETTINGS */
-@define('INSTALL_CAT_DB', 'Database settings');
-@define('INSTALL_CAT_DB_DESC', 'Here you can enter all your database information. Serendipity needs this to be able to function');
-@define('INSTALL_DBTYPE', 'Database type');
-@define('INSTALL_DBTYPE_DESC', 'Database type');
-@define('INSTALL_DBHOST', 'Database host');
-@define('INSTALL_DBHOST_DESC', 'The hostname for your database');
-@define('INSTALL_DBUSER', 'Database user');
-@define('INSTALL_DBUSER_DESC', 'The username used to connect to your database');
-@define('INSTALL_DBPASS', 'Database password');
-@define('INSTALL_DBPASS_DESC', 'The password matching the above username');
-@define('INSTALL_DBNAME', 'Database name');
-@define('INSTALL_DBNAME_DESC', 'The name of your datbase');
-@define('INSTALL_DBPREFIX', 'Database table prefix');
-@define('INSTALL_DBPREFIX_DESC', 'Prefix for the table names, i.e. serendipity_');
+@define('INSTALL_CAT_DB', 'Configuration de la base de données');
+@define('INSTALL_CAT_DB_DESC', 'Vous permet d\'entrer toutes les données nécessaires pour la base données dont Serendipity a besoin pour fonctionner.');
+@define('INSTALL_DBTYPE', 'Type de base de données');
+@define('INSTALL_DBTYPE_DESC', 'Choisissez le type de votre base de données');
+@define('INSTALL_DBHOST', 'Serveur hôte');
+@define('INSTALL_DBHOST_DESC', 'Le nom du serveur hôte sur lequel réside la base de données (exemple: localhost)');
+@define('INSTALL_DBUSER', 'Nom d\'utilisateur');
+@define('INSTALL_DBUSER_DESC', 'Le nom d\'utilisateur à utiliser pour se connecter à la base de données');
+@define('INSTALL_DBPASS', 'Mot de passe');
+@define('INSTALL_DBPASS_DESC', 'Le mot de passe correspondant au nom d\'utilisateur');
+@define('INSTALL_DBNAME', 'Nom de la base de données');
+@define('INSTALL_DBNAME_DESC', 'Le nom de la base de données à laquelle Serendipity doit se connecter');
+@define('INSTALL_DBPREFIX', 'Préfixe des tables');
+@define('INSTALL_DBPREFIX_DESC', 'Le préfixe à utiliser pour les tables de Serendipity (exemple: serendipity_)');
 
 /* PATHS */
-@define('INSTALL_CAT_PATHS', 'Paths');
-@define('INSTALL_CAT_PATHS_DESC', 'Various paths to different essential folders and files. Don\'t forget trailing slashes for directories!');
-@define('INSTALL_FULLPATH', 'Full path');
-@define('INSTALL_FULLPATH_DESC', 'The full and absolute path to your serendipity installation');
-@define('INSTALL_UPLOADPATH', 'Upload path');
-@define('INSTALL_UPLOADPATH_DESC', 'All uploads will go here, relative to the \'Full path\' - typically \'uploads/\'');
-@define('INSTALL_RELPATH', 'Relative path');
-@define('INSTALL_RELPATH_DESC', 'Path to serendipity for your browser, typically \'/serendipity/\'');
-@define('INSTALL_RELTEMPLPATH', 'Relative template path');
-@define('INSTALL_RELTEMPLPATH_DESC', 'The path to the folder containing your templates - Relative to the \'relative path\'');
-@define('INSTALL_RELUPLOADPATH', 'Relative upload path');
-@define('INSTALL_RELUPLOADPATH_DESC', 'Path to your uploads for browsers - Relative to the \'relative path\'');
-@define('INSTALL_URL', 'URL to blog');
-@define('INSTALL_URL_DESC', 'Base URL to your serendipity installation');
-@define('INSTALL_INDEXFILE', 'Index file');
-@define('INSTALL_INDEXFILE_DESC', 'The name of your serendipity index file');
+@define('INSTALL_CAT_PATHS', 'Chemins');
+@define('INSTALL_CAT_PATHS_DESC', 'Configuration des chemins aux dossiers et fichiers indispensables. N\'oubliez pas d\'ajouter les slashes ("/") finaux!');
+@define('INSTALL_FULLPATH', 'Chemin absolu');
+@define('INSTALL_FULLPATH_DESC', 'Le chemin complet et absolu du dossier d\'installation de Serendipity');
+@define('INSTALL_UPLOADPATH', 'Chemin pour les uploads');
+@define('INSTALL_UPLOADPATH_DESC', 'C\'est ici que Serendipity enregistre tous les fichiers uploadés. Chemin relatif au \'chemin absolu\' - normalement \'uploads/\'');
+@define('INSTALL_RELPATH', 'Chemin relatif');
+@define('INSTALL_RELPATH_DESC', 'Le chemin d\'accès à Serendipity pour votre navigateur, normalement \'/serendipity/\'');
+@define('INSTALL_RELTEMPLPATH', 'Chemin relatif des thèmes');
+@define('INSTALL_RELTEMPLPATH_DESC', 'Le chemin au dossier contenant vos thèmes - relatif au \'Chemin relatif\'');
+@define('INSTALL_RELUPLOADPATH', 'Chemin relatif des uploads');
+@define('INSTALL_RELUPLOADPATH_DESC', 'Le chemin d\'accès aux fichiers uploadés pour votre navigateur - relatif au \'Chemin relatif\'');
+@define('INSTALL_URL', 'Lien au blog');
+@define('INSTALL_URL_DESC', 'Le lien (URL) pour accéder à votre installation de Serendipity');
+@define('INSTALL_INDEXFILE', 'Script principal');
+@define('INSTALL_INDEXFILE_DESC', 'Le nom du script principal que vous voulez utiliser pour Serendipity (exemple: index.php)');
 
-/* Generel settings */
-@define('INSTALL_CAT_SETTINGS', 'General settings');
-@define('INSTALL_CAT_SETTINGS_DESC', 'Customize how Serendipity behaves');
-@define('INSTALL_USERNAME', 'Admin username');
-@define('INSTALL_USERNAME_DESC', 'Username for admin login');
-@define('INSTALL_PASSWORD', 'Admin password');
-@define('INSTALL_PASSWORD_DESC', 'Password for admin login');
-@define('INSTALL_EMAIL', 'Admin email');
-@define('INSTALL_EMAIL_DESC', 'Email for the blog administrator');
-@define('INSTALL_SENDMAIL', 'Send mails to admin?');
-@define('INSTALL_SENDMAIL_DESC', 'Do you want to receive emails when comments are posted to your entries?');
-@define('INSTALL_SUBSCRIBE', 'Allow users to subscribe to entries?');
-@define('INSTALL_SUBSCRIBE_DESC', 'Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry');
-@define('INSTALL_BLOGNAME', 'Blog name');
-@define('INSTALL_BLOGNAME_DESC', 'The title of your blog');
-@define('INSTALL_BLOGDESC', 'Blog description');
-@define('INSTALL_BLOGDESC_DESC', 'Description of your blog');
-@define('INSTALL_LANG', 'Language');
-@define('INSTALL_LANG_DESC', 'Select the language for your blog');
+/* General settings */
+@define('INSTALL_CAT_SETTINGS', 'Configuration générale');
+@define('INSTALL_CAT_SETTINGS_DESC', 'Personnalisation et configuration générale de Serendipity');
+@define('INSTALL_USERNAME', 'Nom de l\'administrateur');
+@define('INSTALL_USERNAME_DESC', 'Le nom d\'utilisateur pour l\'accès de l\'administrateur');
+@define('INSTALL_PASSWORD', 'Mot de passe l\'administrateur');
+@define('INSTALL_PASSWORD_DESC', 'Le mot de passe pour l\'accès de l\'administrateur');
+@define('INSTALL_EMAIL', 'Email de l\'administrateur');
+@define('INSTALL_EMAIL_DESC', 'Adresse Email à utiliser pour l\'administrateur du blog');
+@define('INSTALL_SENDMAIL', 'Envoi d\'emails à l\'administrateur?');
+@define('INSTALL_SENDMAIL_DESC', 'Voulez-vous que l\'administrateur reçoive un email quand des commentaires sont postés dans les billets?');
+@define('INSTALL_SUBSCRIBE', 'Autoriser les utilisateurs de suivre des billets?');
+@define('INSTALL_SUBSCRIBE_DESC', 'Donner aux utilisateurs la possibilité de souscrire à un billet, et ainsi recevoir des emails quand des commentaires sont postés dans celui-ci?');
+@define('INSTALL_BLOGNAME', 'Titre du blog');
+@define('INSTALL_BLOGNAME_DESC', 'Le titre de votre blog');
+@define('INSTALL_BLOGDESC', 'Description de votre blog');
+@define('INSTALL_BLOGDESC_DESC', 'La description de votre blog');
+@define('INSTALL_LANG', 'Langue');
+@define('INSTALL_LANG_DESC', 'Choisissez la langue à utiliser pour votre blog. Celle-ci sera utilisée dans le blog et l\'interface d\'administration.');
 
 /* Appearance and options */
-@define('INSTALL_CAT_DISPLAY', 'Appearance and options');
-@define('INSTALL_CAT_DISPLAY_DESC', 'Customize how Serendipity looks and feels');
-@define('INSTALL_EXTERNALSTYLE', 'External Stylesheet');
-@define('INSTALL_EXTERNALSTYLE_DESC', 'You can define a stylesheet URI here, aditionally to the settings adjustable in the admin interface (enter \'none\' if you don\'t need this)');
-@define('INSTALL_WYSIWYG', 'Use WYSIWYG editor');
-@define('INSTALL_WYSIWYG_DESC', 'Do you want to use the WYSIWYG editor? (Works on IE5+, partially in Mozilla 1.3+)');
-@define('INSTALL_XHTML11', 'Force XHTML 1.1 compliance');
-@define('INSTALL_XHTML11_DESC', 'Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)');
-@define('INSTALL_POPUP', 'Enable use of popup windows');
-@define('INSTALL_POPUP_DESC', 'Do you want to use the blog to use popup windows for comments, trackbacks et al?');
-@define('INSTALL_EMBED', 'Is serendipity embedded?');
-@define('INSTALL_EMBED_DESC', 'If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!');
-@define('INSTALL_BLOCKREF', 'Blocked Referers');
-@define('INSTALL_BLOCKREF_DESC', 'Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with \';\' and note that the host is blocked by substring matches!');
-@define('INSTALL_REWRITE', 'URL Rewriting');
-@define('INSTALL_REWRITE_DESC', 'Select which rules you wish to use when generating URLs. Enabling rewrite rules will make pretty URLs for your blog and make it better indexable for spiders like google. The webserver needs to support either mod_rewrite or "AllowOverride All" for your serendipity dir. The default setting is auto-detected');
+@define('INSTALL_CAT_DISPLAY', 'Apparence et options');
+@define('INSTALL_CAT_DISPLAY_DESC', 'Personnalisation du \'look &amp; feel\' de l\'interface du blog.');
+@define('INSTALL_EXTERNALSTYLE', 'Feuille de style externe');
+@define('INSTALL_EXTERNALSTYLE_DESC', 'Vous pouvez entrer un lien vers une feuille de style externe, qui sera utilisée en plus des réglages que vous pouvez faire dans l\'interface d\'administration. (tapez \'none\' si vous ne voulez pas en utiliser)');
+@define('INSTALL_WYSIWYG', 'Utiliser l\'éditeur WYSIWYG');
+@define('INSTALL_WYSIWYG_DESC', 'Voulez-vous utiliser l\'éditeur WYSIWYG pour composer vos billets? (Fonctionne avec IE5+, et partiellement avec Mozilla 1.3+)');
+@define('INSTALL_XHTML11', 'Forcer la conformité XHTML 1.1');
+@define('INSTALL_XHTML11_DESC', 'Voulez-vous forcer la conformité au standard XHTML 1.1 (peut causer des problèmes au niveau de l\'administration et du blog dans les navigateurs plus anciens de la 4ème génération)');
+@define('INSTALL_POPUP', 'Activer les fenêtres pop-pup');
+@define('INSTALL_POPUP_DESC', 'Voulez-vous que le blog utilise des fenêtres pop-up pour les commentaires, traçages et autres?');
+@define('INSTALL_EMBED', 'Intégration dans une application externe');
+@define('INSTALL_EMBED_DESC', 'Si vous voulez intégrer Serendipity dans une page normale ou dans une application externe, choisissez \'Oui\'. Serendipity n\'affichera alors que les contenus du blog, vous permettant de les intégrer facilement dans n\'importe-quelle page. Vous pouvez aussi utiliser l\'option \'Script principal\' pour créer un encapsulateur (wrapper) qui vous permettra d\'ajouter vos propres contenus et visuel. Pour plus d\'informations sur l\'intégration de Serendipity, consultez le fichier README fourni dans l\'installation.');
+@define('INSTALL_BLOCKREF', 'Exclure des pages référantes');
+@define('INSTALL_BLOCKREF_DESC', 'Vous pouvez exclure des noms de domaine spécifiques de la liste des pages référantes: séparez chaque nom de domaine avec \';\', et notez que l\'exclusion du nom de domaine se fait par la fonction <a href="http://www.php.net/substring" target="_blank">substring()</a>.');
+@define('INSTALL_REWRITE', 'Réecritures URL');
+@define('INSTALL_REWRITE_DESC', 'Choisissez la méthode à utiliser pour la gestion des URL de votre blog. Si vous activez les réecritures URL, l\'accès à votre blog se fera par des URL simples, plus facilement indexables par les moteurs de recherche. Pour les activer, le module mod_rewrite doit être activé dans votre serveur, ou il doit autoriser l\'utilisation de la directive "AllowOverride All" pour le dossier d\'installation de Serendipity. Par défaut Serendipity choisit automatiquement l\'option à utiliser.');
 
 /* Imageconversion Settings */
-@define('INSTALL_CAT_IMAGECONV', 'Imageconversion Settings');
-@define('INSTALL_CAT_IMAGECONV_DESC', 'Enter general information about how serendipity should handle Images');
-@define('INSTALL_IMAGEMAGICK', 'Use Imagemagick');
-@define('INSTALL_IMAGEMAGICK_DESC', 'Do you have image magick installed and want to use it to resize images?');
-@define('INSTALL_IMAGEMAGICKPATH', 'Path to convert binary');
-@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Full path & name of your image magick convert binary');
-@define('INSTALL_THUMBSUFFIX', 'Thumbnail suffix');
-@define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails will be named with the following format: original.[suffix].ext');
-@define('INSTALL_THUMBWIDTH', 'Thumbnail dimensions');
-@define('INSTALL_THUMBWIDTH_DESC', 'Static maximum width of auto-generated thumbnails');
+@define('INSTALL_CAT_IMAGECONV', 'Options de gestion des images');
+@define('INSTALL_CAT_IMAGECONV_DESC', 'Définissez comment Serendipity doit gérer les transformations/conversions d\'images dans votre médiathèque.');
+@define('INSTALL_IMAGEMAGICK', 'Utiliser Imagemagick');
+@define('INSTALL_IMAGEMAGICK_DESC', 'Est-ce que imageMagick est installé sur votre serveur, et voulez-vous l\'utiliser pour le redimensionnement de vos images?');
+@define('INSTALL_IMAGEMAGICKPATH', 'Chemin d\'accès au programme de conversion');
+@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Chemin absolu et nom de votre programme de conversion de imageMagick (normalement \'convert\')');
+@define('INSTALL_THUMBSUFFIX', 'Suffixe pour les miniatures');
+@define('INSTALL_THUMBSUFFIX_DESC', 'Les miniatures d\'images seront enregistrées de la manière suivante:: original.[suffixe].ext');
+@define('INSTALL_THUMBWIDTH', 'Dimensions des miniatures');
+@define('INSTALL_THUMBWIDTH_DESC', 'Largeur maximum (statique) des miniatures crées automatiquement');
 
 /* Personal details */
 @define('USERCONF_CAT_PERSONAL', 'Détails personnels');
@@ -412,143 +447,111 @@
 @define('USERCONF_USERNAME_DESC', 'Votre nom d\'utilisateur');
 @define('USERCONF_PASSWORD', 'Votre mot de passe');
 @define('USERCONF_PASSWORD_DESC', 'Votre mot de passe');
-@define('USERCONF_USERLEVEL', 'Niveau d\'utilisateur');
-@define('USERCONF_USERLEVEL_DESC', 'Niveau de l\'utilisateur. Doit être l\'un des suivants: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Rédacteur en chef, [USERLEVEL_EDITOR] - Newser simple (pigiste).');
+@define('USERCONF_USERLEVEL', 'Niveau d\'autorisation');
+@define('USERCONF_USERLEVEL_DESC', 'Le niveau d\'autorisation de l\'utilisateur. Doit être l\'un des suivants: [USERLEVEL_ADMIN] - Administrateur, [USERLEVEL_CHIEF] - Rédacteur en chef, [USERLEVEL_EDITOR] - Posteur seulement.');
 @define('USERCONF_EMAIL', 'Votre E-Mail');
 @define('USERCONF_EMAIL_DESC', 'Votre E-Mail');
-@define('USERCONF_SENDCOMMENTS', 'Envoi des commentaires?');
-@define('USERCONF_SENDCOMMENTS_DESC', 'Voulez vous recevoir un mail lorsque quelqu\'un poste un commentaire dans votre news?');
-@define('USERCONF_SENDTRACKBACKS', 'Envoi des suivis?');
-@define('USERCONF_SENDTRACKBACKS_DESC', 'Voulez vous recevoir un mail lorsque quelqu\'un fait un suivi d\'une de vos news?');
+@define('USERCONF_SENDCOMMENTS', 'Notification de commentaire?');
+@define('USERCONF_SENDCOMMENTS_DESC', 'Voulez-vous recevoir un email lorsque quelqu\'un poste un commentaire dans votre billet?');
+@define('USERCONF_SENDTRACKBACKS', 'Notification de suivis?');
+@define('USERCONF_SENDTRACKBACKS_DESC', 'Voulez-vous recevoir un email lorsque quelqu\'un souscrit à l\'un de vos billets?');
 
 // TRANSLATE
 @define('PERMISSIONS', 'Permissions');
-@define('USERCONF_ALLOWPUBLISH', 'Rights: Publishing entries?');
-@define('USERCONF_ALLOWPUBLISH_DESC', 'Is this user allowed to publish entries?');
-@define('LIMIT_TO_NUMBER', 'How many items should be displayed?');
-@define('FILTER', 'Filter');
-@define('ENTRIES_PER_PAGE', 'entries per page');
-@define('USER_SELF_INFO', 'logged in as %s, level %s');
-@define('DIRECTORIES_AVAILABLE', 'In the list of available subdirectories you can click on any directory name to create a new directory within that structure.');
-@define('ALL_DIRECTORIES', 'all directories');
-@define('MANAGE_DIRECTORIES', 'Manage directories');
-@define('DIRECTORY_CREATED', 'Directory <strong>%s</strong> has been created.');
-@define('NEW_DIRECTORY', 'Create a new directory');
-@define('PARENT_DIRECTORY', 'Parent directory');
-@define('DELETE_DIRECTORY', 'Delete this directory');
-@define('CONFIRM_DELETE_DIRECTORY', 'Are you sure you want to remove all the contents of directory %s?');
-@define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
-@define('FORCE_DELETE', 'Force deletion of files not inside the media database');
-@define('CHECKING_DIRECTORY', 'Checking files in 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.');
-@define('DIRECTORY_DELETE_SUCCESS', 'Directory %s successfully deleted.');
-@define('SKIPPING_FILE_EXTENSION', 'Skipping file: Missing extension on %s.');
-@define('SKIPPING_FILE_UNREADABLE', 'Skipping file: %s not readable.');
-@define('FOUND_FILE', 'Found new/modified file: %s.');
-@define('NUMBER_FORMAT_DECIMALS', '2');
-@define('NUMBER_FORMAT_DECPOINT', '.');
-@define('NUMBER_FORMAT_THOUSANDS', ',');
-@define('ALREADY_SUBCATEGORY', '%s is a already a subcategory of %s.');
-@define('PARENT_CATEGORY', 'Parent category');
-@define('REPLY', 'Reply');
-@define('IN_REPLY_TO', 'In reply to');
-@define('TOP_LEVEL', 'Top level');
-@define('XML_IMAGE_TO_DISPLAY', 'XML Button');
-@define('XML_IMAGE_TO_DISPLAY_DESC','Links to XML Feeds will be displayed by this image. Leave empty for default, enter \'none\' to disable.');
-@define('ENTRY_SAVED', 'Your entry has been saved');
-@define('SUCCESS', 'Success');
-@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text');
-@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text');
-@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo');
-@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo');
-@define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?');
-@define('INSTALL_TOP_AS_LINKS_DESC', '"no": Exits and Referrers are shown as plain text to prevent google spam. "yes": Exits and Referrers are shown as hyperlinks. "default": Use setting from global configuration (recommended).'); // Translate
+@define('USERCONF_ALLOWPUBLISH', 'Publication de billets?');
+@define('USERCONF_ALLOWPUBLISH_DESC', 'Cet utilisateur est-il autorisé à poster des billets?');
+@define('ENTRY_SAVED', 'Votre billet a été enregistré');
+@define('SUCCESS', 'Succès');
+@define('POWERED_BY_SHOW_TEXT', 'Afficher \'Serendipity\' en tant que texte');
+@define('POWERED_BY_SHOW_TEXT_DESC', 'Affiche le slogan \'Serendipity Weblog\' en tant que texte');
+@define('POWERED_BY_SHOW_IMAGE', 'Afficher \'Serendipity\' avec un logo');
+@define('POWERED_BY_SHOW_IMAGE_DESC', 'Affiche le logo Serendipity');
+@define('INSTALL_TOP_AS_LINKS', 'Afficher le top pages sortantes / référantes en tant que liens?');
+@define('INSTALL_TOP_AS_LINKS_DESC', '\'Non\': affichage en tant que texte seulement pour prévenir le spam par Google. \'Oui\': affichage en tant que liens. Par défaut, l\'option de la configuration générale est utilisée.');
 
 /* TRANSLATE */
-@define('SETTINGS_SAVED_AT', 'The new settings have been saved at %s');
-@define('PLUGIN_ITEM_DISPLAY', 'Where should the item be displayed?');
-@define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Extended entry only');
-@define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Overview page only');
-@define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times');
-@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.');
-@define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries');
-@define('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('COMMENTS_WILL_BE_MODERATED', 'Submitted comments will be subject to moderation before being displayed.'); // Translate
-@define('YOU_HAVE_THESE_OPTIONS', 'You have...
 
[truncated message content]

[php-blog-cvs] serendipity/sql db_update_0.6.8_0.6.9_postgres.sql,1.2,1.3

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

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

Modified Files:
	db_update_0.6.8_0.6.9_postgres.sql 
Log Message:
one more pgsql fix


Index: db_update_0.6.8_0.6.9_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.8_0.6.9_postgres.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db_update_0.6.8_0.6.9_postgres.sql	6 Sep 2004 09:15:32 -0000	1.2
+++ db_update_0.6.8_0.6.9_postgres.sql	6 Sep 2004 18:43:56 -0000	1.3
@@ -1,4 +1,4 @@
-ALTER TABLE {PREFIX}images ADD COLUMN oldmime varchar(15)
+ALTER TABLE {PREFIX}images ADD COLUMN oldmime varchar(15);
 UPDATE {PREFIX}images SET oldmime = mime;
 ALTER TABLE {PREFIX}images DROP mime;
 

[php-blog-cvs] serendipity/templates/default style.css,1.35,1.36

[Matthias L. <di...@us...>]

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

Modified Files:
	style.css 
Log Message:
Typo


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/style.css,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- style.css	2 Sep 2004 17:41:59 -0000	1.35
+++ style.css	6 Sep 2004 15:28:13 -0000	1.36
@@ -139,7 +139,7 @@
 .serendipity_date {
     font-family: Verdana, Arial, Geneva, Helvetica, sans-serif;
     font-size: large;
-    color: #333;
+    color: #333333;
     margin: 0;
     margin-top: 20px;
     text-align: right;

[php-blog-cvs] serendipity NEWS,1.211,1.212

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

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

Modified Files:
	NEWS 
Log Message:



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- NEWS	6 Sep 2004 09:15:31 -0000	1.211
+++ NEWS	6 Sep 2004 12:35:02 -0000	1.212
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed  "no entry to display" bug when previewing entry
+      (garvinhicking)
+
     * Fix several postgreSQL update errors. Thanks to daFool from the
       forums! (garvinhicking)
 

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.417,1.418

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
fixed buggy preview


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -d -r1.417 -r1.418
--- serendipity_functions.inc.php	6 Sep 2004 08:12:51 -0000	1.417
+++ serendipity_functions.inc.php	6 Sep 2004 12:34:08 -0000	1.418
@@ -1141,7 +1141,7 @@
 
     /* pre-walk the array to collect them keyed by date */
     $bydate = array();
-    if (!is_array($entries) || $entries[0] == false || $entries[0][0] == false) {
+    if (!is_array($entries) || $entries[0] == false || !isset($entries[0]['timestamp'])) {
         echo '<br />' . NO_ENTRIES_TO_PRINT . "\n";
         return;
     }

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.97,1.98

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

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

Modified Files:
	serendipity_lang_de.inc.php 
Log Message:
translations


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- serendipity_lang_de.inc.php	5 Sep 2004 19:56:57 -0000	1.97
+++ serendipity_lang_de.inc.php	6 Sep 2004 10:38:54 -0000	1.98
@@ -542,10 +542,10 @@
 @define('TRACKBACK_NO_DATA', 'URI enthielt keine Daten');
 @define('TRACKBACK_SIZE', 'URI ist größer als die erlaubten %s Bytes.');
 @define('VIEWMODE_THREADED', 'Als Baumstruktur anzeigen');
-@define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
-@define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
-@define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate
-@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>'); // Translate
+@define('COMMENTS_VIEWMODE_THREADED', 'Verschachtelt');
+@define('COMMENTS_VIEWMODE_LINEAR', 'Linear');
+@define('DISPLAY_COMMENTS_AS', 'Ansicht der Kommentare: ');
+@define('ADD_MEDIA_BLAHBLAH', '<b>Bild/Datei zur Sammlung hinzufügen:</b><p>Hier können Sie eine Datei (z.B. ein Bild) hochladen, oder mitteilen, von wo es geladen werden soll! Wenn das passende Bild fehlt, einfach bei Google danach suchen. Probieren Sie mal <a href="http://images.google.de" target="_blank">Googles Bildsuche</a>, die Resultate sind oft brauchbar, aber auf jeden Fall witzig :)<p><b>Methode wählen:</b><br>');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_config.inc.php,1.92,1.93

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
let's go beta!


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- serendipity_config.inc.php	5 Sep 2004 19:14:55 -0000	1.92
+++ serendipity_config.inc.php	6 Sep 2004 10:08:55 -0000	1.93
@@ -15,7 +15,7 @@
 
 include_once(S9Y_INCLUDE_PATH . 'compat.php');
 
-$serendipity['version']         = '0.6.12-CVS';
+$serendipity['version']         = '0.7-beta1';
 $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme
 $serendipity['production']      = 1;
 $serendipity['rewrite']         = 'none';

[php-blog-cvs] serendipity/plugins/serendipity_event_textwiki serendipity_event_textwiki.php,1.6,1.7

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

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

Modified Files:
	serendipity_event_textwiki.php 
Log Message:
Tobias Schlitts patch for wiki images.
Fixed tab-indenting.


Index: serendipity_event_textwiki.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_textwiki/serendipity_event_textwiki.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_event_textwiki.php	10 Jul 2004 08:24:14 -0000	1.6
+++ serendipity_event_textwiki.php	6 Sep 2004 09:26:28 -0000	1.7
@@ -14,455 +14,454 @@
         @define('PLUGIN_EVENT_TEXTWIKI_NAME',     'Markup: Wiki');
         @define('PLUGIN_EVENT_TEXTWIKI_DESC',     'Markup text using Text_Wiki');
         @define('PLUGIN_EVENT_TEXTWIKI_TRANSFORM', '<a href="http://c2.com/cgi/wiki">Wiki</a> format allowed');
-        
+
         break;
 }
 
 // Currently only english available
 
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PREFILETER', 'Converts different OS linebreaks (Unix/DOS) to unified format and concates lines ending with \. Default is on. Not recommended to switch off.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_DELIMITER', 'Converts the Text_Wiki internal delimiter "\xFF" (255) to avoid conflicts while parsing. Default is on. Not recommended to switch off.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_CODE', 'Marks text between <code> and </code> as code. Using <code type=".."> you can switch highlighting on (e.g. for PHP). Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PHPCODE', 'Marks and highlights text between <php> and </php> as PHP code and adds PHP open tags. Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_HTML', 'Allows you to use real HTML between <html> and </html>. Beware JS is possible, too! If you use this, switch of markup for comments! Default is off. Not recommended to switch on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_RAW', 'Text between `` and `` is not touched by other markup rules. Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_INCLUDE', 'Allows you to include and run PHP code with the syntax [[include /path/to/script.php]]. Resulting output is parsed by markup rules. Beware, security risk! If you use this, switch of markup for comments! Default is off. Not recommended to switch on.');
-            @define('PLUGIN_EVENT_TEXTWIKI_RULE_INCLUDE_DESC_BASE', 'The base directory to your scripts. Default this is set to "/path/to/scripts/". If you leave this blank and switch include on you can only use absolute pathes.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_HEADING', 'Lines starting with "+ " are marked as headlines (+ = <h1>, ++++++ = <h6>). Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_HORIZ', '---- is converted to a horizontal line (<hr>). Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_BREAK', 'Line endings marked with " _" define explicit linebreaks. Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_BLOCKQUOTE', 'Enables to use email style quoting ("> ", ">> ",...). Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_LIST', 'Allows creation of lists ("* " = undefined, "# " = numbered). Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_DEFLIST', 'Enables to create definition lists. Syntax: ": Topic : Definition". Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TABLE', 'Allows you to create tables. Only used for complete lines. Syntax: "|| Cell 1 || Cell 2 || Cell 3 ||". Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_EMBED', 'Allows you to include and run PHP code with the syntax [[embed /path/to/script.php]]. Resulting output is not parsed by markup rules. Beware, security risk! If you use this, switch of markup for comments! Default is off. Not recommended to switch on.');
-            @define('PLUGIN_EVENT_TEXTWIKI_RULE_EMBED_DESC_BASE', 'The base directory to your scripts. Default this is set to "/path/to/scripts/". If you leave this blank and switch embed on you can only use absolute pathes.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_IMAGE', 'Enables the inclusion of images. ([[image  /path/to/image.ext [HTML attributes] ]] or [[image  path/to/image.ext [link="PageName"] [HTML attributes] ]] for linkes images) Default is on.');
-            @define('PLUGIN_EVENT_TEXTWIKI_RULE_IMAGE_DESC_BASE', 'Base directory to your images. Default this is set to "/path/to/images". If you leave this blank you can only use absolute pathes or URLs.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PHPLOOKUP', 'Creates lookup links to the PHP manual with [[php function-name]]. Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TOC', 'Generates a table of contents over all used headlines with [[toc]]. Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_NEWLINE', 'Converts single newlines ("\n") to line breaks. Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_CENTER', 'Lines starting with "= " are centered. Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PARAGRAPH', 'Double newlines are converted to paragraphs (<p></p>). Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_URL', 'Normal converts http://example.com to links, [http://example.com] to footnotes and [http://example.com Example] to descriptive links. Default is on.');
-            @define('PLUGIN_EVENT_TEXTWIKI_RULE_URL_DESC_TARGET', 'Defines the target for your URLs. This is default set to "_blank", what is mostly feasible.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_FREELINK', 'Enables definition of non-standard wiki links using "((Non-standard link format))" and "((Non-standard link|Describtion))". Default is off.');
-            @define('PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_PAGES', 'The freelink rule (as well as the wikilink rule) must know, which pages exist and which have to be marked as "new". This specifies a file (local or remote) which has to contain 1 pagename per line. If the file is remote, it will be cached for the specified time.');
-			@define('PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_VIEWURL', 'This URL is specified to view the freelinks. You have to specify a "%s" inside this URL which will be replaced with the name of the freelink page.');
-			@define('PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_NEWURL', 'This URL is specified to create new freelinks. You have to specify a "%s" inside this URL which will be replaced with the name of the freelink page.');
-			@define('PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_NEWTEXT', 'This text will be added to undefined freelinks to link to the create page. Initially this is set to "?".');
-			@define('PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_CACHETIME', 'If you specify a remote file (URL) for your freelink pages, this file will be cached for as many seconds you specify here. Default is 1 hour.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_INTERWIKI', 'Allows inter wiki linking to MeatBal, Avagoto und Wiki using SiteName:PageName or [SiteName:PageName Show this text instead]. Default is on.');
-            @define('PLUGIN_EVENT_TEXTWIKI_RULE_INTERWIKI_DESC_TARGET', '');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_WIKILINK', 'Enables usage of standard WikiWords (2-X x uppercase) as wiki links. Default is off.');
-            @define('PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_PAGES', 'The wikilink rule must know, which pages exist and which have to be marked as "new". This specifies a file (local or remote) which has to contain 1 pagename per line. If the file is remote, it will be cached for the specified time.');
-			@define('PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_VIEWURL', 'This URL is specified to view the wikilinks. You have to specify a "%s" inside this URL which will be replaced with the name of the wikilink page.');
-			@define('PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_NEWURL', 'This URL is specified to create new wikilinks. You have to specify a "%s" inside this URL which will be replaced with the name of the wikilink page.');
-			@define('PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_NEWTEXT', 'This text will be added to undefined wikilinks to link to the create page. Initially this is set to "?".');
-			@define('PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_CACHETIME', 'If you specify a remote file (URL) for your wikilink pages, this file will be cached for as many seconds you specify here. Default is 1 hour.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_COLORTEXT', 'Colorize text using ##color|text##. Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_STRONG', '**Text** is marked strong. Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_BOLD', '\'\'\'Text\'\'\' is marked bold. Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_EMPHASIS', '//Text// is marked emphasised. Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_ITALIC', '\'\'Text\'\' is marked italic. Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TT', '{{Text}} is writen in teletext (monotype). Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_SUPERSCRIPT', '^^Text^^ is written in superscript. Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_REVISE', 'Enables marking texts as revisions using "@@---delete this text+++insert this text@@". Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TIGHTEN', 'Finds more than 3 newlines and reduces the to 2 newlines (paragraph). Default is on.');
-        @define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_ENTITIES', 'Escapes HTML entities. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PREFILETER', 'Converts different OS linebreaks (Unix/DOS) to unified format and concates lines ending with \. Default is on. Not recommended to switch off.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_DELIMITER', 'Converts the Text_Wiki internal delimiter "\xFF" (255) to avoid conflicts while parsing. Default is on. Not recommended to switch off.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_CODE', 'Marks text between <code> and </code> as code. Using <code type=".."> you can switch highlighting on (e.g. for PHP). Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PHPCODE', 'Marks and highlights text between <php> and </php> as PHP code and adds PHP open tags. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_HTML', 'Allows you to use real HTML between <html> and </html>. Beware JS is possible, too! If you use this, switch of markup for comments! Default is off. Not recommended to switch on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_RAW', 'Text between `` and `` is not touched by other markup rules. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_INCLUDE', 'Allows you to include and run PHP code with the syntax [[include /path/to/script.php]]. Resulting output is parsed by markup rules. Beware, security risk! If you use this, switch of markup for comments! Default is off. Not recommended to switch on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_INCLUDE_DESC_BASE', 'The base directory to your scripts. Default this is set to "/path/to/scripts/". If you leave this blank and switch include on you can only use absolute pathes.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_HEADING', 'Lines starting with "+ " are marked as headlines (+ = <h1>, ++++++ = <h6>). Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_HORIZ', '---- is converted to a horizontal line (<hr>). Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_BREAK', 'Line endings marked with " _" define explicit linebreaks. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_BLOCKQUOTE', 'Enables to use email style quoting ("> ", ">> ",...). Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_LIST', 'Allows creation of lists ("* " = undefined, "# " = numbered). Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_DEFLIST', 'Enables to create definition lists. Syntax: ": Topic : Definition". Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TABLE', 'Allows you to create tables. Only used for complete lines. Syntax: "|| Cell 1 || Cell 2 || Cell 3 ||". Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_EMBED', 'Allows you to include and run PHP code with the syntax [[embed /path/to/script.php]]. Resulting output is not parsed by markup rules. Beware, security risk! If you use this, switch of markup for comments! Default is off. Not recommended to switch on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_EMBED_DESC_BASE', 'The base directory to your scripts. Default this is set to "/path/to/scripts/". If you leave this blank and switch embed on you can only use absolute pathes.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_IMAGE', 'Enables the inclusion of images. ([[image  /path/to/image.ext [HTML attributes] ]] or [[image  path/to/image.ext [link="PageName"] [HTML attributes] ]] for linkes images) Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_IMAGE_DESC_BASE', 'Base directory to your images. Default this is set to "/path/to/images". If you leave this blank you can only use absolute pathes or URLs.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PHPLOOKUP', 'Creates lookup links to the PHP manual with [[php function-name]]. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TOC', 'Generates a table of contents over all used headlines with [[toc]]. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_NEWLINE', 'Converts single newlines ("\n") to line breaks. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_CENTER', 'Lines starting with "= " are centered. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PARAGRAPH', 'Double newlines are converted to paragraphs (<p></p>). Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_URL', 'Normal converts http://example.com to links, [http://example.com] to footnotes and [http://example.com Example] to descriptive links. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_URL_DESC_TARGET', 'Defines the target for your URLs. This is default set to "_blank", what is mostly feasible.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_FREELINK', 'Enables definition of non-standard wiki links using "((Non-standard link format))" and "((Non-standard link|Describtion))". Default is off.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_PAGES', 'The freelink rule (as well as the wikilink rule) must know, which pages exist and which have to be marked as "new". This specifies a file (local or remote) which has to contain 1 pagename per line. If the file is remote, it will be cached for the specified time.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_VIEWURL', 'This URL is specified to view the freelinks. You have to specify a "%s" inside this URL which will be replaced with the name of the freelink page.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_NEWURL', 'This URL is specified to create new freelinks. You have to specify a "%s" inside this URL which will be replaced with the name of the freelink page.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_NEWTEXT', 'This text will be added to undefined freelinks to link to the create page. Initially this is set to "?".');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_CACHETIME', 'If you specify a remote file (URL) for your freelink pages, this file will be cached for as many seconds you specify here. Default is 1 hour.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_INTERWIKI', 'Allows inter wiki linking to MeatBal, Avagoto und Wiki using SiteName:PageName or [SiteName:PageName Show this text instead]. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_INTERWIKI_DESC_TARGET', '');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_WIKILINK', 'Enables usage of standard WikiWords (2-X x uppercase) as wiki links. Default is off.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_PAGES', 'The wikilink rule must know, which pages exist and which have to be marked as "new". This specifies a file (local or remote) which has to contain 1 pagename per line. If the file is remote, it will be cached for the specified time.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_VIEWURL', 'This URL is specified to view the wikilinks. You have to specify a "%s" inside this URL which will be replaced with the name of the wikilink page.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_NEWURL', 'This URL is specified to create new wikilinks. You have to specify a "%s" inside this URL which will be replaced with the name of the wikilink page.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_NEWTEXT', 'This text will be added to undefined wikilinks to link to the create page. Initially this is set to "?".');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_CACHETIME', 'If you specify a remote file (URL) for your wikilink pages, this file will be cached for as many seconds you specify here. Default is 1 hour.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_COLORTEXT', 'Colorize text using ##color|text##. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_STRONG', '**Text** is marked strong. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_BOLD', '\'\'\'Text\'\'\' is marked bold. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_EMPHASIS', '//Text// is marked emphasised. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_ITALIC', '\'\'Text\'\' is marked italic. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TT', '{{Text}} is writen in teletext (monotype). Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_SUPERSCRIPT', '^^Text^^ is written in superscript. Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_REVISE', 'Enables marking texts as revisions using "@@---delete this text+++insert this text@@". Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TIGHTEN', 'Finds more than 3 newlines and reduces the to 2 newlines (paragraph). Default is on.');
+@define('PLUGIN_EVENT_TEXTWIKI_RULE_DESC_ENTITIES', 'Escapes HTML entities. Default is on.');
 
 class serendipity_event_textwiki extends serendipity_event
 {
 
     var $wikiRules  = array(
-	
-		'prefilter' => array(
-			'file' => 'Text/Wiki/Rule/prefilter.php',
-			'name' => 'Text_Wiki_Rule_prefilter',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PREFILETER
-		),
-		
-		'delimiter' => array(
-			'file' => 'Text/Wiki/Rule/delimiter.php',
-			'name' => 'Text_Wiki_Rule_delimiter',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_DELIMITER
-		),
-		
-		'code' => array(
-			'file' => 'Text/Wiki/Rule/code.php',
-			'name' => 'Text_Wiki_Rule_code',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_CODE
-		),
-		
-		'phpcode' => array(
-			'file' => 'Text/Wiki/Rule/phpcode.php',
-			'name' => 'Text_Wiki_Rule_phpcode',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PHPCODE
-		),
-		
-		'html' => array(
-			'file' => 'Text/Wiki/Rule/html.php',
-			'name' => 'Text_Wiki_Rule_html',
-			'flag' => false,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_HTML
-		),
-		
-		'raw' => array(
-			'file' => 'Text/Wiki/Rule/raw.php',
-			'name' => 'Text_Wiki_Rule_raw',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_RAW
-		),
-		
-		'include' => array(
-			'file' => 'Text/Wiki/Rule/include.php',
-			'name' => 'Text_Wiki_Rule_include',
-			'flag' => false,
-			'conf' => array(
-				'base' => '/path/to/scripts/'
-			),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_INCLUDE,
-			's9yc' => array(
-			     'base' => array(
-			         'type' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_INCLUDE_DESC_BASE))
-		),
-		
-		'heading' => array(
-			'file' => 'Text/Wiki/Rule/heading.php',
-			'name' => 'Text_Wiki_Rule_heading',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_HEADING
-		),
-		
-		'horiz' => array(
-			'file' => 'Text/Wiki/Rule/horiz.php',
-			'name' => 'Text_Wiki_Rule_horiz',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_HORIZ
-		),
-		
-		'break' => array(
-			'file' => 'Text/Wiki/Rule/break.php',
-			'name' => 'Text_Wiki_Rule_break',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_BREAK
-		),
-		
-		'blockquote' => array(
-			'file' => 'Text/Wiki/Rule/blockquote.php',
-			'name' => 'Text_Wiki_Rule_blockquote',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_BLOCKQUOTE
-		),
-		
-		'list' => array(
-			'file' => 'Text/Wiki/Rule/list.php',
-			'name' => 'Text_Wiki_Rule_list',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_LIST
-		),
-		
-		'deflist' => array(
-			'file' => 'Text/Wiki/Rule/deflist.php',
-			'name' => 'Text_Wiki_Rule_deflist',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_DEFLIST
-		),
-		
-		'table' => array(
-			'file' => 'Text/Wiki/Rule/table.php',
-			'name' => 'Text_Wiki_Rule_table',
-			'flag' => true,
-			'conf' => array(
-				'border' => 1,
-				'spacing' => 0,
-				'padding' => 4
-			),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TABLE
-		),
-		
-		'embed' => array(
-			'file' => 'Text/Wiki/Rule/embed.php',
-			'name' => 'Text_Wiki_Rule_embed',
-			'flag' => false,
-			'conf' => array(
-				'base' => '/path/to/scripts/'
-			),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_EMBED,
-			's9yc' => array(
-			     'base' => array(
-			         'type' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_EMBED_DESC_BASE))
-		),
-		
-		'image' => array(
-			'file' => 'Text/Wiki/Rule/image.php',
-			'name' => 'Text_Wiki_Rule_image',
-			'flag' => true,
-			'conf' => array(
-				'base' => '/path/to/images/'
-			),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_IMAGE,
-			's9yc' => array(
-			     'base' => array(
-			         'type' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_IMAGE_DESC_BASE))
-		),
-		
-		'phplookup' => array(
-			'file' => 'Text/Wiki/Rule/phplookup.php',
-			'name' => 'Text_Wiki_Rule_phplookup',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PHPLOOKUP
-		),
-		
-		'toc' => array(
-			'file' => 'Text/Wiki/Rule/toc.php',
-			'name' => 'Text_Wiki_Rule_toc',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TOC
-		),
-		
-		'newline' => array(
-			'file' => 'Text/Wiki/Rule/newline.php',
-			'name' => 'Text_Wiki_Rule_newline',
-			'flag' => true,
-			'conf' => array(
-				'skip' => array(
-					'code',
-					'phpcode',
-					'heading',
-					'horiz',
-					'deflist',
-					'table',
-					'list',
-					'toc'
-				)
-			),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_NEWLINE
-		),
-		
-		'center' => array(
-			'file' => 'Text/Wiki/Rule/center.php',
-			'name' => 'Text_Wiki_Rule_center',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_CENTER
-		),
-		
-		'paragraph' => array(
-			'file' => 'Text/Wiki/Rule/paragraph.php',
-			'name' => 'Text_Wiki_Rule_paragraph',
-			'flag' => true,
-			'conf' => array(
-				'skip' => array(
-					'blockquote',
-					'code',
-					'phpcode',
-					'heading',
-					'horiz',
-					'deflist',
-					'table',
-					'list',
-					'toc'
-				)
-			),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PARAGRAPH
-		),
-		
-		'url' => array(
-			'file' => 'Text/Wiki/Rule/url.php',
-			'name' => 'Text_Wiki_Rule_url',
-			'flag' => true,
-			'conf' => array(
-				'target' => '_BLANK'
-			),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_URL,
-			's9yc' => array(
-			     'target' => array(
-			         'type' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_URL_DESC_TARGET)),
-		),
-		
-		'freelink' => array(
-			'file' => 'Text/Wiki/Rule/freelink.php',
-			'name' => 'Text_Wiki_Rule_freelink',
-			'flag' => false,
-			'conf' => array(
-				'pages'	   => array(),
-				'view_url' => 'http://example.com/index.php?page=%s',
-				'new_url'  => 'http://example.com/new.php?page=%s',
-				'new_text' => '?'
-			),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_FREELINK,
-			's9yc' => array(
-			     'pages' => array(
-			         'type' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_PAGES),
-			     'view_url' => array(
-			         'type' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_VIEWURL),
-			     'new_url' => array(
-			         'type' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_NEWURL),
-			     'new_text' => array(
-			         'type' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_NEWTEXT),
-			     'cachetime' => array(
-			         'type' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_CACHETIME))
-		),
-		
-		'interwiki' => array(
-			'file' => 'Text/Wiki/Rule/interwiki.php',
-			'name' => 'Text_Wiki_Rule_interwiki',
-			'flag' => true,
-			'conf' => array(
-				'sites' => array(
-					'MeatBall' => 'http://www.usemod.com/cgi-bin/mb.pl?%s',
-					'Advogato' => 'http://advogato.org/%s',
-					'Wiki'	   => 'http://c2.com/cgi/wiki?%s'
-				),
-				'target' => '_BLANK'
-			),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_INTERWIKI,
-			's9yc' => array(
-			     'pages' => array(
-			         'target' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_INTERWIKI_DESC_TARGET))
-		),
-		
-		'wikilink' => array(
-			'file' => 'Text/Wiki/Rule/wikilink.php',
-			'name' => 'Text_Wiki_Rule_wikilink',
-			'flag' => false,
-			'conf' => array(
-				'pages'	   => array(),
-				'view_url' => 'http://example.com/index.php?page=%s',
-				'new_url'  => 'http://example.com/new.php?page=%s',
-				'new_text' => '?'
-			),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_WIKILINK,
-			's9yc' => array(
-			     'pages' => array(
-			         'type' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_PAGES),
-			     'view_url' => array(
-			         'type' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_VIEWURL),
-			     'new_url' => array(
-			         'type' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_NEWURL),
-			     'new_text' => array(
-			         'type' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_NEWTEXT),
-			     'cachetime' => array(
-			         'type' => 'string',
-			         'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_CACHETIME))
-		),
-		
-		'colortext' => array(
-			'file' => 'Text/Wiki/Rule/colortext.php',
-			'name' => 'Text_Wiki_Rule_colortext',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_COLORTEXT
-		),
-		
-		'strong' => array(
-			'file' => 'Text/Wiki/Rule/strong.php',
-			'name' => 'Text_Wiki_Rule_strong',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_STRONG
-		),
-		
-		'bold' => array(
-			'file' => 'Text/Wiki/Rule/bold.php',
-			'name' => 'Text_Wiki_Rule_bold',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_BOLD
-		),
-		
-		'emphasis' => array(
-			'file' => 'Text/Wiki/Rule/emphasis.php',
-			'name' => 'Text_Wiki_Rule_emphasis',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_EMPHASIS
-		),
-		
-		'italic' => array(
-			'file' => 'Text/Wiki/Rule/italic.php',
-			'name' => 'Text_Wiki_Rule_italic',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_ITALIC
-		),
-		
-		'tt' => array(
-			'file' => 'Text/Wiki/Rule/tt.php',
-			'name' => 'Text_Wiki_Rule_tt',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TT
-		),
-		
-		'superscript' => array(
-			'file' => 'Text/Wiki/Rule/superscript.php',
-			'name' => 'Text_Wiki_Rule_superscript',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_SUPERSCRIPT
-		),
-		
-		'revise' => array(
-			'file' => 'Text/Wiki/Rule/revise.php',
-			'name' => 'Text_Wiki_Rule_revise',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_REVISE
-		),
-		
-		'tighten' => array(
-			'file' => 'Text/Wiki/Rule/tighten.php',
-			'name' => 'Text_Wiki_Rule_tighten',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TIGHTEN
-		),
-		
-		'entities' => array(
-			'file' => 'Text/Wiki/Rule/entities.php',
-			'name' => 'Text_Wiki_Rule_entities',
-			'flag' => true,
-			'conf' => array(),
-			'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_ENTITIES
-		)
-	);
-    
-	var $nonWikiRules = array();
-	
+        'prefilter' => array(
+            'file' => 'Text/Wiki/Rule/prefilter.php',
+            'name' => 'Text_Wiki_Rule_prefilter',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PREFILETER
+        ),
+
+        'delimiter' => array(
+            'file' => 'Text/Wiki/Rule/delimiter.php',
+            'name' => 'Text_Wiki_Rule_delimiter',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_DELIMITER
+        ),
+
+        'code' => array(
+            'file' => 'Text/Wiki/Rule/code.php',
+            'name' => 'Text_Wiki_Rule_code',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_CODE
+        ),
+
+        'phpcode' => array(
+            'file' => 'Text/Wiki/Rule/phpcode.php',
+            'name' => 'Text_Wiki_Rule_phpcode',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PHPCODE
+        ),
+
+        'html' => array(
+            'file' => 'Text/Wiki/Rule/html.php',
+            'name' => 'Text_Wiki_Rule_html',
+            'flag' => false,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_HTML
+        ),
+
+        'raw' => array(
+            'file' => 'Text/Wiki/Rule/raw.php',
+            'name' => 'Text_Wiki_Rule_raw',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_RAW
+        ),
+
+        'include' => array(
+            'file' => 'Text/Wiki/Rule/include.php',
+            'name' => 'Text_Wiki_Rule_include',
+            'flag' => false,
+            'conf' => array(
+                'base' => '/path/to/scripts/'
+            ),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_INCLUDE,
+            's9yc' => array(
+                 'base' => array(
+                     'type' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_INCLUDE_DESC_BASE))
+        ),
+
+        'heading' => array(
+            'file' => 'Text/Wiki/Rule/heading.php',
+            'name' => 'Text_Wiki_Rule_heading',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_HEADING
+        ),
+
+        'horiz' => array(
+            'file' => 'Text/Wiki/Rule/horiz.php',
+            'name' => 'Text_Wiki_Rule_horiz',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_HORIZ
+        ),
+
+        'break' => array(
+            'file' => 'Text/Wiki/Rule/break.php',
+            'name' => 'Text_Wiki_Rule_break',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_BREAK
+        ),
+
+        'blockquote' => array(
+            'file' => 'Text/Wiki/Rule/blockquote.php',
+            'name' => 'Text_Wiki_Rule_blockquote',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_BLOCKQUOTE
+        ),
+
+        'list' => array(
+            'file' => 'Text/Wiki/Rule/list.php',
+            'name' => 'Text_Wiki_Rule_list',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_LIST
+        ),
+
+        'deflist' => array(
+            'file' => 'Text/Wiki/Rule/deflist.php',
+            'name' => 'Text_Wiki_Rule_deflist',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_DEFLIST
+        ),
+
+        'table' => array(
+            'file' => 'Text/Wiki/Rule/table.php',
+            'name' => 'Text_Wiki_Rule_table',
+            'flag' => true,
+            'conf' => array(
+                'border'  => 1,
+                'spacing' => 0,
+                'padding' => 4
+            ),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TABLE
+        ),
+
+        'embed' => array(
+            'file' => 'Text/Wiki/Rule/embed.php',
+            'name' => 'Text_Wiki_Rule_embed',
+            'flag' => false,
+            'conf' => array(
+                'base' => '/path/to/scripts/'
+            ),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_EMBED,
+            's9yc' => array(
+                 'base' => array(
+                     'type' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_EMBED_DESC_BASE))
+        ),
+
+        'image' => array(
+            'file' => 'Text/Wiki/Rule/image.php',
+            'name' => 'Text_Wiki_Rule_image',
+            'flag' => true,
+            'conf' => array(
+                'base' => ''
+            ),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_IMAGE,
+            's9yc' => array(
+                 'base' => array(
+                     'type' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_IMAGE_DESC_BASE))
+        ),
+
+        'phplookup' => array(
+            'file' => 'Text/Wiki/Rule/phplookup.php',
+            'name' => 'Text_Wiki_Rule_phplookup',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PHPLOOKUP
+        ),
+
+        'toc' => array(
+            'file' => 'Text/Wiki/Rule/toc.php',
+            'name' => 'Text_Wiki_Rule_toc',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TOC
+        ),
+
+        'newline' => array(
+            'file' => 'Text/Wiki/Rule/newline.php',
+            'name' => 'Text_Wiki_Rule_newline',
+            'flag' => true,
+            'conf' => array(
+                'skip' => array(
+                    'code',
+                    'phpcode',
+                    'heading',
+                    'horiz',
+                    'deflist',
+                    'table',
+                    'list',
+                    'toc'
+                )
+            ),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_NEWLINE
+        ),
+
+        'center' => array(
+            'file' => 'Text/Wiki/Rule/center.php',
+            'name' => 'Text_Wiki_Rule_center',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_CENTER
+        ),
+
+        'paragraph' => array(
+            'file' => 'Text/Wiki/Rule/paragraph.php',
+            'name' => 'Text_Wiki_Rule_paragraph',
+            'flag' => true,
+            'conf' => array(
+                'skip' => array(
+                    'blockquote',
+                    'code',
+                    'phpcode',
+                    'heading',
+                    'horiz',
+                    'deflist',
+                    'table',
+                    'list',
+                    'toc'
+                )
+            ),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_PARAGRAPH
+        ),
+
+        'url' => array(
+            'file' => 'Text/Wiki/Rule/url.php',
+            'name' => 'Text_Wiki_Rule_url',
+            'flag' => true,
+            'conf' => array(
+                'target' => '_BLANK'
+            ),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_URL,
+            's9yc' => array(
+                 'target' => array(
+                     'type' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_URL_DESC_TARGET)),
+        ),
+
+        'freelink' => array(
+            'file' => 'Text/Wiki/Rule/freelink.php',
+            'name' => 'Text_Wiki_Rule_freelink',
+            'flag' => false,
+            'conf' => array(
+                'pages'       => array(),
+                'view_url' => 'http://example.com/index.php?page=%s',
+                'new_url'  => 'http://example.com/new.php?page=%s',
+                'new_text' => '?'
+            ),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_FREELINK,
+            's9yc' => array(
+                 'pages' => array(
+                     'type' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_PAGES),
+                 'view_url' => array(
+                     'type' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_VIEWURL),
+                 'new_url' => array(
+                     'type' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_NEWURL),
+                 'new_text' => array(
+                     'type' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_FREELINK_DESC_NEWTEXT),
+                 'cachetime' => array(
+                     'type' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_CACHETIME))
+        ),
+
+        'interwiki' => array(
+            'file' => 'Text/Wiki/Rule/interwiki.php',
+            'name' => 'Text_Wiki_Rule_interwiki',
+            'flag' => true,
+            'conf' => array(
+                'sites' => array(
+                    'MeatBall' => 'http://www.usemod.com/cgi-bin/mb.pl?%s',
+                    'Advogato' => 'http://advogato.org/%s',
+                    'Wiki'     => 'http://c2.com/cgi/wiki?%s'
+                ),
+                'target' => '_BLANK'
+            ),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_INTERWIKI,
+            's9yc' => array(
+                 'pages' => array(
+                     'target' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_INTERWIKI_DESC_TARGET))
+        ),
+
+        'wikilink' => array(
+            'file' => 'Text/Wiki/Rule/wikilink.php',
+            'name' => 'Text_Wiki_Rule_wikilink',
+            'flag' => false,
+            'conf' => array(
+                'pages'       => array(),
+                'view_url' => 'http://example.com/index.php?page=%s',
+                'new_url'  => 'http://example.com/new.php?page=%s',
+                'new_text' => '?'
+            ),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_WIKILINK,
+            's9yc' => array(
+                 'pages' => array(
+                     'type' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_PAGES),
+                 'view_url' => array(
+                     'type' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_VIEWURL),
+                 'new_url' => array(
+                     'type' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_NEWURL),
+                 'new_text' => array(
+                     'type' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_NEWTEXT),
+                 'cachetime' => array(
+                     'type' => 'string',
+                     'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_WIKILINK_DESC_CACHETIME))
+        ),
+
+        'colortext' => array(
+            'file' => 'Text/Wiki/Rule/colortext.php',
+            'name' => 'Text_Wiki_Rule_colortext',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_COLORTEXT
+        ),
+
+        'strong' => array(
+            'file' => 'Text/Wiki/Rule/strong.php',
+            'name' => 'Text_Wiki_Rule_strong',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_STRONG
+        ),
+
+        'bold' => array(
+            'file' => 'Text/Wiki/Rule/bold.php',
+            'name' => 'Text_Wiki_Rule_bold',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_BOLD
+        ),
+
+        'emphasis' => array(
+            'file' => 'Text/Wiki/Rule/emphasis.php',
+            'name' => 'Text_Wiki_Rule_emphasis',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_EMPHASIS
+        ),
+
+        'italic' => array(
+            'file' => 'Text/Wiki/Rule/italic.php',
+            'name' => 'Text_Wiki_Rule_italic',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_ITALIC
+        ),
+
+        'tt' => array(
+            'file' => 'Text/Wiki/Rule/tt.php',
+            'name' => 'Text_Wiki_Rule_tt',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TT
+        ),
+
+        'superscript' => array(
+            'file' => 'Text/Wiki/Rule/superscript.php',
+            'name' => 'Text_Wiki_Rule_superscript',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_SUPERSCRIPT
+        ),
+
+        'revise' => array(
+            'file' => 'Text/Wiki/Rule/revise.php',
+            'name' => 'Text_Wiki_Rule_revise',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_REVISE
+        ),
+
+        'tighten' => array(
+            'file' => 'Text/Wiki/Rule/tighten.php',
+            'name' => 'Text_Wiki_Rule_tighten',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_TIGHTEN
+        ),
+
+        'entities' => array(
+            'file' => 'Text/Wiki/Rule/entities.php',
+            'name' => 'Text_Wiki_Rule_entities',
+            'flag' => true,
+            'conf' => array(),
+            'desc' => PLUGIN_EVENT_TEXTWIKI_RULE_DESC_ENTITIES
+        )
+    );
+
+    var $nonWikiRules = array();
+
     function introspect(&$propbag)
     {
         global $serendipity;
@@ -523,7 +522,7 @@
             }
         }
     }
-    
+
 
     function generate_content(&$title) {
         $title = PLUGIN_EVENT_TEXTWIKI_NAME;
@@ -545,7 +544,7 @@
         }
         return true;
     }
-    
+
     function _introspect_rule_config_item($name, &$propbag) {
         if (strpos($name, '_') === false) {
             $propbag->add('type',        'boolean');
@@ -566,7 +565,7 @@
         global $serendipity;
 
         $hooks = &$bag->get('event_hooks');
-        
+
         if (!isset($this->wiki) || !is_a($this->wiki, 'text_wiki')) {
             $this->_init_wiki($bag);
         }
@@ -597,7 +596,7 @@
             return false;
         }
     }
-        
+
     function _init_wiki(&$bag) {
         if (class_exists('Text_Wiki')) {
             $this->wiki =& new Text_Wiki;
@@ -611,7 +610,7 @@
         }
         return true;
     }
-    
+
     function _add_wiki_rule(&$bag, $name, $rule) {
         $rule_info = $rule;
         $rule_info['flag'] = true;
@@ -627,7 +626,7 @@
         $this->wiki->insertRule($name, $rule_info);
         return true;
     }
-    
+
     function _get_link_pages(&$bag, $ruleName) {
         global $serendipity;
         if ($this->get_config($ruleName.'_pages') === null) {
@@ -653,4 +652,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/sql db_update_0.6.1_0.6.2_postgres.sql,1.1,1.2 db_update_0.6.2_0.6.3_postgres.sql,1.3,1.4 db_update_0.6.3_0.6.4_postgres.sql,1.1,1.2 db_update_0.6.4_0.6.5_postgres.sql,1.1,1.2 db_update_0.6.6_0.6.7_postgres.sql,1.2,1.3 db_update_0.6.8_0.6.9_postgres.sql,1.1,1.2 db_update_0.6_0.6.1_postgres.sql,1.2,1.3

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

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

Modified Files:
	db_update_0.6.1_0.6.2_postgres.sql 
	db_update_0.6.2_0.6.3_postgres.sql 
	db_update_0.6.3_0.6.4_postgres.sql 
	db_update_0.6.4_0.6.5_postgres.sql 
	db_update_0.6.6_0.6.7_postgres.sql 
	db_update_0.6.8_0.6.9_postgres.sql 
	db_update_0.6_0.6.1_postgres.sql 
Log Message:
several pgsql fixes


Index: db_update_0.6.4_0.6.5_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.4_0.6.5_postgres.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.6.4_0.6.5_postgres.sql	7 Jun 2004 14:22:48 -0000	1.1
+++ db_update_0.6.4_0.6.5_postgres.sql	6 Sep 2004 09:15:32 -0000	1.2
@@ -1,15 +1,21 @@
-ALTER TABLE {PREFIX}category
-  ADD parentid INT(11) DEFAULT '0' NOT NULL,
-  ADD category_left INT(11) DEFAULT '0' NOT NULL,
-  ADD category_right INT(11) DEFAULT '0' NOT NULL;
+ALTER TABLE {PREFIX}category ADD COLUMN parentid INT4;
+ALTER TABLE {PREFIX}category ADD COLUMN category_left INT4;
+ALTER TABLE {PREFIX}category ADD COLUMN category_right INT4;
+UPDATE {PREFIX}category SET parentid=0, category_left=0, category_right=0;
 
-create table {PREFIX}entrycat (
-  entryid int(11) not null,
-  categoryid int(11) not null
+ALTER TABLE {PREFIX}category ALTER COLUMN parentid SET NOT NULL;
+ALTER TABLE {PREFIX}category ALTER COLUMN category_left SET NOT NULL;
+ALTER TABLE {PREFIX}category ALTER COLUMN category_right SET NOT NULL;
+
+CREATE TABLE {PREFIX}entrycat (
+  entryid int4 not null,
+  categoryid int4 not null
 );
 
-INSERT INTO {PREFIX}entrycat (entryid, categoryid) (SELECT id, categoryid FROM {PREFIX}entries);
+INSERT INTO {PREFIX}entrycat (entryid, categoryid)  (SELECT id, categoryid FROM {PREFIX}entries);
 
-ALTER TABLE {PREFIX}entries DROP categoryid;
+ALTER TABLE {PREFIX}entries DROP COLUMN categoryid;
 
-ALTER TABLE {PREFIX}comments ADD parent_id int(10) {UNSIGNED} not null default '0';
+ALTER TABLE {PREFIX}comments ADD COLUMN parent_id int4;
+UPDATE {PREFIX}comments SET parent_id=0;
+ALTER TABLE {PREFIX}comments ALTER COLUMN parent_id SET NOT NULL;

Index: db_update_0.6.8_0.6.9_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.8_0.6.9_postgres.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.6.8_0.6.9_postgres.sql	19 Jul 2004 09:31:52 -0000	1.1
+++ db_update_0.6.8_0.6.9_postgres.sql	6 Sep 2004 09:15:32 -0000	1.2
@@ -1,7 +1,9 @@
-ALTER TABLE {PREFIX}images ADD oldmime varchar(15) not null default '';
+ALTER TABLE {PREFIX}images ADD COLUMN oldmime varchar(15)
 UPDATE {PREFIX}images SET oldmime = mime;
 ALTER TABLE {PREFIX}images DROP mime;
 
-ALTER TABLE {PREFIX}images ADD mime varchar(255) not null default '';
+ALTER TABLE {PREFIX}images ADD COLUMN mime varchar(255);
 UPDATE {PREFIX}images SET mime = oldmime;
-ALTER TABLE {PREFIX}images DROP oldmime;
+ALTER TABLE {PREFIX}images DROP COLUMN oldmime;
+ALTER TABLE {PREFIX}images ALTER COLUMN mime SET NOT NULL;
+

Index: db_update_0.6.2_0.6.3_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.2_0.6.3_postgres.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- db_update_0.6.2_0.6.3_postgres.sql	26 May 2004 17:02:35 -0000	1.3
+++ db_update_0.6.2_0.6.3_postgres.sql	6 Sep 2004 09:15:32 -0000	1.4
@@ -1,2 +1,4 @@
-ALTER TABLE {PREFIX}images ADD COLUMN path text DEFAULT '/';
+ALTER TABLE {PREFIX}images ADD COLUMN path text;
+ALTER TABLE {PREFIX}images ALTER COLUMN path SET DEFAULT '/';
+UPDATE {PREFIX}images SET path = '/';
 CREATE {FULLTEXT} INDEX pathkey on {PREFIX}images (path);

Index: db_update_0.6.3_0.6.4_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.3_0.6.4_postgres.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.6.3_0.6.4_postgres.sql	26 May 2004 17:02:35 -0000	1.1
+++ db_update_0.6.3_0.6.4_postgres.sql	6 Sep 2004 09:15:32 -0000	1.2
@@ -1,3 +1,3 @@
-ALTER TABLE {PREFIX}authors ADD COLUMN right_publish int(1);
+ALTER TABLE {PREFIX}authors ADD COLUMN right_publish int2;
 ALTER TABLE {PREFIX}authors ALTER COLUMN right_publish SET DEFAULT '1';
 UPDATE {PREFIX}authors SET right_publish=1;

Index: db_update_0.6.6_0.6.7_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.6_0.6.7_postgres.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db_update_0.6.6_0.6.7_postgres.sql	17 Jul 2004 12:01:02 -0000	1.2
+++ db_update_0.6.6_0.6.7_postgres.sql	6 Sep 2004 09:15:32 -0000	1.3
@@ -1,3 +1,7 @@
-ALTER TABLE {PREFIX}entries ADD moderate_comments BOOLEAN NOT NULL;
-ALTER TABLE {PREFIX}comments ADD status varchar(50) not null;
+ALTER TABLE {PREFIX}entries ADD COLUMN moderate_comments BOOLEAN;
+ALTER TABLE {PREFIX}comments ADD COLUMN status varchar(50);
 UPDATE {PREFIX}comments SET status = 'approved';
+UPDATE {PREFIX}entries SET moderate_comments = false;
+ALTER TABLE {PREFIX}entries ALTER COLUMN moderate_comments SET NOT NULL;
+ALTER TABLE {PREFIX}comments ALTER COLUMN status SET NOT NULL;
+

Index: db_update_0.6.1_0.6.2_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.1_0.6.2_postgres.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.6.1_0.6.2_postgres.sql	28 Apr 2004 15:02:25 -0000	1.1
+++ db_update_0.6.1_0.6.2_postgres.sql	6 Sep 2004 09:15:32 -0000	1.2
@@ -1 +1 @@
-ALTER TABLE {PREFIX}category ADD COLUMN category_icon varchar(255) DEFAULT NULL after `category_name`;
+ALTER TABLE {PREFIX}category ADD COLUMN category_icon varchar(255);

Index: db_update_0.6_0.6.1_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6_0.6.1_postgres.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db_update_0.6_0.6.1_postgres.sql	11 Apr 2004 05:03:27 -0000	1.2
+++ db_update_0.6_0.6.1_postgres.sql	6 Sep 2004 09:15:32 -0000	1.3
@@ -1,5 +1,5 @@
 
-ALTER TABLE {PREFIX}authors ADD userlevel SMALLINT;
+ALTER TABLE {PREFIX}authors ADD COLUMN userlevel SMALLINT;
 ALTER TABLE {PREFIX}authors ALTER COLUMN userlevel SET DEFAULT '0';
 UPDATE {PREFIX}authors SET userlevel = 255 WHERE authorid = 1;
 UPDATE {PREFIX}authors SET userlevel = 1 WHERE authorid > 1;

[php-blog-cvs] serendipity NEWS,1.210,1.211

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

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

Modified Files:
	NEWS 
Log Message:
several pgsql fixes


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- NEWS	5 Sep 2004 21:19:56 -0000	1.210
+++ NEWS	6 Sep 2004 09:15:31 -0000	1.211
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fix several postgreSQL update errors. Thanks to daFool from the
+      forums! (garvinhicking)
+
     * Disable the use of popups by default (tomsommer)
 
     * BBCode plugin can now pretty print code/php style blocks.

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.416,1.417

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
if some special URL was called, invalid data was produced. now catch that
case. (contact me for more information on this, if you want)


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -d -r1.416 -r1.417
--- serendipity_functions.inc.php	5 Sep 2004 19:32:53 -0000	1.416
+++ serendipity_functions.inc.php	6 Sep 2004 08:12:51 -0000	1.417
@@ -1141,7 +1141,7 @@
 
     /* pre-walk the array to collect them keyed by date */
     $bydate = array();
-    if (!is_array($entries) || $entries[0] == false) {
+    if (!is_array($entries) || $entries[0] == false || $entries[0][0] == false) {
         echo '<br />' . NO_ENTRIES_TO_PRINT . "\n";
         return;
     }
@@ -1333,7 +1333,7 @@
                       ),
                       (isset($entry['allow_comments']) ? $entry['allow_comments'] : true),
                       true,
-                      $viewmode 
+                      $viewmode
                     );
 
                     if (!empty($serendipity['POST']['preview'])) {

[php-blog-cvs] serendipity NEWS,1.209,1.210 serendipity_config_local.tpl,1.43,1.44

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

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

Modified Files:
	NEWS serendipity_config_local.tpl 
Log Message:
Disable the use of popups by default


Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- serendipity_config_local.tpl	30 Jul 2004 01:29:47 -0000	1.43
+++ serendipity_config_local.tpl	5 Sep 2004 21:19:56 -0000	1.44
@@ -35,7 +35,7 @@
 $serendipity['extCSS']               = '{INSTALL_EXTERNALSTYLE|extCSS|string|none|255}';    // INSTALL_EXTERNALSTYLE_DESC
 $serendipity['wysiwyg']              = '{INSTALL_WYSIWYG|wysiwyg|bool|0|0}';                // INSTALL_WYSIWYG_DESC
 $serendipity['XHTML11']              = '{INSTALL_XHTML11|XHTML11|bool|0|255}';              // INSTALL_XHTML11_DESC
-$serendipity['enablePopup']          = '{INSTALL_POPUP|enablePopup|bool|1|255}';            // INSTALL_POPUP_DESC
+$serendipity['enablePopup']          = '{INSTALL_POPUP|enablePopup|bool|0|255}';            // INSTALL_POPUP_DESC
 $serendipity['embed']                = '{INSTALL_EMBED|embed|bool||255}';                   // INSTALL_EMBED_DESC
 $serendipity['top_as_links']         = '{INSTALL_SHOW_EXTERNAL_LINKS|top_as_links|bool||1|255}'; // INSTALL_SHOW_EXTERNAL_LINKS_DESC
 $serendipity['blockReferer']         = '{INSTALL_BLOCKREF|blockReferer|string|;|255}';      // INSTALL_BLOCKREF_DESC

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- NEWS	2 Sep 2004 12:44:37 -0000	1.209
+++ NEWS	5 Sep 2004 21:19:56 -0000	1.210
@@ -3,11 +3,13 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Disable the use of popups by default (tomsommer)
+
     * BBCode plugin can now pretty print code/php style blocks.
       (Jez Hancock, garvinhicking)
 
-    * Threaded/chronological view of comments can be toggled by the
-      visitor. (garvinhicking)
+    * Threaded/Linear view of comments can be toggled by the
+      visitor. (garvinhicking, tomsommer)
 
     * Plugin serendipity_event_spamblock: Will reject any double
       comments, if enabled. Stub for enhancing other spam-protections

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.13,1.14 serendipity_lang_cs.inc.php,1.60,1.61 serendipity_lang_cz.inc.php,1.60,1.61 serendipity_lang_da.inc.php,1.77,1.78 serendipity_lang_de.inc.php,1.96,1.97 serendipity_lang_es.inc.php,1.76,1.77 serendipity_lang_fr.inc.php,1.56,1.57 serendipity_lang_nl.inc.php,1.34,1.35 serendipity_lang_pt.inc.php,1.34,1.35

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

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

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_es.inc.php 
	serendipity_lang_fr.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_pt.inc.php 
Log Message:
Synchronize language files with English file (I love writing scripts)


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- serendipity_lang_cs.inc.php	5 Sep 2004 19:31:00 -0000	1.60
+++ serendipity_lang_cs.inc.php	5 Sep 2004 19:56:57 -0000	1.61
@@ -548,6 +548,7 @@
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate
+@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>'); // 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.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- serendipity_lang_da.inc.php	5 Sep 2004 19:31:00 -0000	1.77
+++ serendipity_lang_da.inc.php	5 Sep 2004 19:56:57 -0000	1.78
@@ -543,6 +543,9 @@
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate
+@define('SIDEBAR_PLUGINS', 'Sidebar Plugins'); // Translate
+@define('EVENT_PLUGINS', 'Event Plugins'); // Translate
+@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>'); // 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.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- serendipity_lang_fr.inc.php	5 Sep 2004 19:31:00 -0000	1.56
+++ serendipity_lang_fr.inc.php	5 Sep 2004 19:56:57 -0000	1.57
@@ -547,6 +547,8 @@
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate
+@define('PAGE_BROWSE_ENTRIES', 'Page %s of %s, totalling %s entries'); // Translate
+@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>'); // 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.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- serendipity_lang_cz.inc.php	5 Sep 2004 19:31:00 -0000	1.60
+++ serendipity_lang_cz.inc.php	5 Sep 2004 19:56:57 -0000	1.61
@@ -546,6 +546,7 @@
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate
+@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>'); // 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.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_lang_nl.inc.php	5 Sep 2004 19:31:00 -0000	1.34
+++ serendipity_lang_nl.inc.php	5 Sep 2004 19:56:57 -0000	1.35
@@ -548,6 +548,12 @@
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate
+@define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); // Translate
+@define('NUMBER_FORMAT_DECIMALS', '2'); // Translate
+@define('NUMBER_FORMAT_DECPOINT', '.'); // Translate
+@define('NUMBER_FORMAT_THOUSANDS', ','); // Translate
+@define('CATEGORY_DELETED_ARTICLES_MOVED', 'Category #%s deleted. Old articles moved to category #%s'); // Translate
+@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>'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- serendipity_lang_es.inc.php	5 Sep 2004 19:31:00 -0000	1.76
+++ serendipity_lang_es.inc.php	5 Sep 2004 19:56:57 -0000	1.77
@@ -543,6 +543,16 @@
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate
+@define('LOGIN', 'Login'); // Translate
+@define('AUTOMATIC_LOGIN', 'Save information'); // Translate
+@define('DO_MARKUP', 'Perform Markup Transformations'); // Translate
+@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".'); // Translate
+@define('GENERAL_PLUGIN_DATEFORMAT', 'Dateformatting'); // Translate
+@define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'The format of the entry\'s actual date, using PHPs strftime() variables. (Default: "%s")'); // Translate
+@define('ERROR_TEMPLATE_FILE', 'Unable to open template file, please update serendipity!'); // Translate
+@define('ADVANCED_OPTIONS', 'Advanced Options'); // Translate
+@define('EDIT_ENTRY', 'Edit entry'); // Translate
+@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>'); // 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.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_lang_bg.inc.php	5 Sep 2004 19:31:00 -0000	1.13
+++ serendipity_lang_bg.inc.php	5 Sep 2004 19:56:57 -0000	1.14
@@ -348,6 +348,189 @@
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate
+@define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); // Translate
+@define('NUMBER_FORMAT_DECIMALS', '2'); // Translate
+@define('NUMBER_FORMAT_DECPOINT', '.'); // Translate
+@define('NUMBER_FORMAT_THOUSANDS', ','); // Translate
+@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.'); // Translate
+@define('CATEGORY_DELETED_ARTICLES_MOVED', 'Category #%s deleted. Old articles moved to category #%s'); // Translate
+@define('USE_DEFAULT', 'Default'); // Translate
+@define('PAGE_BROWSE_ENTRIES', 'Page %s of %s, totalling %s entries'); // Translate
+@define('MANAGE_USERS', 'Manage users'); // Translate
+@define('EDIT_USERS', 'Edit users'); // Translate
+@define('CREATE_USERS', 'Create users'); // Translate
+@define('CREATE_NEW_USER', 'Create new user'); // Translate
+@define('CREATE_NOT_AUTHORIZED', 'You cannot modify users with the same userlevel as yourself'); // Translate
+@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'You cannot create users with a higher userlevel than yourself'); // Translate
+@define('CREATED_USER', 'A new user %s has been created'); // Translate
+@define('MODIFIED_USER', 'The properties of user %s have been changed'); // Translate
+@define('USER_SELF_INFO', 'logged in as %s, level %s'); // Translate
+@define('USER_LEVEL', 'Userlevel'); // Translate
+@define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.'); // Translate
+@define('DELETED_USER', 'User #%d %s deleted.'); // Translate
+@define('LIMIT_TO_NUMBER', 'How many items should be displayed?'); // Translate
+@define('FILTER', 'Filter'); // Translate
+@define('ENTRIES_PER_PAGE', 'entries per page'); // Translate
+@define('XML_IMAGE_TO_DISPLAY', 'XML Button'); // Translate
+@define('DIRECTORIES_AVAILABLE', 'In the list of available subdirectories you can click on any directory name to create a new directory within that structure.'); // Translate
+@define('ALL_DIRECTORIES', 'all directories'); // Translate
+@define('MANAGE_DIRECTORIES', 'Manage directories'); // Translate
+@define('DIRECTORY_CREATED', 'Directory <strong>%s</strong> has been created.'); // Translate
+@define('NEW_DIRECTORY', 'Create a new directory'); // Translate
+@define('PARENT_DIRECTORY', 'Parent directory'); // Translate
+@define('DELETE_DIRECTORY', 'Delete this directory'); // Translate
+@define('CONFIRM_DELETE_DIRECTORY', 'Are you sure you want to remove all the contents of directory %s?'); // Translate
+@define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist'); // Translate
+@define('FORCE_DELETE', 'Force deletion of files not inside the media database'); // Translate
+@define('CHECKING_DIRECTORY', 'Checking files in directory %s'); // Translate
+@define('DELETING_FILE', 'Deleting file %s...'); // Translate
+@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:'); // Translate
+@define('DIRECTORY_DELETE_FAILED', 'Deletion of directory %s failed. Check permissions or messages above.'); // Translate
+@define('DIRECTORY_DELETE_SUCCESS', 'Directory %s successfully deleted.'); // Translate
+@define('SKIPPING_FILE_EXTENSION', 'Skipping file: Missing extension on %s.'); // Translate
+@define('SKIPPING_FILE_UNREADABLE', 'Skipping file: %s not readable.'); // Translate
+@define('FOUND_FILE', 'Found new/modified file: %s.'); // Translate
+@define('ALREADY_SUBCATEGORY', '%s is a already a subcategory of %s.'); // Translate
+@define('PARENT_CATEGORY', 'Parent category'); // Translate
+@define('REPLY', 'Reply'); // Translate
+@define('IN_REPLY_TO', 'In reply to'); // Translate
+@define('TOP_LEVEL', 'Top level'); // Translate
+@define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed'); // Translate
+@define('PERMISSIONS', 'Permissions'); // Translate
+@define('SETTINGS_SAVED_AT', 'The new settings have been saved at %s'); // Translate
+@define('INSTALL_CAT_DB', 'Database settings'); // Translate
+@define('INSTALL_CAT_DB_DESC', 'Here you can enter all your database information. Serendipity needs this to be able to function'); // Translate
+@define('INSTALL_DBTYPE', 'Database type'); // Translate
+@define('INSTALL_DBTYPE_DESC', 'Database type'); // Translate
+@define('INSTALL_DBHOST', 'Database host'); // Translate
+@define('INSTALL_DBHOST_DESC', 'The hostname for your database server'); // Translate
+@define('INSTALL_DBUSER', 'Database user'); // Translate
+@define('INSTALL_DBUSER_DESC', 'The username used to connect to your database'); // Translate
+@define('INSTALL_DBPASS', 'Database password'); // Translate
+@define('INSTALL_DBPASS_DESC', 'The password matching the above username'); // Translate
+@define('INSTALL_DBNAME', 'Database name'); // Translate
+@define('INSTALL_DBNAME_DESC', 'The name of your database'); // Translate
+@define('INSTALL_DBPREFIX', 'Database table prefix'); // Translate
+@define('INSTALL_DBPREFIX_DESC', 'Prefix for the table names, i.e. serendipity_'); // Translate
+@define('INSTALL_CAT_PATHS', 'Paths'); // Translate
+@define('INSTALL_CAT_PATHS_DESC', 'Various paths to different essential folders and files. Don\'t forget trailing slashes for directories!'); // Translate
+@define('INSTALL_FULLPATH', 'Full path'); // Translate
+@define('INSTALL_FULLPATH_DESC', 'The full and absolute path to your serendipity installation'); // Translate
+@define('INSTALL_UPLOADPATH', 'Upload path'); // Translate
+@define('INSTALL_UPLOADPATH_DESC', 'All uploads will go here, relative to the \'Full path\' - typically \'uploads/\''); // Translate
+@define('INSTALL_RELPATH', 'Relative path'); // Translate
+@define('INSTALL_RELPATH_DESC', 'Path to serendipity for your browser, typically \'/serendipity/\''); // Translate
+@define('INSTALL_RELTEMPLPATH', 'Relative template path'); // Translate
+@define('INSTALL_RELTEMPLPATH_DESC', 'The path to the folder containing your templates - Relative to the \'relative path\''); // Translate
+@define('INSTALL_RELUPLOADPATH', 'Relative upload path'); // Translate
+@define('INSTALL_RELUPLOADPATH_DESC', 'Path to your uploads for browsers - Relative to the \'relative path\''); // Translate
+@define('INSTALL_URL', 'URL to blog'); // Translate
+@define('INSTALL_URL_DESC', 'Base URL to your serendipity installation'); // Translate
+@define('INSTALL_INDEXFILE', 'Index file'); // Translate
+@define('INSTALL_INDEXFILE_DESC', 'The name of your serendipity index file'); // Translate
+@define('INSTALL_CAT_SETTINGS', 'General settings'); // Translate
+@define('INSTALL_CAT_SETTINGS_DESC', 'Customize how Serendipity behaves'); // Translate
+@define('INSTALL_USERNAME', 'Admin username'); // Translate
+@define('INSTALL_USERNAME_DESC', 'Username for admin login'); // Translate
+@define('INSTALL_PASSWORD', 'Admin password'); // Translate
+@define('INSTALL_PASSWORD_DESC', 'Password for admin login'); // Translate
+@define('INSTALL_EMAIL', 'Admin email'); // Translate
+@define('INSTALL_EMAIL_DESC', 'Email for the blog administrator'); // Translate
+@define('INSTALL_SENDMAIL', 'Send mails to admin?'); // Translate
+@define('INSTALL_SENDMAIL_DESC', 'Do you want to receive emails when comments are posted to your entries?'); // Translate
+@define('INSTALL_SUBSCRIBE', 'Allow users to subscribe to entries?'); // Translate
+@define('INSTALL_SUBSCRIBE_DESC', 'Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry'); // Translate
+@define('INSTALL_BLOGNAME', 'Blog name'); // Translate
+@define('INSTALL_BLOGNAME_DESC', 'The title of your blog'); // Translate
+@define('INSTALL_BLOGDESC', 'Blog description'); // Translate
+@define('INSTALL_BLOGDESC_DESC', 'Description of your blog'); // Translate
+@define('INSTALL_LANG', 'Language'); // Translate
+@define('INSTALL_LANG_DESC', 'Select the language for your blog'); // Translate
+@define('INSTALL_CAT_DISPLAY', 'Appearance and options'); // Translate
+@define('INSTALL_CAT_DISPLAY_DESC', 'Customize how Serendipity looks and feels'); // Translate
+@define('INSTALL_EXTERNALSTYLE', 'External Stylesheet'); // Translate
+@define('INSTALL_EXTERNALSTYLE_DESC', 'You can define a stylesheet URI here, aditionally to the settings adjustable in the admin interface (enter \'none\' if you don\'t need this)'); // Translate
+@define('INSTALL_WYSIWYG', 'Use WYSIWYG editor'); // Translate
+@define('INSTALL_WYSIWYG_DESC', 'Do you want to use the WYSIWYG editor? (Works on IE5+, partially in Mozilla 1.3+)'); // Translate
+@define('INSTALL_POPUP', 'Enable use of popup windows'); // Translate
+@define('INSTALL_POPUP_DESC', 'Do you want to use popup windows for comments, trackbacks et al?'); // Translate
+@define('INSTALL_EMBED', 'Is serendipity embedded?'); // Translate
+@define('INSTALL_EMBED_DESC', 'If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!'); // Translate
+@define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?'); // Translate
+@define('INSTALL_TOP_AS_LINKS_DESC', '"no": Exits and Referrers are shown as plain text to prevent google spam. "yes": Exits and Referrers are shown as hyperlinks. "default": Use setting from global configuration (recommended).'); // Translate
+@define('INSTALL_BLOCKREF', 'Blocked Referers'); // Translate
+@define('INSTALL_BLOCKREF_DESC', 'Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with \';\' and note that the host is blocked by substring matches!'); // Translate
+@define('INSTALL_REWRITE', 'URL Rewriting'); // Translate
+@define('INSTALL_REWRITE_DESC', 'Select which rules you wish to use when generating URLs. Enabling rewrite rules will make pretty URLs for your blog and make it better indexable for spiders like google. The webserver needs to support either mod_rewrite or "AllowOverride All" for your serendipity dir. The default setting is auto-detected'); // Translate
+@define('INSTALL_CAT_IMAGECONV', 'Imageconversion Settings'); // Translate
+@define('INSTALL_CAT_IMAGECONV_DESC', 'Enter general information about how serendipity should handle Images'); // Translate
+@define('INSTALL_IMAGEMAGICK', 'Use Imagemagick'); // Translate
+@define('INSTALL_IMAGEMAGICK_DESC', 'Do you have image magick installed and want to use it to resize images?'); // Translate
+@define('INSTALL_IMAGEMAGICKPATH', 'Path to convert binary'); // Translate
+@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Full path & name of your image magick convert binary'); // Translate
+@define('INSTALL_THUMBSUFFIX', 'Thumbnail suffix'); // Translate
+@define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails will be named with the following format: original.[suffix].ext'); // Translate
+@define('INSTALL_THUMBWIDTH', 'Thumbnail dimensions'); // Translate
+@define('INSTALL_THUMBWIDTH_DESC', 'Static maximum width of auto-generated thumbnails'); // Translate
+@define('USERCONF_CAT_PERSONAL', 'Your personal details'); // Translate
+@define('USERCONF_CAT_PERSONAL_DESC', 'Change your personal details'); // Translate
+@define('USERCONF_USERNAME', 'Your username'); // Translate
+@define('USERCONF_USERNAME_DESC', 'The username you use to log in to the blog'); // Translate
+@define('USERCONF_PASSWORD', 'Your password'); // Translate
+@define('USERCONF_PASSWORD_DESC', 'The password you wish to use to log in to the blog'); // Translate
+@define('USERCONF_USERLEVEL', 'Permissionlevel'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'Userlevel. Should be one of the following: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chief editor, [USERLEVEL_EDITOR] - Standard editor.'); // Translate
+@define('USERCONF_EMAIL', 'Your e-mail address'); // Translate
+@define('USERCONF_EMAIL_DESC', 'Your personal e-mail address'); // Translate
+@define('USERCONF_SENDCOMMENTS', 'Send comment announcements?'); // Translate
+@define('USERCONF_SENDCOMMENTS_DESC', 'Do you want to receive emails when comments are posted to your entries?'); // Translate
+@define('USERCONF_SENDTRACKBACKS', 'Send trackback announcements?'); // Translate
+@define('USERCONF_SENDTRACKBACKS_DESC', 'Do you want to receive emails when trackbacks are posted to your entries?'); // Translate
+@define('USERCONF_ALLOWPUBLISH', 'Rights: Publishing entries?'); // Translate
+@define('USERCONF_ALLOWPUBLISH_DESC', 'Is this user allowed to publish entries?'); // Translate
+@define('SUCCESS', 'Success'); // Translate
+@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text'); // Translate
+@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text'); // Translate
+@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo'); // Translate
+@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo'); // Translate
+@define('PLUGIN_ITEM_DISPLAY', 'Where should the item be displayed?'); // Translate
+@define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Extended entry only'); // Translate
+@define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Overview page only'); // Translate
+@define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times'); // Translate
+@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.'); // Translate
+@define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries'); // Translate
+@define('COMMENTS_WILL_BE_MODERATED', 'Submitted comments will be subject to moderation before being displayed.'); // Translate
+@define('YOU_HAVE_THESE_OPTIONS', 'You have the following options available:'); // Translate
+@define('THIS_COMMENT_NEEDS_REVIEW', 'Warning: This comment needs approval before it will be displayed'); // Translate
+@define('DELETE_COMMENT', 'Delete comment'); // Translate
+@define('APPROVE_COMMENT', 'Approve comment'); // Translate
+@define('REQUIRES_REVIEW', 'Requires review'); // Translate
+@define('COMMENT_APPROVED', 'Comment #%s has successfully been approved'); // Translate
+@define('COMMENT_DELETED', 'Comment #%s has successfully been deleted'); // Translate
+@define('COMMENTS_MODERATE', 'Comments & trackbacks to this entry requires moderation'); // Translate
+@define('THIS_TRACKBACK_NEEDS_REVIEW', 'Warning: This trackback needs approval before it will be displayed'); // Translate
+@define('DELETE_TRACKBACK', 'Delete trackback'); // Translate
+@define('APPROVE_TRACKBACK', 'Approve trackback'); // Translate
+@define('TRACKBACK_APPROVED', 'Trackback #%s has successfully been approved'); // Translate
+@define('TRACKBACK_DELETED', 'Trackback #%s has successfully been deleted'); // Translate
+@define('VIEW', 'View'); // Translate
+@define('COMMENT_ALREADY_APPROVED', 'Comment #%s appears to already have been approved'); // Translate
+@define('COMMENT_EDITED', 'The selected comment has been edited'); // Translate
+@define('HIDE', 'Hide'); // Translate
+@define('TRACKBACK_SPECIFIC_ON_CLICK', 'This link is not meant to be clicked. It contains the trackback URI for this entry. You can use this URI to send ping- & trackbacks from your own blog to this entry. To copy the link, right click and select "Copy Shortcut" in Internet Explorer or "Copy Link Location" in Mozilla.'); // Translate
+@define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login'); // Translate
+@define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!'); // Translate
+@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('PAGE_BROWSE_COMMENTS', 'Page %s of %s, totalling %s comments'); // Translate
+@define('FILTERS', 'Filters'); // Translate
+@define('FIND_ENTRIES', 'Find entries'); // Translate
+@define('FIND_COMMENTS', 'Find comments'); // Translate
+@define('FIND_MEDIA', 'Find media'); // Translate
+@define('FILTER_DIRECTORY', 'Directory'); // Translate
+@define('SORT_BY', 'Sort by'); // Translate
+@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>'); // Translate
+@define('XML_IMAGE_TO_DISPLAY_DESC', 'Links to XML Feeds will be displayed by this image. Leave empty for default, enter \'none\' to disable.'); // 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.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- serendipity_lang_de.inc.php	5 Sep 2004 19:31:00 -0000	1.96
+++ serendipity_lang_de.inc.php	5 Sep 2004 19:56:57 -0000	1.97
@@ -545,6 +545,7 @@
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate
+@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>'); // 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.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_lang_pt.inc.php	5 Sep 2004 19:31:00 -0000	1.34
+++ serendipity_lang_pt.inc.php	5 Sep 2004 19:56:57 -0000	1.35
@@ -544,6 +544,14 @@
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate
+@define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); // Translate
+@define('NUMBER_FORMAT_DECIMALS', '2'); // Translate
+@define('NUMBER_FORMAT_DECPOINT', '.'); // Translate
+@define('NUMBER_FORMAT_THOUSANDS', ','); // Translate
+@define('CATEGORY_DELETED_ARTICLES_MOVED', 'Category #%s deleted. Old articles moved to category #%s'); // Translate
+@define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?'); // Translate
+@define('INSTALL_TOP_AS_LINKS_DESC', '"no": Exits and Referrers are shown as plain text to prevent google spam. "yes": Exits and Referrers are shown as hyperlinks. "default": Use setting from global configuration (recommended).'); // Translate
+@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>'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.415,1.416

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Misplaced <hr>


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -d -r1.415 -r1.416
--- serendipity_functions.inc.php	5 Sep 2004 19:20:36 -0000	1.415
+++ serendipity_functions.inc.php	5 Sep 2004 19:32:53 -0000	1.416
@@ -2345,10 +2345,10 @@
     if (strlen($res) != 0) {
         serendipity_trackback_autodiscover($res, $parsed_loc, $url, $author, $title, $text);
         serendipity_pingback_autodiscover($loc, $res);
-        echo '<hr noshade="noshade" />';
     } else {
         echo '<div>&#8226; ' . TRACKBACK_NO_DATA . '</div>';
     }
+    echo '<hr noshade="noshade" />';
 }
 
 /**

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.12,1.13 serendipity_lang_cs.inc.php,1.59,1.60 serendipity_lang_cz.inc.php,1.59,1.60 serendipity_lang_da.inc.php,1.76,1.77 serendipity_lang_de.inc.php,1.95,1.96 serendipity_lang_en.inc.php,1.78,1.79 serendipity_lang_es.inc.php,1.75,1.76 serendipity_lang_fr.inc.php,1.55,1.56 serendipity_lang_nl.inc.php,1.33,1.34 serendipity_lang_pt.inc.php,1.33,1.34

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

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

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:
Remove now orphaned constant


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- serendipity_lang_cs.inc.php	5 Sep 2004 19:15:07 -0000	1.59
+++ serendipity_lang_cs.inc.php	5 Sep 2004 19:31:00 -0000	1.60
@@ -545,7 +545,6 @@
 @define('TRACKBACK_NO_DATA', 'Target contained no data'); // Translate
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
-@define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- serendipity_lang_da.inc.php	5 Sep 2004 19:15:07 -0000	1.76
+++ serendipity_lang_da.inc.php	5 Sep 2004 19:31:00 -0000	1.77
@@ -540,7 +540,6 @@
 @define('TRACKBACK_NO_DATA', 'Target contained no data'); // Translate
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
-@define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- serendipity_lang_fr.inc.php	5 Sep 2004 19:15:07 -0000	1.55
+++ serendipity_lang_fr.inc.php	5 Sep 2004 19:31:00 -0000	1.56
@@ -544,7 +544,6 @@
 @define('TRACKBACK_NO_DATA', 'Target contained no data'); // Translate
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
-@define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- serendipity_lang_cz.inc.php	5 Sep 2004 19:15:07 -0000	1.59
+++ serendipity_lang_cz.inc.php	5 Sep 2004 19:31:00 -0000	1.60
@@ -543,7 +543,6 @@
 @define('TRACKBACK_NO_DATA', 'Target contained no data'); // Translate
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
-@define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_lang_nl.inc.php	5 Sep 2004 19:15:07 -0000	1.33
+++ serendipity_lang_nl.inc.php	5 Sep 2004 19:31:00 -0000	1.34
@@ -545,7 +545,6 @@
 @define('TRACKBACK_NO_DATA', 'Target contained no data'); // Translate
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
-@define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- serendipity_lang_en.inc.php	5 Sep 2004 19:15:07 -0000	1.78
+++ serendipity_lang_en.inc.php	5 Sep 2004 19:31:00 -0000	1.79
@@ -548,4 +548,4 @@
 @define('DISPLAY_COMMENTS_AS', 'Display comments as');
 
 /* 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.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- serendipity_lang_es.inc.php	5 Sep 2004 19:15:07 -0000	1.75
+++ serendipity_lang_es.inc.php	5 Sep 2004 19:31:00 -0000	1.76
@@ -540,7 +540,6 @@
 @define('TRACKBACK_NO_DATA', 'Target contained no data'); // Translate
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
-@define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_lang_bg.inc.php	5 Sep 2004 19:14:56 -0000	1.12
+++ serendipity_lang_bg.inc.php	5 Sep 2004 19:31:00 -0000	1.13
@@ -345,7 +345,6 @@
 @define('TRACKBACK_NO_DATA', 'Target contained no data'); // Translate
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
-@define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- serendipity_lang_de.inc.php	5 Sep 2004 19:15:07 -0000	1.95
+++ serendipity_lang_de.inc.php	5 Sep 2004 19:31:00 -0000	1.96
@@ -542,7 +542,6 @@
 @define('TRACKBACK_NO_DATA', 'URI enthielt keine Daten');
 @define('TRACKBACK_SIZE', 'URI ist größer als die erlaubten %s Bytes.');
 @define('VIEWMODE_THREADED', 'Als Baumstruktur anzeigen');
-@define('VIEWMODE_CHRONOLOGICAL', 'Chronologisch sortiert anzeigen');
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_lang_pt.inc.php	5 Sep 2004 19:15:07 -0000	1.33
+++ serendipity_lang_pt.inc.php	5 Sep 2004 19:31:00 -0000	1.34
@@ -541,7 +541,6 @@
 @define('TRACKBACK_NO_DATA', 'Target contained no data'); // Translate
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
-@define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
 @define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
 @define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
 @define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.414,1.415

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
- Data from 'messagestack' should be displayed as serendipity_msg_important, in separate <div> tags


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -d -r1.414 -r1.415
--- serendipity_functions.inc.php	5 Sep 2004 19:14:56 -0000	1.414
+++ serendipity_functions.inc.php	5 Sep 2004 19:20:36 -0000	1.415
@@ -1355,10 +1355,11 @@
                     }
 
                     if (isset($serendipity['messagestack']['comments'])) {
+                        foreach ((array)$serendipity['messagestack']['comments'] as $message ) {
 ?>
-            <br />
-            <div class="serendipity_commentsTitle"><?php echo implode('<br />', $serendipity['messagestack']['comments']); ?></div>
+            <div class="serendipity_center serendipity_msg_important"><?php echo $message ?></div>
 <?php
+                        }
                     }
 
                     if (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'true') {

[php-blog-cvs] serendipity serendipity_config.inc.php,1.91,1.92 serendipity_functions.inc.php,1.413,1.414

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

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

Modified Files:
	serendipity_config.inc.php serendipity_functions.inc.php 
Log Message:
- Move control for comment flow out of the _commentTitle class
- Better overview of comment flow control
- Renamed "Chronological" flow to "Linear"


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -d -r1.413 -r1.414
--- serendipity_functions.inc.php	2 Sep 2004 10:46:42 -0000	1.413
+++ serendipity_functions.inc.php	5 Sep 2004 19:14:56 -0000	1.414
@@ -1273,15 +1273,6 @@
                                   false
                     );
 
-                    $comment_viewmode        = 'threaded';
-                    $comment_viewmode_switch = 'chronological';
-                    if (isset($serendipity['GET']['cview']) && $serendipity['GET']['cview'] == $comment_viewmode_switch) {
-                        $temp_viewmode           = $comment_viewmode;
-                        $comment_viewmode        = $comment_viewmode_switch;
-                        $comment_viewmode_switch = $temp_viewmode;
-                    }
-                    $comment_viewmode_url = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . $comm_url . '&serendipity[cview]=' . $comment_viewmode_switch;
-
                     /********** MESSAGES *********/
                     if (defined('DATA_UNSUBSCRIBED')) {
                         echo '<br /><div class="serendipity_center serendipity_msg_notice">'. sprintf(UNSUBSCRIBE_OK, DATA_UNSUBSCRIBED) .'</div><br />';
@@ -1320,7 +1311,21 @@
             <div class="serendipity_comments">
             <br />
             <a id="comments"></a>
-            <div class="serendipity_commentsTitle"><?php echo COMMENTS; ?> (<a href="<?php echo $comment_viewmode_url; ?>"><?php echo constant('VIEWMODE_' . strtoupper($comment_viewmode_switch)); ?></a>)</div>
+            <div class="serendipity_commentsTitle"><?php echo COMMENTS; ?></div>
+                <?php
+                    $comment_viewmode_url = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . $comm_url . '&amp;serendipity[cview]=';
+                    if ( $serendipity['GET']['cview'] == VIEWMODE_LINEAR ) {
+                        $linearLink = COMMENTS_VIEWMODE_LINEAR;
+                        $threadLink = '<a href="'. $comment_viewmode_url . VIEWMODE_THREADED .'#comments">'. COMMENTS_VIEWMODE_THREADED .'</a>';
+                        $viewmode = VIEWMODE_LINEAR;
+                    } else {
+                        $linearLink = '<a href="'. $comment_viewmode_url . VIEWMODE_LINEAR .'#comments">'. COMMENTS_VIEWMODE_LINEAR .'</a>';
+                        $threadLink = COMMENTS_VIEWMODE_THREADED;
+                        $viewmode = VIEWMODE_THREADED;
+                    }
+
+                ?>
+                <div class="serendipity_center"><?php echo DISPLAY_COMMENTS_AS ?> (<?php echo $linearLink ?> | <?php echo $threadLink ?>)</div>
 <?php
                     serendipity_printComments(
                       serendipity_fetchComments(
@@ -1328,7 +1333,7 @@
                       ),
                       (isset($entry['allow_comments']) ? $entry['allow_comments'] : true),
                       true,
-                      $comment_viewmode
+                      $viewmode 
                     );
 
                     if (!empty($serendipity['POST']['preview'])) {
@@ -1559,7 +1564,7 @@
 {
     global $serendipity;
 
-    if ($parentid === 'threaded') {
+    if ($parentid === VIEWMODE_THREADED) {
         $parentid = 0;
     }
 
@@ -1572,7 +1577,7 @@
     $i = 0;
     foreach ($comments as $comment) {
 
-        if ($parentid === 'chronological' || !isset($comment['parent_id']) || $comment['parent_id'] == $parentid) {
+        if ($parentid === VIEWMODE_LINEAR || !isset($comment['parent_id']) || $comment['parent_id'] == $parentid) {
             $i++;
 
             $comment['comment'] = htmlspecialchars(strip_tags($comment['body']));
@@ -1629,7 +1634,7 @@
 ?>
             </div>
 <?php
-                if ($comment['id'] && $parentid !== 'chronological') {
+                if ($comment['id'] && $parentid !== VIEWMODE_LINEAR ) {
                     serendipity_printComments($comments, $allow_comments, $show_admin, $comment['id'], $indent . $i . '.');
                 }
 ?>
@@ -1638,7 +1643,7 @@
         }
     }
 
-    if ($parentid != 0 && $parentid !== 'chronological') {
+    if ($parentid != 0 && $parentid !== VIEWMODE_LINEAR) {
         return true;
     }
 

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- serendipity_config.inc.php	24 Aug 2004 17:32:46 -0000	1.91
+++ serendipity_config.inc.php	5 Sep 2004 19:14:55 -0000	1.92
@@ -90,6 +90,10 @@
 @define('USERLEVEL_CHIEF', 1);
 @define('USERLEVEL_EDITOR', 0);
 
+@define('VIEWMODE_THREADED', 'threaded');
+@define('VIEWMODE_LINEAR', 'linear');
+
+
 /*
  *   Kill the script if we are not installed, and not inside the installer
  */

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.11,1.12 serendipity_lang_cs.inc.php,1.58,1.59 serendipity_lang_cz.inc.php,1.58,1.59 serendipity_lang_da.inc.php,1.75,1.76 serendipity_lang_de.inc.php,1.94,1.95 serendipity_lang_en.inc.php,1.77,1.78 serendipity_lang_es.inc.php,1.74,1.75 serendipity_lang_fr.inc.php,1.54,1.55 serendipity_lang_nl.inc.php,1.32,1.33 serendipity_lang_pt.inc.php,1.32,1.33

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

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16305/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:
- Move control for comment flow out of the _commentTitle class
- Better overview of comment flow control
- Renamed "Chronological" flow to "Linear"


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- serendipity_lang_cs.inc.php	2 Sep 2004 10:46:43 -0000	1.58
+++ serendipity_lang_cs.inc.php	5 Sep 2004 19:15:07 -0000	1.59
@@ -546,6 +546,9 @@
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
 @define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
+@define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
+@define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
+@define('DISPLAY_COMMENTS_AS', 'Display comments as'); // 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.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- serendipity_lang_da.inc.php	2 Sep 2004 10:46:43 -0000	1.75
+++ serendipity_lang_da.inc.php	5 Sep 2004 19:15:07 -0000	1.76
@@ -541,6 +541,9 @@
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
 @define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
+@define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
+@define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
+@define('DISPLAY_COMMENTS_AS', 'Display comments as'); // 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.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- serendipity_lang_fr.inc.php	2 Sep 2004 10:46:43 -0000	1.54
+++ serendipity_lang_fr.inc.php	5 Sep 2004 19:15:07 -0000	1.55
@@ -545,6 +545,9 @@
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
 @define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
+@define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
+@define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
+@define('DISPLAY_COMMENTS_AS', 'Display comments as'); // 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.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- serendipity_lang_cz.inc.php	2 Sep 2004 10:46:43 -0000	1.58
+++ serendipity_lang_cz.inc.php	5 Sep 2004 19:15:07 -0000	1.59
@@ -544,6 +544,9 @@
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
 @define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
+@define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
+@define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
+@define('DISPLAY_COMMENTS_AS', 'Display comments as'); // 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.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_lang_nl.inc.php	2 Sep 2004 10:46:43 -0000	1.32
+++ serendipity_lang_nl.inc.php	5 Sep 2004 19:15:07 -0000	1.33
@@ -546,6 +546,9 @@
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
 @define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
+@define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
+@define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
+@define('DISPLAY_COMMENTS_AS', 'Display comments as'); // 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.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- serendipity_lang_en.inc.php	2 Sep 2004 10:46:43 -0000	1.77
+++ serendipity_lang_en.inc.php	5 Sep 2004 19:15:07 -0000	1.78
@@ -543,8 +543,9 @@
 @define('TRACKBACK_CHECKING', 'Checking <u>%s</u> for possible trackbacks...');
 @define('TRACKBACK_NO_DATA', 'Target contained no data');
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.');
-@define('VIEWMODE_THREADED', 'Switch to threaded view');
-@define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view');
+@define('COMMENTS_VIEWMODE_THREADED', 'Threaded');
+@define('COMMENTS_VIEWMODE_LINEAR', 'Linear');
+@define('DISPLAY_COMMENTS_AS', 'Display comments as');
 
 /* 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.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- serendipity_lang_es.inc.php	2 Sep 2004 10:46:43 -0000	1.74
+++ serendipity_lang_es.inc.php	5 Sep 2004 19:15:07 -0000	1.75
@@ -541,6 +541,9 @@
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
 @define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
+@define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
+@define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
+@define('DISPLAY_COMMENTS_AS', 'Display comments as'); // 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.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_lang_bg.inc.php	2 Sep 2004 10:46:43 -0000	1.11
+++ serendipity_lang_bg.inc.php	5 Sep 2004 19:14:56 -0000	1.12
@@ -346,6 +346,9 @@
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
 @define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
+@define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
+@define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
+@define('DISPLAY_COMMENTS_AS', 'Display comments as'); // 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.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- serendipity_lang_de.inc.php	2 Sep 2004 10:46:43 -0000	1.94
+++ serendipity_lang_de.inc.php	5 Sep 2004 19:15:07 -0000	1.95
@@ -543,6 +543,9 @@
 @define('TRACKBACK_SIZE', 'URI ist größer als die erlaubten %s Bytes.');
 @define('VIEWMODE_THREADED', 'Als Baumstruktur anzeigen');
 @define('VIEWMODE_CHRONOLOGICAL', 'Chronologisch sortiert anzeigen');
+@define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
+@define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
+@define('DISPLAY_COMMENTS_AS', 'Display comments as'); // 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.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_lang_pt.inc.php	2 Sep 2004 10:46:43 -0000	1.32
+++ serendipity_lang_pt.inc.php	5 Sep 2004 19:15:07 -0000	1.33
@@ -542,6 +542,9 @@
 @define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate
 @define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate
 @define('VIEWMODE_CHRONOLOGICAL', 'Switch to chronological view'); // Translate
+@define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate
+@define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate
+@define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.3,1.4

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
Fix typo and static text


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_event_spamblock.php	3 Sep 2004 23:24:20 -0000	1.3
+++ serendipity_event_spamblock.php	4 Sep 2004 18:56:36 -0000	1.4
@@ -6,10 +6,11 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'A varity of methods to prevent comment spam');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY', 'SPAM Prevention detected invalid message. Comment not added.');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_IP', 'SPAM Prevention asks you to not mass-post comments to this blog. Comment not added.');
-        @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE', 'Do not allow doublicate comments');
+        @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE', 'Do not allow duplicate comments');
         @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE_DESC', 'Do not allow users to submit a comment which contains the same body as an already submitted comment');
         @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH', 'Emergency comment shutdown');
         @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH_DESC', 'Temporarily disable comments for all entries. Useful if your blog is under spam attack.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH_NOTICE', 'This blog is in "Emergency Comment Blockage Mode", please come back another time');
         @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD', 'IP block interval');
         @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD_DESC', 'Only allow an IP to submit a comment every n minutes. Useful to prevent comment floods.');
         break;
@@ -39,7 +40,6 @@
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_BODYCLONE);
                 $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_BODYCLONE_DESC);
                 $propbag->add('default', true);
-
                 break;
 
             case 'killswitch':
@@ -78,7 +78,7 @@
 
                         if ( $this->get_config('killswitch', false) === true ) {
                             $eventData = array('allow_comments' => false);
-                            $serendipity['messagestack']['comments'][] = 'This blog is in "Emergency Comment Blockage Mode", please come back another time';
+                            $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH_NOTICE;
                             return false;
                         }
 

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.2,1.3

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
- Add configuration GUI to spamkiller
- Add 'Emergency comment shutdown' option, which disables comment submission for all entries


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_event_spamblock.php	3 Sep 2004 15:00:17 -0000	1.2
+++ serendipity_event_spamblock.php	3 Sep 2004 23:24:20 -0000	1.3
@@ -2,11 +2,16 @@
 
 switch ($serendipity['lang']) {
     default:
-        @define('PLUGIN_EVENT_SPAMBLOCK_TITLE', 'Spam-Protection');
-        @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'Protection of comment spam, ... (ALPHA)');
+        @define('PLUGIN_EVENT_SPAMBLOCK_TITLE', 'Spam Protector');
+        @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'A varity of methods to prevent comment spam');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY', 'SPAM Prevention detected invalid message. Comment not added.');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_IP', 'SPAM Prevention asks you to not mass-post comments to this blog. Comment not added.');
-
+        @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE', 'Do not allow doublicate comments');
+        @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE_DESC', 'Do not allow users to submit a comment which contains the same body as an already submitted comment');
+        @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH', 'Emergency comment shutdown');
+        @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH_DESC', 'Temporarily disable comments for all entries. Useful if your blog is under spam attack.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD', 'IP block interval');
+        @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD_DESC', 'Only allow an IP to submit a comment every n minutes. Useful to prevent comment floods.');
         break;
 }
 
@@ -23,8 +28,41 @@
         $propbag->add('event_hooks',    array(
             'frontend_saveComment' => true
         ));
+        $propbag->add('configuration', array('bodyclone', 'killswitch', 'ipflood'));
+    }
+
+    function introspect_config_item($name, &$propbag)
+    {
+        switch($name) {
+            case 'bodyclone':
+                $propbag->add('type', 'boolean');
+                $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_BODYCLONE);
+                $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_BODYCLONE_DESC);
+                $propbag->add('default', true);
+
+                break;
+
+            case 'killswitch':
+                $propbag->add('type', 'boolean');
+                $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH);
+                $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH_DESC);
+                $propbag->add('default', false);
+                break;
+
+            case 'ipflood':
+                $propbag->add('type', 'string');
+                $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_IPFLOOD);
+                $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_IPFLOOD_DESC);
+                $propbag->add('default', 2);
+                break;
+
+            default:
+                    return false;
+        }
+        return true;
     }
 
+
     function generate_content(&$title) {
         $title = PLUGIN_EVENT_SPAMBLOCK_TITLE;
     }
@@ -38,22 +76,32 @@
                 case 'frontend_saveComment':
                     if (!is_array($eventData) || serendipity_db_bool($eventData['allow_comments'])) {
 
-                        // Check for identical comments.
-                        $query = "SELECT count(id) AS counter FROM {$serendipity['dbPrefix']}comments WHERE body = '" . serendipity_db_escape_string($addData['comment']) . "'";
-                        $row   = serendipity_db_query($query, true);
-                        if (is_array($row) && $row['counter'] > 0) {
+                        if ( $this->get_config('killswitch', false) === true ) {
                             $eventData = array('allow_comments' => false);
-                            $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
+                            $serendipity['messagestack']['comments'][] = 'This blog is in "Emergency Comment Blockage Mode", please come back another time';
                             return false;
                         }
 
+                        // Check for identical comments.
+                        if ( $this->get_config('bodyclone', true) === true ) {
+                            $query = "SELECT count(id) AS counter FROM {$serendipity['dbPrefix']}comments WHERE body = '" . serendipity_db_escape_string($addData['comment']) . "'";
+                            $row   = serendipity_db_query($query, true);
+                            if (is_array($row) && $row['counter'] > 0) {
+                                $eventData = array('allow_comments' => false);
+                                $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
+                                return false;
+                            }
+                        }
+
                         // Check last IP
-                        $query = "SELECT max(timestamp) AS last_post FROM {$serendipity['dbPrefix']}comments WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'";
-                        $row   = serendipity_db_query($query, true);
-                        if (is_array($row) && $row['last_post'] > (time() - 120)) {
-                            $eventData = array('allow_comments' => false);
-                            $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_IP;
-                            return false;
+                        if ( $this->get_config('ipflood', 2) != 0 ) {
+                            $query = "SELECT max(timestamp) AS last_post FROM {$serendipity['dbPrefix']}comments WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'";
+                            $row   = serendipity_db_query($query, true);
+                            if (is_array($row) && $row['last_post'] > (time() - $this->get_config('ipflood', 2)*60)) {
+                                $eventData = array('allow_comments' => false);
+                                $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_IP;
+                                return false;
+                            }
                         }
                     }
 

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.43,1.44

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

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

Modified Files:
	serendipity_admin_plugins.inc.php 
Log Message:
Fix more problems with default values


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- serendipity_admin_plugins.inc.php	3 Sep 2004 23:01:19 -0000	1.43
+++ serendipity_admin_plugins.inc.php	3 Sep 2004 23:12:48 -0000	1.44
@@ -339,16 +339,18 @@
         $cbag = new serendipity_property_bag;
         $plugin->introspect_config_item($config_item, $cbag);
 
-        $cname    = htmlspecialchars($cbag->get('name'));
-        $cdesc    = htmlspecialchars($cbag->get('description'));
-        $value    = $plugin->get_config($config_item, 'unset');
-        $is_unset = false;
+        $cname      = htmlspecialchars($cbag->get('name'));
+        $cdesc      = htmlspecialchars($cbag->get('description'));
+        $value      = $plugin->get_config($config_item, 'unset');
+
+        /* Apparently no value was set for this config item */
         if ($value === 'unset') {
+            /* Try and the default value for the config item */
             $value = $cbag->get('default');
-            $is_unset = true;
-            if (empty($value)) {
-                // Backwards compatibility to Plugins with no default property bag item
-                $value    = $plugin->get_config($config_item, false, true);
+           
+            /* Still, we don't have a value, try and get (bool)false - from an old plugin */ 
+            if ($value === '') {
+                $value = $plugin->get_config($config_item, false, true);
             }
         }
         $hvalue   = (isset($_POST['serendipity']['plugin'][$config_item]) ? htmlspecialchars($_POST['serendipity']['plugin'][$config_item]) : htmlspecialchars($value));
@@ -439,7 +441,7 @@
 
                     if ($radio_value == 'true' && ($hvalue === '1' || $hvalue === 'true')) {
                         $checked = " checked";
-                    } elseif ($radio_value == 'false' && ($hvalue === '' || $hvalue === 'false') || $is_unset === true) {
+                    } elseif ($radio_value == 'false' && ($hvalue === '' || $hvalue === 'false')) {
                         $checked = " checked";
                     } elseif ($radio_value == $hvalue) {
                         $checked = " checked";

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.42,1.43

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

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

Modified Files:
	serendipity_admin_plugins.inc.php 
Log Message:
Fix broken boolean logic when the value was false or no value was set


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- serendipity_admin_plugins.inc.php	30 Aug 2004 18:56:19 -0000	1.42
+++ serendipity_admin_plugins.inc.php	3 Sep 2004 23:01:19 -0000	1.43
@@ -436,12 +436,15 @@
                     $id = htmlspecialchars($config_item . $radio_value);
                     $counter++;
                     $checked = "";
-                    if ($radio_value == 'true' && $hvalue == 1)
+
+                    if ($radio_value == 'true' && ($hvalue === '1' || $hvalue === 'true')) {
                         $checked = " checked";
-                    if ($radio_value == 'false' && $is_unset == false && $hvalue == false)
+                    } elseif ($radio_value == 'false' && ($hvalue === '' || $hvalue === 'false') || $is_unset === true) {
                         $checked = " checked";
-                    if ($radio_value == $hvalue)
+                    } elseif ($radio_value == $hvalue) {
                         $checked = " checked";
+                    }
+
                     if ($counter == 1) {
 ?>
                 <div>

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.1,1.2

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
* Output when a message was not stored.
* Disallow mass-posting of comments. Only one comment per IP every 2 minutes is allowed. That's pretty much the only measurement I know of which effectively blogs multi-comment spam. Referer detection and content analysis can be tricked to easily. Only kaptchas will block that kind of abuse...


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_spamblock.php	1 Sep 2004 14:15:10 -0000	1.1
+++ serendipity_event_spamblock.php	3 Sep 2004 15:00:17 -0000	1.2
@@ -4,6 +4,9 @@
     default:
         @define('PLUGIN_EVENT_SPAMBLOCK_TITLE', 'Spam-Protection');
         @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'Protection of comment spam, ... (ALPHA)');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY', 'SPAM Prevention detected invalid message. Comment not added.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_IP', 'SPAM Prevention asks you to not mass-post comments to this blog. Comment not added.');
+
         break;
 }
 
@@ -34,11 +37,23 @@
             switch($event) {
                 case 'frontend_saveComment':
                     if (!is_array($eventData) || serendipity_db_bool($eventData['allow_comments'])) {
+
                         // Check for identical comments.
                         $query = "SELECT count(id) AS counter FROM {$serendipity['dbPrefix']}comments WHERE body = '" . serendipity_db_escape_string($addData['comment']) . "'";
                         $row   = serendipity_db_query($query, true);
                         if (is_array($row) && $row['counter'] > 0) {
                             $eventData = array('allow_comments' => false);
+                            $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
+                            return false;
+                        }
+
+                        // Check last IP
+                        $query = "SELECT max(timestamp) AS last_post FROM {$serendipity['dbPrefix']}comments WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'";
+                        $row   = serendipity_db_query($query, true);
+                        if (is_array($row) && $row['last_post'] > (time() - 120)) {
+                            $eventData = array('allow_comments' => false);
+                            $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_IP;
+                            return false;
                         }
                     }
 

[php-blog-cvs] serendipity/templates/mt3-independence style.css,1.7,1.8

[Evan N. <tad...@us...>]

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

Modified Files:
	style.css 
Log Message:
XML is case sensitive, and since all XHTML elements are lowercase we have to use lowercase in the CSS to select them. I think I got them all...

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt3-independence/style.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- style.css	7 Aug 2004 16:33:54 -0000	1.7
+++ style.css	2 Sep 2004 17:42:00 -0000	1.8
@@ -34,21 +34,21 @@
     background-color: #ffffff;
 }
 
-BODY {
+body {
     margin: 0px 0px 20px 0px;
     background-color: #0F314E;
 }
 
-INPUT, TEXTAREA {
+input, textarea {
     font-size: x-small;
     font-family: verdana, arial, helvetica, sans-serif;
 }
 
-TH, TD {
+td, td {
     font-size: x-small;
 }
 
-P, TD, TH, DIV, SPAN {
+p, td, th, div, span {
     font-family: verdana, arial, helvetica, sans-serif;
 }
 
@@ -168,15 +168,15 @@
     border: 0px;
 }
 
-TD.serendipity_commentsLabel {
+td.serendipity_commentsLabel {
     font-size: x-small;
     font-weight: bold;
     vertical-align: top;
 }
 
-TD.serendipity_commentsValue input,
-TD.serendipity_commentsValue select,
-TD.serendipity_commentsValue textarea {
+td.serendipity_commentsValue input,
+td.serendipity_commentsValue select,
+td.serendipity_commentsValue textarea {
     width: 99%;
     border: 1px solid #333;
     padding: 2px;
@@ -205,7 +205,7 @@
     padding-left: 5px;
 }
 
-TD.serendipity_admin {
+td.serendipity_admin {
     padding: 10px;
 }
 
@@ -231,24 +231,24 @@
     color: #B22222;
     }
 
-TABLE.serendipity_calendar TD {
+table.serendipity_calendar td {
     text-align: center;
 }
-TABLE.serendipity_calendar A {
+table.serendipity_calendar a {
     text-decoration:underline;
 }
 
-TABLE.serendipity_calendar A:hover {
+table.serendipity_calendar a:hover {
     text-decoration: none;
 }
 
-TD.serendipity_weekDayName {
+td.serendipity_weekDayName {
     text-align: center;
     font-weight: normal;
 }
-TD.serendipity_calendarHeader A:link,
-TD.serendipity_calendarHeader A:visited,
-TD.serendipity_calendarHeader A:hover {
+td.serendipity_calendarHeader a:link,
+td.serendipity_calendarHeader a:visited,
+td.serendipity_calendarHeader a:hover {
     color: #B22222;
     font-family: Verdana, Arial, sans-serif;
     font-size: x-small;
@@ -263,7 +263,7 @@
     text-align: center;
 }
 
-div.serendipityPlug A {
+div.serendipityPlug a {
     text-decoration: none;
     border: 0px;
 }

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

[Evan N. <tad...@us...>]

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

Modified Files:
	style.css 
Log Message:
XML is case sensitive, and since all XHTML elements are lowercase we have to use lowercase in the CSS to select them. I think I got them all...

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt3-gettysburg/style.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- style.css	7 Aug 2004 16:33:54 -0000	1.3
+++ style.css	2 Sep 2004 17:41:59 -0000	1.4
@@ -34,21 +34,21 @@
     background-color: #FAFFFF;
 }
 
-BODY {
+body {
 	margin: 0px 0px 20px 0px;
 	background-color: #8FABBE;
 }
 
-INPUT, TEXTAREA {
+input, textarea {
     font-size: x-small;
     font-family: verdana, arial, helvetica, sans-serif;
 }
 
-TH, TD {
+th, td {
     font-size: x-small;
 }
 
-P, TD, TH, DIV, SPAN {
+p, td, th, div, span {
     font-family: verdana, arial, helvetica, sans-serif;
 }
 
@@ -172,15 +172,15 @@
     border: 0px;
 }
 
-TD.serendipity_commentsLabel {
+td.serendipity_commentsLabel {
     font-size: x-small;
     font-weight: bold;
     vertical-align: top;
 }
 
-TD.serendipity_commentsValue input,
-TD.serendipity_commentsValue select,
-TD.serendipity_commentsValue textarea {
+td.serendipity_commentsValue input,
+td.serendipity_commentsValue select,
+td.serendipity_commentsValue textarea {
     width: 99%;
     border: 1px solid #333;
     padding: 2px;
@@ -209,7 +209,7 @@
     margin-bottom: 5px;
 }
 
-TD.serendipity_admin {
+td.serendipity_admin {
     padding: 10px;
 }
 
@@ -235,31 +235,31 @@
 	color: #006699;
 	}
 
-TABLE.serendipity_calendar TD {
+table.serendipity_calendar td {
     font-size: x-small;
     text-align: center;
     padding: 3px;
 }
-TABLE.serendipity_calendar A {
+table.serendipity_calendar a {
     font-weight: bold;
     text-decoration:underline;
 }
 
-TABLE.serendipity_calendar A:hover {
+table.serendipity_calendar a:hover {
     text-decoration: none;
 }
 
-TD.serendipity_weekDayName {
+td.serendipity_weekDayName {
     font-size: x-small;
     font-weight:bold;
 }
-TD.serendipity_calendarHeader A:link,
-TD.serendipity_calendarHeader A:visited,
-TD.serendipity_calendarHeader A:hover {
+td.serendipity_calendarHeader a:link,
+td.serendipity_calendarHeader a:visited,
+td.serendipity_calendarHeader a:hover {
     border: 0;
     text-decoration: none;
 }
-div.serendipityPlug, div.serendipityPlug A {
+div.serendipityPlug, div.serendipityPlug a {
     font-size: 11px;
     text-decoration: none;
     border: 0px;