php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/lang serendipity_lang_es.inc.php,1.77.2.6,1.77.2.7

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_lang_es.inc.php 
Log Message:
updated spanish translation


Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.77.2.6
retrieving revision 1.77.2.7
diff -u -d -r1.77.2.6 -r1.77.2.7
--- serendipity_lang_es.inc.php	27 Oct 2004 08:54:50 -0000	1.77.2.6
+++ serendipity_lang_es.inc.php	27 Oct 2004 09:13:57 -0000	1.77.2.7
@@ -9,17 +9,18 @@
 #                                                                        #
 # Translated by Luis Cervantes <Lui...@on...>                   #
 # Traducido por Luis Cervantes <Lui...@on...>                   #
+# Traducido por Manuel García <len...@gm...>                      #
 #                                                                        #
 ##########################################################################
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'spanish');
-@define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
+@define('DATE_LOCALES', 'spanish, sp, es, es_ES, es_ES.ISO_8859-1, es-ES');
+@define('DATE_FORMAT_ENTRY', '%A, %e de %B de %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'es');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Suite de Administración de Serendipity');
-@define('HAVE_TO_BE_LOGGED_ON', 'Debes identificarte para ver esta pagina');
+@define('HAVE_TO_BE_LOGGED_ON', 'Debes identificarte para ver esta página');
 @define('APPEARANCE', 'Apariencia');
 @define('MANAGE_STYLES', 'Control de estilos');
 @define('CONFIGURE_PLUGINS', 'Configurar Plugins');
@@ -46,13 +47,13 @@
 @define('SEND_MAIL_TO', 'Enviar correo a');
 @define('NEW_TRACKBACK_TO', 'Nuevo trackback para');
 @define('NEW_COMMENT_TO', 'Comentario nuevo para');
-@define('RECENT', 'Recientes..');
-@define('OLDER', 'Antiguos..');
+@define('RECENT', 'Recientes...');
+@define('OLDER', 'Antiguos...');
 @define('DONE', 'Aplicar');
 @define('WELCOME_BACK', 'Bienvenido de nuevo,');
-@define('RUNNING', 'Estas usando Serendipity v.');
+@define('RUNNING', 'Estás usando Serendipity v.');
 @define('ADD_PLUGIN', 'Añadir plugin');
-@define('TITLE', 'Titulo');
+@define('TITLE', 'Título');
 @define('DESCRIPTION', 'Descripción');
 @define('PLACEMENT', 'Localización');
 @define('DELETE', 'Borrar');
@@ -66,11 +67,11 @@
 @define('EDIT_ENTRIES', 'Editar posts');
 @define('CATEGORIES', 'Categorías');
 @define('EDIT_CATEGORIES', 'Control de Categorías');
-@define('WARNING_THIS_BLAHBLAH', "ATENCIÓN:\\nPuede tardar si hay muchas imágenes que no están en miniatura.");
+@define('WARNING_THIS_BLAHBLAH', "ATENCIÓN:\\nPuede tardar si hay muchas imágenes que no tienen miniatura.");
 @define('CREATE_THUMBS', 'Crear las miniaturas');
 @define('MANAGE_IMAGES', 'Control de imágenes');
 @define('ADMIN_INTERFACE', 'Panel de Administración');
-@define('SERENDIPITY_AUTHORING_SUITE', 'Suite de Serendipity para autoría ');
+@define('SERENDIPITY_AUTHORING_SUITE', 'Suite de Serendipity para autoría');
 @define('NAME', 'Nombre');
 @define('EMAIL', 'E-mail');
 @define('HOMEPAGE', 'Url personal');
@@ -96,15 +97,15 @@
 @define('IMAGE', 'Imagen');
 @define('ERROR_FILE_NOT_EXISTS', 'Error: ¡El fichero no existe!');
 @define('ERROR_FILE_EXISTS', 'Error: ¡Un archivo con ese nombre ya existe, selecciona otro!');
-@define('ERROR_SOMETHING', 'Error: Algo esta mal.');
-@define('ADDING_IMAGE', 'Añadiendo imagen..');
+@define('ERROR_SOMETHING', 'Error: Algo está mal.');
+@define('ADDING_IMAGE', 'Añadiendo imagen...');
 @define('THUMB_CREATED_DONE', 'Miniatura creada.<br>Terminado.');
 @define('ERROR_FILE_EXISTS_ALREADY', 'Error: ¡El archivo ya existe en el sistema!');
 @define('GO', '¡Ir!');
 @define('NEWSIZE', 'Nuevo tamaño: ');
 @define('RESIZE_BLAHBLAH', '<b>Cambiar tamaño %s</b><p>');
 @define('ORIGINAL_SIZE', 'Tamaño original: <i>%sx%s</i> pixel');
-@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Aquí puedes ajustar el nuevo tamaño de la imagen. Si quieres mantener las proporciones solo introduce uno de los valores y presiona la tecla tabulador (TAB), de esta forma se ajustara automáticamente:');
+@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Aquí puedes ajustar el nuevo tamaño de la imagen. Si quieres mantener las proporciones solo introduce uno de los valores y presiona la tecla tabulador (TAB), de esta forma se ajustará automáticamente:');
 @define('DATE_FORMAT_1', 'd.m.Y');
 @define('QUICKJUMP_CALENDAR', 'Calendario Rápido');
 @define('QUICKSEARCH', 'Buscar');
@@ -113,17 +114,17 @@
 @define('BROWSE_ARCHIVES', 'Archivos de otros meses');
 @define('TOP_REFERRER', 'Sitios asociados');
 @define('SHOWS_TOP_SITES', 'Muestra los sitios que enlazan a tu weblog');
-@define('TOP_EXITS', 'Salídas');
-@define('SHOWS_TOP_EXIT', 'Muestra las salídas más frecuentes de tu weblog');
-@define('SYNDICATION', 'Sindicar');
-@define('SHOWS_RSS_BLAHBLAH', 'Muestra los enlaces RSS de sindicacion');
+@define('TOP_EXITS', 'Salidas');
+@define('SHOWS_TOP_EXIT', 'Muestra las salidas más frecuentes de tu weblog');
+@define('SYNDICATION', 'Sindicación');
+@define('SHOWS_RSS_BLAHBLAH', 'Muestra los enlaces RSS de sindicación');
 @define('PLUG', 'Plug');
 @define('ADVERTISES_BLAHBLAH', 'Informa del código en el que se basa tu weblog');
 @define('HTML_NUGGET', 'Fragmento de HTML');
 @define('HOLDS_A_BLAHBLAH', 'Prensenta un fragmento de HTML en la barra lateral');
-@define('TITLE_FOR_NUGGET', 'Titulo para el fragmento de HTML');
+@define('TITLE_FOR_NUGGET', 'Título para el fragmento de HTML');
 @define('THE_NUGGET', '¡Fragmento de HTML!');
-@define('SYNDICATE_THIS_BLOG', 'Sindicar');
+@define('SYNDICATE_THIS_BLOG', 'Sindica este blog');
 @define('YOU_CHOSE', 'Eliges %s');
 @define('IMAGE_SIZE', 'Tamaño de la imagen');
 @define('IMAGE_AS_A_LINK', 'Inserción de imagen');
@@ -132,7 +133,7 @@
 @define('TRACKBACK', 'Trackback');
 @define('NO_TRACKBACKS', 'No hay Trackbacks');
 @define('TOPICS_OF', 'Temas de');
-@define('VIEW_FULL', 'Ver mas');
+@define('VIEW_FULL', 'Ver más');
 @define('VIEW_TOPICS', 'Ver temas');
 @define('AT', 'a las');
 @define('SET_AS_TEMPLATE', 'Mantenlo como plantilla');
@@ -141,22 +142,22 @@
 @define('TRACKED', 'Tracked');
 @define('LINK_TO_ENTRY', 'Enlazar al post');
 @define('LINK_TO_REMOTE_ENTRY', 'Enlazar a un post remoto');
-@define('IP_ADDRESS', 'Dirección-IP');
+@define('IP_ADDRESS', 'Dirección IP');
 @define('USER', 'Usuario');
-@define('THUMBNAIL_USING_OWN', 'Usando %s como su miniatura debido a el escaso tamaño.');
+@define('THUMBNAIL_USING_OWN', 'Usando %s como su miniatura debido al escaso tamaño.');
 @define('THUMBNAIL_FAILED_COPY', 'Querías usar %s como tu miniatura, ¡pero ha fallado la copia!');
 @define('AUTHOR', 'Autor');
 @define('LAST_UPDATED', 'Ultima actualización');
 @define('TRACKBACK_SPECIFIC', 'Realiza un Trackback de esta URI para este post');
 @define('DIRECT_LINK', 'Enlace directo a este post');
 @define('COMMENT_ADDED', 'Tu comentario ha sido añadido correctamente. ');
-@define('COMMENT_ADDED_CLICK', 'Pulsa %aquí para volver%s a los comentarios, y %aquí para cerrar%s esta ventana.');
+@define('COMMENT_ADDED_CLICK', 'Pulsa %saquí para volver%s a los comentarios, y %saquí para cerrar%s esta ventana.');
 @define('COMMENT_NOT_ADDED', 'Tu comentario no ha podido ser añadido, la posibilidad de añadir comentarios a este post ha sido desactivada. ');
-@define('COMMENT_NOT_ADDED_CLICK', 'Pulsa %aquí para volver%s a los comentarios, y %aquí para cerrar%s esta ventana');
+@define('COMMENT_NOT_ADDED_CLICK', 'Pulsa %saquí para volver%s a los comentarios, y %saquí para cerrar%s esta ventana');
 @define('COMMENTS_DISABLE', 'No se permiten comentarios a este post');
 @define('COMMENTS_ENABLE', 'Se permiten comentarios a este post');
 @define('COMMENTS_CLOSED', 'El autor no permite añadir comentarios a este post');
-@define('EMPTY_COMMENT', 'Tu comentario esta vacío, %svuelve%s e inténtalo de nuevo');
+@define('EMPTY_COMMENT', 'Tu comentario está vacío, %svuelve%s e inténtalo de nuevo');
 @define('ENTRIES_FOR', 'Posts para %s');
 @define('DOCUMENT_NOT_FOUND', 'El documento %s no se encontró.');
 @define('USERNAME', 'Usuario');
@@ -169,7 +170,7 @@
 @define('SAVE_CHANGES_TO_LAYOUT', 'Guarda los cambios en el diseño');
 @define('COMMENTS_FROM', 'Comentarios para');
 @define('ERROR', 'Error');
-@define('DELETE_SURE', '¿Estas seguro de que quieres eliminar #%s permanentemente?');
+@define('DELETE_SURE', '¿Estás seguro de que quieres eliminar #%s permanentemente?');
 @define('NOT_REALLY', 'Realmente no...');
 @define('DUMP_IT', '¡A la basura!');
 @define('RIP_ENTRY', 'R.I.P, #%s');
@@ -184,9 +185,9 @@
 @define('VIEW_FEED_EXPORT', 'View feed export');
 @define('IMPORT', 'Importar');
 @define('EXPORT', 'Exportar');
-@define('YES', 'Si');
+@define('YES', 'Sí');
 @define('NO', 'No');
-@define('USE_DEFAULT', 'Default');
+@define('USE_DEFAULT', 'Predeterminado');
 @define('CHECK_N_SAVE', 'Revisa y Guarda');
 @define('DIRECTORY_WRITE_ERROR', 'No puedes modificar %s. Comprueba los permisos.');
 @define('DIRECTORY_CREATE_ERROR', 'El directorio %s no existe y no puede ser creado. Crealo manualmente.');
@@ -195,16 +196,16 @@
 @define('FILE_WRITE_ERROR', 'No se puede modificar el archivo %s.');
 @define('FILE_CREATE_YOURSELF', 'Crea el archivo tu mismo o verifica los permisos');
 @define('COPY_CODE_BELOW', '<br />* Tan solo copia el código situado debajo %s dentro %s del directorio:<b><pre>%s</pre></b>' . "\n");
-@define('WWW_USER', 'Cambia la www hacia el usuario que esta ejecutando el servidor web (p.e tu_nombre).');
-@define('BROWSER_RELOAD', 'Una vez hecho esto, pulsa en tu navegador el botón "recargar".');
+@define('WWW_USER', 'Cambia www por el usuario que está ejecutando el servidor web (p.e nobody).');
+@define('BROWSER_RELOAD', 'Una vez hecho esto, pulsa en tu navegador el botón "Recargar".');
 @define('DIAGNOSTIC_ERROR', 'Hemos detectado algunos errores mientras se ejecutaban varias comprobaciones en la información que has introducido:');
-@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity no esta instalado todavía. <a href="%s">Instálalo</a> ahora.');
+@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity no está instalado todavía. <a href="%s">Instálalo</a> ahora.');
 @define('INCLUDE_ERROR', 'Error de Serendipity: no se puede incluir %s - saliendo.');
 @define('DATABASE_ERROR', 'Error de Serendipity: no es posible conectarse a la base de datos - saliendo.');
 @define('ATTEMPT_SETUP_DATABASE', 'Intentando configurar la base de datos...');
-@define('CHECK_DATABASE_EXISTS', 'Comprobando si la base de datos esta en el lugar correcto.  Si ve un mensaje de error de la base de datos sencillamente ignórelo');
+@define('CHECK_DATABASE_EXISTS', 'Comprobando si la base de datos está en el lugar correcto.  Si ve un mensaje de error de la base de datos sencillamente ignórelo');
 @define('CREATE_DATABASE', 'Creando la configuración por defecto de la base de datos...');
-@define('DATABASE_DONE', 'Se termino la creación de la base de datos');
+@define('DATABASE_DONE', 'Se terminó la creación de la base de datos');
 @define('ATTEMPT_WRITE_FILE', 'Intentando modificar el archivo %s...');
 @define('SERENDIPITY_INSTALLED', '%sSerendipity se ha instalado correctamente.%s Recuerde su contraseña: "%s", tu nombre de usuario es "%s".%sPuedes encontrar tu nuevo Blog en PHP <a href="%s">aquí</a>');
 @define('WRITTEN_N_SAVED', 'Configuración modificada y guardada');
@@ -216,7 +217,7 @@
 @define('DELETE_THUMBNAIL', 'Eliminada la imagen miniatura titulada <b>%s</b>');
 @define('FILE_NOT_FOUND', 'No es posible encontrar el archivo titulado <b>%s</b>, ¿es posible que lo haya borrado ya?');
 @define('ABORT_NOW', 'Salir ahora');
-@define('REMOTE_FILE_NOT_FOUND', 'El archivo no fue localizado en el servidor remoto, ¿estas seguro de que la URL: <b>%s</b> es correcta?');
+@define('REMOTE_FILE_NOT_FOUND', 'El archivo no fue localizado en el servidor remoto, ¿estás seguro de que la URL: <b>%s</b> es correcta?');
 @define('FILE_FETCHED', '%s enlazado: %s');
 @define('FILE_UPLOADED', 'El archivo %s fue transferido correctamente: %s');
 @define('WORD_OR', 'O bien...');
@@ -226,12 +227,12 @@
 @define('TOGGLE_ALL', 'Mostrar/Ocultar');
 @define('TOGGLE_OPTION', 'Mostrar/Ocultar');
 @define('SUBSCRIBE_TO_THIS_ENTRY', 'Suscribirse a este post');
-@define('UNSUBSCRIBE_OK', "%s ahora esta suscrito a este post");
+@define('UNSUBSCRIBE_OK', "%s ahora está suscrito a este post");
 @define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Nuevo comentario al post suscrito "%s"');
 @define('SUBSCRIPTION_MAIL', "Hola %s,\n\nHay un nuevo comentario al post \"%s\", titulado \"%s\"\nEl autor es: %s\n\nPuedes encontrar el post aquí: %s\n\nPuedes dejar de recibir información sobre este post haciendo click aquí: %s\n");
 @define('SUBSCRIPTION_TRACKBACK_MAIL', "Hola %s,\n\nHay un nuevo trackback al post \"%s\", titulado \"%s\"\nEl autor es: %s\n\nPuedes encontrar el post aquí: %s\n\nPuedes dejar de recibir información sobre este post haciendo click aquí: %s\n");
 @define('SIGNATURE', "\n-- \n%s esta creado por Serendipity.\nEl mejor blog ;).\nVisita <http://s9y.org> y compruébalo.");
-@define('DATABASE_ALREADY_INSTALLED', 'IGNORADO: La base de datos ya esta instalada');
+@define('DATABASE_ALREADY_INSTALLED', 'IGNORADO: La base de datos ya está instalada');
 @define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
 @define('SYNDICATION_PLUGIN_10', 'RSS 1.0 feed');
 @define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
@@ -242,322 +243,323 @@
 @define('SYNDICATION_PLUGIN_BANNERURL', 'Imagen para el RSS feed');
 @define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Ancho de Imagen');
 @define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Alto de Imagen');
-@define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'E-Mail del webmaster, si esta disponible. (déjalo vacío para no mostrarlo) [RSS 2.0]');
-@define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', 'E-Mail del editor, si esta disponible. (déjalo vacío para no mostrarlo) [RSS 2.0]');
-@define('SYNDICATION_PLUGIN_BANNERURL_DESC', 'URL de la imagen en formato GIF/JPEG/PNG, si esta disponible. (dejándolo vacío se usara el logo de serendipity)');
+@define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'E-Mail del webmaster, si está disponible. (déjalo vacío para no mostrarlo) [RSS 2.0]');
+@define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', 'E-Mail del editor, si está disponible. (déjalo vacío para no mostrarlo) [RSS 2.0]');
+@define('SYNDICATION_PLUGIN_BANNERURL_DESC', 'URL de la imagen en formato GIF/JPEG/PNG, si está disponible. (dejándolo vacío se usara el logo de Serendipity)');
 @define('SYNDICATION_PLUGIN_BANNERWIDTH_DESC', 'en pixels, max. 144');
 @define('SYNDICATION_PLUGIN_BANNERHEIGHT_DESC', 'en pixels, max. 400');
 @define('SYNDICATION_PLUGIN_TTL', 'Campo "ttl" (time-to-live)');
-@define('SYNDICATION_PLUGIN_TTL_DESC', 'Cantidad de minutos, después de los cuales, tu blog no será verificado por ningún site o aplicación externa.(si lo dejas vacío no se mostrara) [RSS 2.0]');
+@define('SYNDICATION_PLUGIN_TTL_DESC', 'Cantidad de minutos, después de los cuales, tu blog no será verificado por ningún site o aplicación externa (si lo dejas vacío no se mostrara) [RSS 2.0]');
 @define('SYNDICATION_PLUGIN_PUBDATE', 'Campo "pubDate"');
 @define('SYNDICATION_PLUGIN_PUBDATE_DESC', '¿Debería el campo "pubDate" estar incluido en un canal RSS para mostrar la fecha del ultimo post?');
 @define('CONTENT', 'Contenido');
 @define('TYPE', 'Tipo');
 @define('DRAFT', 'Borrador');
 @define('PUBLISH', 'Publicar');
-@define('PREVIEW', 'Previsualizacion');
+@define('PREVIEW', 'Previsualización');
 @define('DATE', 'Fecha');
 @define('DATE_FORMAT_2', 'Y-m-d H:i'); // Needs to be ISO 8601 compliant for date conversion!
-@define('DATE_INVALID', 'Atención: La fecha especificada no es valida. Debe tener el formato AAAA-MM-DD HH:MM.');
+@define('DATE_INVALID', 'Atención: La fecha especificada no es válida. Debe tener el formato AAAA-MM-DD HH:MM.');
 @define('CATEGORY_PLUGIN_DESC', 'Muestra la lista de categorías.');
 @define('ALL_AUTHORS', 'Todos los autores');
 @define('CATEGORIES_TO_FETCH', 'Categorías enlazadas');
 @define('CATEGORIES_TO_FETCH_DESC', '¿De que autor quiere enlazar las categorías?');
-@define('PAGE_BROWSE_ENTRIES', 'Pagina %s de %s, en total %s posts');
-@define('PREVIOUS_PAGE', 'Pagina previa');
-@define('NEXT_PAGE', 'Pagina siguiente');
+@define('PAGE_BROWSE_ENTRIES', 'Página %s de %s, en total %s posts');
+@define('PREVIOUS_PAGE', 'Página previa');
+@define('NEXT_PAGE', 'Página siguiente');
 @define('ALL_CATEGORIES', 'Todas las categorías');
 
 /* TRANSLATE */
-@define('WRONG_USERNAME_OR_PASSWORD', 'Wrong username or password');
-@define('HTACCESS_ERROR', 'To check your local webserver installation, serendipity needs to be able to write the file ".htaccess". This was not possible because of permission errors. Please adjust the permissions like this: <br />&nbsp;&nbsp;%s<br />and reload this page.');
-@define('SIDEBAR_PLUGINS', 'Sidebar Plugins');
-@define('EVENT_PLUGINS', 'Event Plugins');
-@define('SYNCING', 'Syncronizing the database with the image folder');
-@define('SYNC_DONE', 'Done (Syncronized %s images).');
-@define('SORT_ORDER', 'Sort order');
-@define('SORT_ORDER_NAME', 'Filename');
-@define('SORT_ORDER_EXTENSION', 'File extension');
-@define('SORT_ORDER_SIZE', 'Filesize');
-@define('SORT_ORDER_WIDTH', 'Image width');
-@define('SORT_ORDER_HEIGHT', 'Image height');
-@define('SORT_ORDER_DATE', 'Upload date');
-@define('SORT_ORDER_ASC', 'Ascending');
-@define('SORT_ORDER_DESC', 'Descending');
-@define('THUMBNAIL_SHORT', 'Thumb');
+@define('WRONG_USERNAME_OR_PASSWORD', 'Usuario o contraseña erróneo');
+@define('HTACCESS_ERROR', 'Para verificar tu instalación del servidor web, serendipity necesita ser capaz de escribir en el fichero ".htaccess". Esto no fue posible debido a errores de permisos. Por favor, ajusta los permisos como: <br />&nbsp;%s<br />y recarga esta página.');
+@define('SIDEBAR_PLUGINS', 'Plugins de barra lateral');
+@define('EVENT_PLUGINS', 'Plugins de eventos');
+@define('SYNCING', 'SIncronizando la base de datos con el directorio de imágenes.');
+@define('SYNC_DONE', 'Hecho (Sincronizadas %s imágenes).');
+@define('SORT_ORDER', 'Clasificar por');
+@define('SORT_ORDER_NAME', 'Nombre de fichero');
+@define('SORT_ORDER_EXTENSION', 'Extensión de fichero');
+@define('SORT_ORDER_SIZE', 'Tamaño de fichero');
+@define('SORT_ORDER_WIDTH', 'Anchura de imagen');
+@define('SORT_ORDER_HEIGHT', 'Altura de imagen');
+@define('SORT_ORDER_DATE', 'Fecha de subida');
+@define('SORT_ORDER_ASC', 'Ascendente');
+@define('SORT_ORDER_DESC', 'Descendente');
+@define('THUMBNAIL_SHORT', 'Miniatura');
 @define('ORIGINAL_SHORT', 'Orig.');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevent HTTP caching');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".');
-@define('APPLY_MARKUP_TO', 'Apply markup to %s');
-@define('CALENDAR_BEGINNING_OF_WEEK', 'Beginning of the week');
-@define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity has deteceted that your configuration is currently installed with version %s, however serendipity itself is installed as version %s, you need to upgrade! <a href="%s">Click here</a>');
-@define('SERENDIPITY_UPGRADER_WELCOME', 'Hi, and welcome to the Serendipity upgrade agent.');
-@define('SERENDIPITY_UPGRADER_PURPOSE', 'I am here to help you upgrade your Serendipity %s installation.');
-@define('SERENDIPITY_UPGRADER_WHY', 'You are seeing this message because you have just installed Serendipity %s, but have not yet upgraded your database installation to fit this version');
-@define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Database updates (%s)');
-@define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'I have found the following .sql files which needs to be run before you can continue normal operation of Serendipity');
-@define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Version specific tasks');
-@define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'No version specific tasks found');
-@define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', 'Do you wish me perform the above tasks?');
-@define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'No, I will run them manually');
-@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Yes, please do so');
-@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'It appears you do not need any upgrades run');
-@define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Consider Serendipity upgraded');
-@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'You have ignored the upgrade stage of Serendipity, please make sure your database is correctly installed, and scheduled functions are run');
-@define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Your Serendipity installation is now upgraded to version %s');
-@define('SERENDIPITY_UPGRADER_RETURN_HERE', 'You can return to your blog by clicking %shere%s');
-@define('MANAGE_USERS', 'Manage users');
-@define('EDIT_USERS', 'Edit users');
-@define('CREATE_USERS', 'Create users');
-@define('CREATE_NEW_USER', 'Create new user');
-@define('CREATE_NOT_AUTHORIZED', 'You cannot modify users with the same userlevel as yourself');
-@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'You cannot create users with a higher userlevel than yourself');
-@define('CREATED_USER', 'A new user %s has been created');
-@define('MODIFIED_USER', 'The properties of user %s have been changed');
-@define('USER_SELF_INFO', 'logged in as %s, level %s');
-@define('USER_LEVEL', 'Userlevel');
-@define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.');
-@define('DELETED_USER', 'User #%d %s deleted.');
-@define('LIMIT_TO_NUMBER', 'How many items should be displayed?');
-@define('FILTER', 'Filter');
-@define('ENTRIES_PER_PAGE', 'entries per page');
-@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('ALREADY_SUBCATEGORY', '%s is a already a subcategory of %s.');
-@define('PARENT_CATEGORY', 'Parent category');
-@define('REPLY', 'Reply');
-@define('IN_REPLY_TO', 'In reply to');
-@define('TOP_LEVEL', 'Top level');
+@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevenir "HTTP caching"');
+@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Configurado como "true" esto sugerirá el enlace a tu feed RSS para no permitir a los clientes ahorrar ancho de banda cacheando las peticiones del feed RSS. Se sugiere configurar esto como "false".');
+@define('APPLY_MARKUP_TO', 'Aplicar marca a %s');
+@define('CALENDAR_BEGINNING_OF_WEEK', 'Inicio de la semana');
+@define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity ha detectado que tu configuración instalada actual es %s, sin embargo serendipity está instalado como versión %, ¡necesitas actualizar! <a href="%s">Haz click aquí</a>');
+@define('SERENDIPITY_UPGRADER_WELCOME', 'Hola y bienvenido al agente de actualización de Serendipity.');
+@define('SERENDIPITY_UPGRADER_PURPOSE', 'Estoy aquí para ayudarte a actualizar tu instalación %s de Serendipity.');
+@define('SERENDIPITY_UPGRADER_WHY', 'Estás viendo este mensaje porque has instalado Serendipity $, pero no has actualizado la instalación de la base de datos para coincidir con esta versión');
+@define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Actualizaciones de base de datos (%s)');
+@define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'He encontrado los siguientes ficheros .sql que son necesarios ejecutar antes de que puedas continuar usando normalmente Serendipity');
+@define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Tareas específicas de la versión');
+@define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'No se ha encontrado tareas específicas de la versión');
+@define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', '¿Quieres que realice las tareas descritas?');
+@define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'No, las ejecutaré manualmente');
+@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Sí, por favor');
+@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'Parece que no necesitas ejecutar ninguna actualización');
+@define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Considera actualizado Serendipity');
+@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Has ignorado el estadío de actualización de Serendipity, asegúrate que tu base de datos está correctamente instalada y que las funciones planeadas son ejecutadas.');
+@define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Tu instalación de Serendipity se ha actualizado a la versión %s');
+@define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Puedes volver a tu blog haciendo click %saquí%s');
+@define('MANAGE_USERS', 'Gestiona usuarios');
+@define('EDIT_USERS', 'Edita usuarios');
+@define('CREATE_USERS', 'Crea usuarios');
+@define('CREATE_NEW_USER', 'Crea nuevo usuario');
+@define('CREATE_NOT_AUTHORIZED', 'No puedes modificar usuarios con el mismo nivel que el tuyo');
+@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'No puedes crear usuarios con un nivel mayor que el tuyo');
+@define('CREATED_USER', 'Un nuevo usuario %s se ha creado');
+@define('MODIFIED_USER', 'Las propiedades del usuario %s se han cambiado');
+@define('USER_SELF_INFO', 'conectado como %s, nivel %s');
+@define('USER_LEVEL', 'Nivel de usuario');
+@define('DELETE_USER', 'Estás a punto de borrar el usuario #%d %s. ¿En serio? Esto no mostrará las entradas escritas por él.');
+@define('DELETED_USER', 'Usuario #%d %s borrado.');
+@define('LIMIT_TO_NUMBER', '¿Cuántos deberían mostrarse?');
+@define('FILTER', 'Filtro');
+@define('ENTRIES_PER_PAGE', 'entradas por página');
+@define('DIRECTORIES_AVAILABLE', 'En la lista de subdirectorios disponibles puedes hacer click en el nombre de un directorio para crear un nuevo directorio en esa estructura.');
+@define('ALL_DIRECTORIES', 'todos los directorios');
+@define('MANAGE_DIRECTORIES', 'Gestiona directorios');
+@define('DIRECTORY_CREATED', 'Directorio <strong>%s</strong> creado.');
+@define('NEW_DIRECTORY', 'Crear nuevo directorio');
+@define('PARENT_DIRECTORY', 'Directorio superior');
+@define('DELETE_DIRECTORY', 'Borrar este directorio');
+@define('CONFIRM_DELETE_DIRECTORY', '¿Estás seguro de que quieres eliminar todos los contenidos del directorio %s?');
+@define('ERROR_NO_DIRECTORY', 'Error: Directorio %s no existe');
+@define('FORCE_DELETE', 'Fuerza la eliminación de ficheros que no están dentro de la base de datos de medios');
+@define('CHECKING_DIRECTORY', 'Verificar ficheros en directorio %s');
+@define('DELETING_FILE', 'Borrando fichero %s...');
+@define('ERROR_DIRECTORY_NOT_EMPTY', 'No puedo borrar un directorio con archivos. Marca "forzar borrado" si quieres eliminar también los ficheros e inténtalo de nuevo. Los ficheros que existen son:');
+@define('DIRECTORY_DELETE_FAILED', 'Eliminación de directorio %s fallida. Revisa los permisos o los mensajes anteriores.');
+@define('DIRECTORY_DELETE_SUCCESS', 'Directorio %s eliminado exitosamente.');
+@define('SKIPPING_FILE_EXTENSION', 'Saltando fichero: falta extensión en %s.');
+@define('SKIPPING_FILE_UNREADABLE', 'Saltando fichero: %s no se puede leer.');
+@define('FOUND_FILE', 'Encontrado fichero nuevo/modificado: %s.');
+@define('ALREADY_SUBCATEGORY', '%s es ya una subcategoría de %s.');
+@define('PARENT_CATEGORY', 'Categoría superior');
+@define('REPLY', 'Responder');
+@define('IN_REPLY_TO', 'En respuesta a');
+@define('TOP_LEVEL', 'Nivel superior');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
-@define('PERMISSIONS', 'Permissions');
+@define('PERMISSIONS', 'Permisos');
 
 /* 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', 'Opciones de la base de datos');
+@define('INSTALL_CAT_DB_DESC', 'Introduce aquí la información de tu base de datos. Serendipity la necesita para funcionar');
+@define('INSTALL_DBTYPE', 'Tipo');
+@define('INSTALL_DBTYPE_DESC', 'El tipo de gestor de la base de datos');
+@define('INSTALL_DBHOST', 'Servidor');
+@define('INSTALL_DBHOST_DESC', 'El servidor donde está el gestor de la base de datos');
+@define('INSTALL_DBUSER', 'Usuario');
+@define('INSTALL_DBUSER_DESC', 'El usuario que conecta a la base de datos');
+@define('INSTALL_DBPASS', 'Contraseña');
+@define('INSTALL_DBPASS_DESC', 'La contraseña para el usuario');
+@define('INSTALL_DBNAME', 'Nombre');
+@define('INSTALL_DBNAME_DESC', 'El nombre de la base de datos');
+@define('INSTALL_DBPREFIX', 'Prefijo');
+@define('INSTALL_DBPREFIX_DESC', 'Prefijo para los nombres de las tablas, p.ej. 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', 'Rutas');
+@define('INSTALL_CAT_PATHS_DESC', 'Varias rutas a ficheros y directorios esenciales. ¡No olvides la barra final en los directorios!');
+@define('INSTALL_FULLPATH', 'Ruta completa');
+@define('INSTALL_FULLPATH_DESC', 'La ruta completa y absoluta a tu instalación de serendipity');
+@define('INSTALL_UPLOADPATH', 'Ruta para los ficheros subidos');
+@define('INSTALL_UPLOADPATH_DESC', 'Todos los ficheros subidos irán aquí, relativo a  \'Ruta completa\' - típicamente \'uploads/\'');
+@define('INSTALL_RELPATH', 'Ruta relativa');
+@define('INSTALL_RELPATH_DESC', 'Ruta de serendipity para tu navegador, típicamente \'/serendipity/\'');
+@define('INSTALL_RELTEMPLPATH', 'Ruta relativa para los estilos');
+@define('INSTALL_RELTEMPLPATH_DESC', 'Ruta al directorio que contiene tus estilos - Relativa a la \'ruta relativa\'');
+@define('INSTALL_RELUPLOADPATH', 'Ruta relativa para los ficheros subidos');
+@define('INSTALL_RELUPLOADPATH_DESC', 'Ruta de los ficheros subidos - Relativa a la \'ruta relativa\'');
+@define('INSTALL_URL', 'URL para el blog');
+@define('INSTALL_URL_DESC', 'URL base de tu instalación de serendipity');
+@define('INSTALL_INDEXFILE', 'Fichero índice');
+@define('INSTALL_INDEXFILE_DESC', 'El nombre del fichero índice de serendipity');
 
 /* 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');
+@define('INSTALL_CAT_SETTINGS', 'Opciones generales');
+@define('INSTALL_CAT_SETTINGS_DESC', 'Configura el comportamiento de Serendipity');
+@define('INSTALL_USERNAME', 'Usuario administrador');
+@define('INSTALL_USERNAME_DESC', 'Nombre de usuario del administrador');
+@define('INSTALL_PASSWORD', 'Contraseña de administrador');
+@define('INSTALL_PASSWORD_DESC', 'Contraseña del administrador');
+@define('INSTALL_EMAIL', 'Correo electrónico');
+@define('INSTALL_EMAIL_DESC', 'Correo electrónico del administrador');
+@define('INSTALL_SENDMAIL', '¿Enviar correos al administrador?');
+@define('INSTALL_SENDMAIL_DESC', '¿Quieres recibir un correo electrónico cuando envían comentarios a tus entradas?');
+@define('INSTALL_SUBSCRIBE', '¿Permitir la subscripción de los usuarios a las entradas?');
+@define('INSTALL_SUBSCRIBE_DESC', 'Permite a los usuarios subscribirse a una entrada y de ese modo recibir un correo electrónico cuando se hacen nuevos comentarios a esa entrada');
+@define('INSTALL_BLOGNAME', 'Nombre del blog');
+@define('INSTALL_BLOGNAME_DESC', 'El título de tu blog');
+@define('INSTALL_BLOGDESC', 'Descripción del blog');
+@define('INSTALL_BLOGDESC_DESC', 'Descripción de tu blog');
+@define('INSTALL_LANG', 'Idioma');
+@define('INSTALL_LANG_DESC', 'Selecciona el idioma de tu blog');
 
 /* 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_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('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', 'Apariencia');
+@define('INSTALL_CAT_DISPLAY_DESC', 'Configura el aspecto general de Serendipity');
+@define('INSTALL_EXTERNALSTYLE', 'Hoja de estilo externa');
+@define('INSTALL_EXTERNALSTYLE_DESC', 'Puedes definir aquí una URI a un hoja de estilo, aparte de las opciones configurables en la interfaz de administrador (introduce \'none\' si no necesitas esto)');
+@define('INSTALL_WYSIWYG', 'Usar editor WYSIWYG');
+@define('INSTALL_WYSIWYG_DESC', '¿Quieres usar el editor WYSIWYG? (Funciona con IE5+, parcialmente con Mozilla 1.3+)');
+@define('INSTALL_XHTML11', 'Forzar compatibilidad XHTML 1.1');
+@define('INSTALL_XHTML11_DESC', '¿Quieres forzar la compatibilidad XHTML 1.1? (puede causar problemas con navegadores antiguos de la 4ª generación)');
+@define('INSTALL_POPUP', 'Activar el uso de ventanas emergentes');
+@define('INSTALL_POPUP_DESC', '¿Quieres que el blog use una ventana emergente para los comentarios, trackbacks, etc.?');
+@define('INSTALL_EMBED', '¿Está Serendipity insertado en otra web?');
+@define('INSTALL_EMBED_DESC', 'Si quieres insertar serendipity dentro de otra página, ajusta a "true" para eliminar cualquier cabecera y sólo mostrar los contenidos. Puedes hacer uso de la opción indexFile y usar una clase donde pongas las cabeceras normales de tu página web. ¡Lee el fichero README par más información!');
+@define('INSTALL_TOP_AS_LINKS', '¿Mostrar Salidas/Sitios asociados como enlaces?');
+@define('INSTALL_TOP_AS_LINKS_DESC', '"no": Las Salidas y los Sitios asociados se muestran como texto sin formato para prevenir spam en google. "yes": Las Salidas y Sitios asociando se muestran como enlaces. "default": Usar el valor de la configuración global (recomendado).');
+@define('INSTALL_BLOCKREF', 'Sitios asociados bloqueados');
+@define('INSTALL_BLOCKREF_DESC', '¿Hay algún servidor que no quieras que se muestre en la lista de Sitios asociados? Separa la lista de nombres de dominio con \';\' y advierte que se ¡bloquea por coincidencias en subcadenas!');
+@define('INSTALL_REWRITE', 'Reescritura de URL');
+@define('INSTALL_REWRITE_DESC', 'Selecciona la regla que quieres usar para generar URL. Activando estas reglas hará URL bonitas para tu blog y lo hará más indexable para los robots como google. El servidor web necesita tener o mod_rewrite o "AllowOverride All" para el directorio de serendipity. El valor predeterminado es autodetectado');
 
 /* 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', 'Opciones para la conversión de imágenes');
+@define('INSTALL_CAT_IMAGECONV_DESC', 'Información sobre cómo debería serendipity manejar imágenes');
+@define('INSTALL_IMAGEMAGICK', 'Usar ImageMagick');
+@define('INSTALL_IMAGEMAGICK_DESC', '¿Tienes ImageMagick instalado y quieres usarlo para redimensionar imágenes?');
+@define('INSTALL_IMAGEMAGICKPATH', 'Ruta hasta el programa convert');
+@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Ruta completa y nombre del programa convert de ImageMagick');
+@define('INSTALL_THUMBSUFFIX', 'Sufijo de la miniatura');
+@define('INSTALL_THUMBSUFFIX_DESC', 'Las miniaturas se crearán con el siguiente formato: original.[sufijo].ext');
+@define('INSTALL_THUMBWIDTH', 'Dimensiones de las miniaturas');
+@define('INSTALL_THUMBWIDTH_DESC', 'Anchura máxima estática de las miniaturas auto-generadas');
 
 /* Personal details */
-@define('USERCONF_CAT_PERSONAL', 'Your personal details');
-@define('USERCONF_CAT_PERSONAL_DESC', 'Change your personal details');
-@define('USERCONF_USERNAME', 'Your username');
-@define('USERCONF_USERNAME_DESC', 'The username you use to log in to the blog');
-@define('USERCONF_PASSWORD', 'Your password');
-@define('USERCONF_PASSWORD_DESC', 'The password you wish to use to log in to the blog');
-@define('USERCONF_USERLEVEL', 'Permissionlevel');
-@define('USERCONF_USERLEVEL_DESC', 'Userlevel. Should be one of the following: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chief editor, [USERLEVEL_EDITOR] - Standard editor.');
-@define('USERCONF_EMAIL', 'Your e-mail address');
-@define('USERCONF_EMAIL_DESC', 'Your personal e-mail address');
-@define('USERCONF_SENDCOMMENTS', 'Send comment announcements?');
-@define('USERCONF_SENDCOMMENTS_DESC', 'Do you want to receive emails when comments are posted to your entries?');
-@define('USERCONF_SENDTRACKBACKS', 'Send trackback announcements?');
-@define('USERCONF_SENDTRACKBACKS_DESC', 'Do you want to receive emails when trackbacks are posted to your entries?');
-@define('USERCONF_ALLOWPUBLISH', 'Rights: Publishing entries?');
-@define('USERCONF_ALLOWPUBLISH_DESC', 'Is this user allowed to publish entries?');
-@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('USERCONF_CAT_PERSONAL', 'Tus datos personales');
+@define('USERCONF_CAT_PERSONAL_DESC', 'Cambia tus datos personales');
+@define('USERCONF_USERNAME', 'Nombre de usuario');
+@define('USERCONF_USERNAME_DESC', 'El nombre de usuario que usas para conectar al blog');
+@define('USERCONF_PASSWORD', 'Contraseña');
+@define('USERCONF_PASSWORD_DESC', 'La contraseña que deseas usar para conectar al blog');
+@define('USERCONF_USERLEVEL', 'Nivel');
+@define('USERCONF_USERLEVEL_DESC', 'Nivel de usuario. Debería ser uno de los siguientes: [USERLEVEL_ADMIN] - Administrador, [USERLEVEL_CHIEF] - Editor jefe, [USERLEVEL_EDITOR] - Editor normal.');
+@define('USERCONF_EMAIL', 'Correo electrónico');
+@define('USERCONF_EMAIL_DESC', 'Tu dirección de correo electrónico personal');
+@define('USERCONF_SENDCOMMENTS', '¿Enviar avisos de comentarios?');
+@define('USERCONF_SENDCOMMENTS_DESC', '¿Quieres recibir correos electrónicos cuando ponen comentarios en tus entradas?');
+@define('USERCONF_SENDTRACKBACKS', '¿Enviar avisos de trackback?');
+@define('USERCONF_SENDTRACKBACKS_DESC', '¿Quieres recibir correos electrónicos cuando ponen trackbacks en tus entradas?');
+@define('USERCONF_ALLOWPUBLISH', 'Derechos: ¿Publicar entradas?');
+@define('USERCONF_ALLOWPUBLISH_DESC', '¿Puede el usuario publicar entradas?');
+@define('XML_IMAGE_TO_DISPLAY', 'Botón XML');
+@define('XML_IMAGE_TO_DISPLAY_DESC','Enlaces a feeds XML se mostrarán con esta imagen. Déjalo vacío para el valor predeterminado, introduce \'none\' para desactivar.');
+@define('ENTRY_SAVED', 'Tu entrada ha sido guardada');
+@define('SUCCESS', 'Éxito');
 
 @define('NUMBER_FORMAT_DECIMALS', '2');
-@define('NUMBER_FORMAT_DECPOINT', '.');
-@define('NUMBER_FORMAT_THOUSANDS', ',');
-@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('NUMBER_FORMAT_DECPOINT', ',');
+@define('NUMBER_FORMAT_THOUSANDS', '.');
+
+@define('POWERED_BY_SHOW_TEXT', 'Mostrar "Serendipity" como texto');
+@define('POWERED_BY_SHOW_TEXT_DESC', 'Mostrará "Serendipity Weblog" como texto');
+@define('POWERED_BY_SHOW_IMAGE', 'Mostrar "Serendipity" con una imagen');
+@define('POWERED_BY_SHOW_IMAGE_DESC', 'Mostrará el logotipo de Serendipity');
 /* 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 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('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('VIEW_EXTENDED_ENTRY', 'Continue reading "%s"'); // 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('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('COMMENTS_MODERATE', 'Comments & trackbacks to this entry requires moderation'); // Re-translate
-@define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login');
-@define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
-@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?'); // Translate
-@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"no": Unchecked external links (Top Exits, Top Referrers, User comments) are not shown/shown as plain text where applicable to prevent google spam (recommended). "yes": Unchecked external links are shown as hyperlinks. Can be overridden within sidebar plugin configuration!'); // Translate
-@define('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('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate
-@define('MEDIA', 'Media'); // Translate
-@define('MEDIA_LIBRARY', 'Media library'); // Translate
-@define('ADD_MEDIA', 'Add media'); // Translate
-@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate
-@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate
-@define('SAVE_FILE_AS', 'Save the file as:'); // Translate
-@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate
-@define('MEDIA_RENAME', 'Rename this file'); // Translate
-@define('IMAGE_RESIZE', 'Resize this image'); // Translate
-@define('MEDIA_DELETE', 'Delete this file'); // Translate
-@define('FILES_PER_PAGE', 'Files per page'); // Translate
-@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate
-@define('SELECT_FILE', 'Select file to insert'); // Translate
-@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate
-@define('CALENDAR_BOW_DESC', 'The day of the week that should be considered the beginning of the week. Default is Monday'); // Translate
-@define('SUPERUSER', 'Blog Administration'); // Translate
-@define('ALLOWS_YOU_BLAHBLAH', 'Provides a link in the sidebar to your blog administration'); // Translate
-@define('CALENDAR', 'Calendar'); // Translate
-@define('SUPERUSER_OPEN_ADMIN', 'Open administration'); // Translate
-@define('SUPERUSER_OPEN_LOGIN', 'Open login screen'); // Translate
-@define('INVERT_SELECTIONS', 'Invert Selections'); // Translate
-@define('COMMENTS_DELETE_CONFIRM', 'Are you sure you wish to delete the selected comments?'); // Translate
-@define('COMMENT_DELETE_CONFIRM', 'Are you sure you wish to delete comment #%d, written by %s?'); // Translate
-@define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate
-@define('VIEW_COMMENT', 'View comment'); // Translate
-@define('VIEW_ENTRY', 'View entry'); // Translate
-@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate
-@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate
-@define('TRACKBACK_SENDING', 'Sending trackback to URI %s...'); // Translate
-@define('TRACKBACK_SENT', 'Trackback successful'); // Translate
-@define('TRACKBACK_FAILED', 'Trackback failed: %s'); // Translate
-@define('TRACKBACK_NOT_FOUND', 'No trackback-URI found.'); // Translate
-@define('TRACKBACK_URI_MISMATCH', 'The autodiscovered trackback URI does not match our target URI.'); // Translate
-@define('TRACKBACK_CHECKING', 'Checking <u>%s</u> for possible trackbacks...'); // Translate
-@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('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
-@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate
-@define('COMMENTS_FILTER_ALL', 'All'); // Translate
-@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
-@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
-@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
+@define('SETTINGS_SAVED_AT', 'La nueva configuración se ha guardado en la hora %s');
+@define('PLUGIN_ITEM_DISPLAY', '¿Dónde debería mostrarse el elemento?');
+@define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Sólo en la entrada extendida');
+@define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Sólo en la página general');
+@define('PLUGIN_ITEM_DISPLAY_BOTH', 'Siempre');
+@define('RSS_IMPORT_DESC', 'La importación RSS cogerá un fichero RSS e insertará todas las entradas que contiene para que formen parte de tu blog. Puedes escoger si quieres importar los elementos como PUBLICADOS o como BORRADOR. Las categorías en el fichero externo deben tener el mismo nombre que las categorías de Serendipity. Puedes escoger también la categoría que quieres que tengan las entradas que no coincidan con una categoría de Serendipity.');
+@define('RSS_IMPORT_CATEGORY', 'Usa esta categoría para las entradas importadas que no coincidan');
+@define('ERROR_UNKNOWN_NOUPLOAD', 'Ocurrió un error desconocido, fichero no importado. Quizás el tamaño del fichero es mayor que el tamaño máximo permitido por tu instalación. Verifica con tu ISP o edita tu fichero php.ini para permitir que suba ficheros de tamaño más grande.');
+@define('COMMENTS_WILL_BE_MODERATED', 'Los comentarios enviados será sometidos a moderación antes de poder ser mostrados.');
+@define('YOU_HAVE_THESE_OPTIONS', 'Tienes disponibles las siguientes opciones:');
+@define('THIS_COMMENT_NEEDS_REVIEW', 'Aviso: Este comentario necesita aprobación antes de que se muestre');
+@define('DELETE_COMMENT', 'Borrar comentario');
+@define('APPROVE_COMMENT', 'Aprobar comentario');
+@define('REQUIRES_REVIEW', 'Requiere revisión');
+@define('COMMENT_APPROVED', 'Comentario #%s ha sido aprobado exitosamente');
+@define('COMMENT_DELETED', 'Comentario #%s ha sido borrado exitosamente');
+@define('VIEW', 'Ver');
+@define('COMMENT_ALREADY_APPROVED', 'Comentario #%s ya parece haber sido aprobado');
+@define('COMMENT_EDITED', 'El comentario seleccionado ha sido editado');
+@define('HIDE', 'Oculto');
+@define('VIEW_EXTENDED_ENTRY', 'Continua leyendo "%s"');
+@define('TRACKBACK_SPECIFIC_ON_CLICK', 'Este enlace no es para hacer click en él. Contiene la URI trackback para esta entrada. Puedes usar esta URI para enviar "ping-" y "trackbacks" desde tu propio blog a esta entrada. Para copiar el enlace, haz click con el botón derecho y selecciona "Copy Shortcut" en Internet Explorer o "Copy Link Location" en Mozilla.');
+@define('THIS_TRACKBACK_NEEDS_REVIEW', 'Aviso: Este trackback necesita aprobación antes de que se muestre');
+@define('DELETE_TRACKBACK', 'Borrar trackback');
+@define('APPROVE_TRACKBACK', 'Aprobar trackback');
+@define('TRACKBACK_APPROVED', 'Trackback #%s ha sido aprobado exitosamente');
+@define('TRACKBACK_DELETED', 'Trackback #%s ha sido borrado exitosamente');
+@define('COMMENTS_MODERATE', 'Comentarios y trackbacks a esta entrada requieren moderación'); // Re-translate
+@define('PLUGIN_SUPERUSER_HTTPS', 'Usar https para conectar');
+@define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Hacer que el enlace para conectar apunte a una conexión https. ¡Tu servidor web necesita soporte para esto!');
+@define('INSTALL_SHOW_EXTERNAL_LINKS', '¿Poder hacer click en los enlaces externos?');
+@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"no": Enlaces externos no verificados (Top Salidas, Top Sitios asociados, Comentarios de usuarios) no se muestran/se muestran como texto sin formato donde se pueda para prevenir spam de google (recomendado). "yes": Enlaces externos no verificados se muestran como enlaces. ¡Puede ser modificado en la configuración del plugin de la barra lateral!');
+@define('PAGE_BROWSE_COMMENTS', 'Página %s de %s, total %s comentarios');
+@define('FILTERS', 'Filtros');
+@define('FIND_ENTRIES', 'Encontrar entradas');
+@define('FIND_COMMENTS', 'Encontrar comentarios');
+@define('FIND_MEDIA', 'Encontrar medios');
+@define('FILTER_DIRECTORY', 'Directorio');
+@define('SORT_BY', 'Ordenar por');
+@define('TRACKBACK_COULD_NOT_CONNECT', 'No se ha enviado el trackback: No se pudo establecer conexión con %s en el puerto %d');
+@define('MEDIA', 'Medios');
+@define('MEDIA_LIBRARY', 'Librería de medios');
+@define('ADD_MEDIA', 'Añadir medio');
+@define('ENTER_MEDIA_URL', 'Introduce una URL para obtener el fichero:');
+@define('ENTER_MEDIA_UPLOAD', 'Selecciona el fichero que quieres subir:');
+@define('SAVE_FILE_AS', 'Guardar el fichero como:');
+@define('STORE_IN_DIRECTORY', 'Almacenar dentro del siguiente directorio: ');
+@define('MEDIA_RENAME', 'Renombrar este fichero');
+@define('IMAGE_RESIZE', 'Redimensionar esta imagen');
+@define('MEDIA_DELETE', 'Borrar este fichero');
+@define('FILES_PER_PAGE', 'Ficheros por página');
+@define('CLICK_FILE_TO_INSERT', 'Haz click en el fichero que quieres insertar:');
+@define('SELECT_FILE', 'Selecciona el fichero a insertar');
+@define('MEDIA_FULLSIZE', 'Tamaño real');
+@define('CALENDAR_BOW_DESC', 'El día de la semana que debe considerarse como principio de semana. El predeterminado es el lunes');
+@define('SUPERUSER', 'Administración del Blog');
+@define('ALLOWS_YOU_BLAHBLAH', 'Muestra un enlace en la barra lateral para acceder a la administración de tu blog');
+@define('CALENDAR', 'Calendario');
+@define('SUPERUSER_OPEN_ADMIN', 'Abre administración');
+@define('SUPERUSER_OPEN_LOGIN', 'Abre ventana de conexión');
+@define('INVERT_SELECTIONS', 'Invertir selecciones');
+@define('COMMENTS_DELETE_CONFIRM', '¿Estás seguro que deseas eliminar los comentarios seleccionados...
 
[truncated message content]

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.15.2.5,1.15.2.6 serendipity_lang_cs.inc.php,1.61.2.5,1.61.2.6 serendipity_lang_cz.inc.php,1.61.2.4,1.61.2.5 serendipity_lang_da.inc.php,1.79.2.6,1.79.2.7 serendipity_lang_de.inc.php,1.98.2.5,1.98.2.6 serendipity_lang_es.inc.php,1.77.2.5,1.77.2.6 serendipity_lang_fr.inc.php,1.58.2.6,1.58.2.7 serendipity_lang_it.inc.php,1.1.2.5,1.1.2.6 serendipity_lang_nl.inc.php,1.36.2.5,1.36.2.6 serendipity_lang_no.inc.php,1.2.2.5,1.2.2.6 serendipity_lang_pt.inc.php,1.36.2.6,1.36.2.7

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

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

Modified Files:
      Tag: branch-smarty
	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_it.inc.php 
	serendipity_lang_nl.inc.php serendipity_lang_no.inc.php 
	serendipity_lang_pt.inc.php 
Log Message:
* Fixed parse error in all files apart from english
* Updated german translation
* Updated dutch translation


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.61.2.5
retrieving revision 1.61.2.6
diff -u -d -r1.61.2.5 -r1.61.2.6
--- serendipity_lang_cs.inc.php	16 Oct 2004 17:27:13 -0000	1.61.2.5
+++ serendipity_lang_cs.inc.php	27 Oct 2004 08:54:50 -0000	1.61.2.6
@@ -556,7 +556,7 @@
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate
 @define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate
-@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.') // Translate;
+@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.'); // Translate
 @define('MT_DATA_FILE', 'Movable Type data file'); // Translate
 @define('FORCE', 'Force'); // Translate
 @define('WORDPRESS_DATA', 'WordPress data'); // Translate

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -d -r1.2.2.5 -r1.2.2.6
--- serendipity_lang_no.inc.php	16 Oct 2004 17:27:14 -0000	1.2.2.5
+++ serendipity_lang_no.inc.php	27 Oct 2004 08:54:51 -0000	1.2.2.6
@@ -1,570 +1,570 @@
-<?php # $Id$
-
-// Norwegian Language file
-//
-// Based in part on the Danish translation rev. 1.78
-// Jo Christian Oterhals, ote...@gm...
-
-@define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'norwegian, no, no_NO');
-@define('DATE_FORMAT_ENTRY', '%A d. %e. %B %Y');
-@define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
[...1106 lines suppressed...]
+@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
+@define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate
+@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate
+@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.'); // Translate
+@define('MT_DATA_FILE', 'Movable Type data file'); // Translate
+@define('FORCE', 'Force'); // Translate
+@define('WORDPRESS_DATA', 'WordPress data'); // Translate
+@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); // Translate
+@define('CREATE_AUTHOR', 'Create author \'%s\'.'); // Translate
+@define('CREATE_CATEGORY', 'Create category \'%s\'.'); // Translate
+@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); // Translate
+@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.'); // Translate
+@define('COULDNT_SELECT_DB', 'Could not select database: %s.'); // Translate
+@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.'); // Translate
+@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
+@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
+@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // Translate
 @define('WEEK', 'Week'); // Translate
 @define('WEEKS', 'Weeks'); // Translate
 @define('MONTHS', 'Months'); // Translate

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.36.2.5
retrieving revision 1.36.2.6
diff -u -d -r1.36.2.5 -r1.36.2.6
--- serendipity_lang_nl.inc.php	16 Oct 2004 17:27:14 -0000	1.36.2.5
+++ serendipity_lang_nl.inc.php	27 Oct 2004 08:54:51 -0000	1.36.2.6
@@ -11,6 +11,8 @@
 #                           pa...@ti...                          #
 #                           blog: http://www.time-smart.org/serendipity  #
 #                                                                        #
+#                           Ronald Goris                                 #
+#                                                                        #
 ##########################################################################
 
 @define('LANG_CHARSET', 'ISO-8859-1');
@@ -19,8 +21,8 @@
 @define('WYSIWYG_LANG', 'nl');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administratie');
-@define('HAVE_TO_BE_LOGGED_ON', 'u moet ingelogd zijn om deze pagina te zien');
-@define('WRONG_USERNAME_OR_PASSWORD', 'Naam en/of paswoord verkeerd!');
+@define('HAVE_TO_BE_LOGGED_ON', 'je moet ingelogd zijn om deze pagina te bekijken');
+@define('WRONG_USERNAME_OR_PASSWORD', 'Naam en/of wachtwoord is verkeerd!');
 @define('APPEARANCE', 'Look');
 @define('MANAGE_STYLES', 'Beheer stijlen');
 @define('CONFIGURE_PLUGINS', 'Configuratie Plugins');
@@ -31,27 +33,27 @@
 @define('LOGIN', 'Login');
 @define('LOGOUT', 'Loguit');
 @define('LOGGEDOUT', 'Uitgelogged.');
-@define('CREATE', 'Maak');
+@define('CREATE', 'Aanmaken');
 @define('EDIT_THIS_CAT', 'Bewerken "%s - %s"');
-@define('SAVE', 'Bewaar');
+@define('SAVE', 'Bewaren');
 @define('NAME', 'Naam');
-@define('CLICK_CAT_TO_EDIT', 'Klik op een categorie om ze te bewerken');
+@define('CLICK_CAT_TO_EDIT', 'Klik op een categorie om deze te bewerken');
 @define('CREATE_NEW_CAT', 'Maak een nieuwe categorie');
 @define('I_WANT_THUMB', 'Ik wil de thumbnail gebruiken in mijn input.');
 @define('I_WANT_BIG_IMAGE', 'Ik wil een groter beeld in mijn input');
 @define('I_WANT_NO_LINK', ' Ik wil het tonen als een beeld');
-@define('I_WANT_IT_TO_LINK', 'Iik wil het tonen als een link naar deze url:');
+@define('I_WANT_IT_TO_LINK', 'Ik wil het tonen als een link naar deze url:');
 @define('BACK', 'Terug');
 @define('FORWARD', 'Verder');
 @define('ANONYMOUS', 'Anoniem');
-@define('LINK_TO_COMMENT', 'Link naar commentaar #');
+@define('LINK_TO_COMMENT', 'Link naar reactie #');
 @define('SEND_MAIL_TO', 'Stuur mail naar');
 @define('NEW_TRACKBACK_TO', 'Nieuwe trackback aangemaakt naar');
-@define('NEW_COMMENT_TO', 'Nieuwe commentaar geplaatst op');
+@define('NEW_COMMENT_TO', 'Nieuwe reactie geplaatst op');
 @define('RECENT', 'Recent...');
 @define('OLDER', 'Ouder...');
 @define('DONE', 'Gedaan');
-@define('WELCOME_BACK', 'Blij u terug te zien,');
+@define('WELCOME_BACK', 'Welkom terug,');
 @define('RUNNING', 'Je werkt met Serendipity v.');
 @define('ADD_PLUGIN', 'Plugin toevoegen');
 @define('TITLE', 'Titel');
@@ -59,61 +61,61 @@
 @define('PLACEMENT', 'Plaats');
 @define('DELETE', 'Verwijder');
 @define('SAVE', 'Bewaar');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Kies de plugin die u wil toevoegen');
+@define('SELECT_A_PLUGIN_TO_ADD', 'Kies de plugin die je wilt toevoegen');
 @define('UP', 'OP');
 @define('DOWN', 'NEER');
 @define('ENTRIES', 'Logs:');
 @define('NEW_ENTRY', 'Nieuwe log');
 @define('AUTHOR_SUITE', 'Auteur Suite');
 @define('EDIT_ENTRIES', 'Bewerk logs');
-@define('CATEGORIES', 'Categorieën');
-@define('EDIT_CATEGORIES', 'Beheer Categorieën');
-@define('WARNING_THIS_BLAHBLAH', "OPGELET:\\nAls er vele beelden zonder thumbnail zijn zou dit lang kunnen duren.");
-@define('CREATE_THUMBS', 'Aanmaken van Thumbnailss');
-@define('MANAGE_IMAGES', 'Beheer Beelden');
+@define('CATEGORIES', 'Categorie&euml;n');
+@define('EDIT_CATEGORIES', 'Beheer Categorie&euml;n');
+@define('WARNING_THIS_BLAHBLAH', "OPGELET:\\nAls er vele beelden zonder thumbnail zijn kan dit lang duren.");
+@define('CREATE_THUMBS', 'Aanmaken van Thumbnails');
+@define('MANAGE_IMAGES', 'Beheer Afbeeldingen');
 @define('ADMIN_INTERFACE', 'Admin interface');
-@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Autheur Suite');
+@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Auteur Suite');
 @define('NAME', 'Naam');
 @define('EMAIL', 'E-mail');
 @define('HOMEPAGE', 'Homepage');
-@define('COMMENT', 'Commentaar');
+@define('COMMENT', 'Reacties');
 @define('REMEMBER_INFO', 'Informatie bewaren? ');
-@define('SUBMIT_COMMENT', 'Commentaar toevoegen');
+@define('SUBMIT_COMMENT', 'Reactie toevoegen');
 @define('NO_ENTRIES_TO_PRINT', 'Geen logs gevonden.');
-@define('COMMENTS', 'Commentaar');
-@define('ADD_COMMENT', 'Commentaar toeveoegen');
-@define('NO_COMMENTS', 'Geen commentaar.');
-@define('POSTED_BY', 'Aangepaakt door');
+@define('COMMENTS', 'Reactie');
+@define('ADD_COMMENT', 'Reactie toevoegen');
+@define('NO_COMMENTS', 'Geen reacties.');
+@define('POSTED_BY', 'Gepost door');
 @define('ON', 'aan');
-@define('A_NEW_COMMENT_BLAHBLAH', 'Een nieuwe commentaar werd toegevoegd aan uw blog "%s", in de log met titel "%s".');
-@define('A_NEW_TRACKBACK_BLAHBLAH', 'Een nieuwe trackback werd toegevoegd aan uw log met titel "%s".');
-@define('NO_CATEGORY', 'Geen Categorie');
+@define('A_NEW_COMMENT_BLAHBLAH', 'Een nieuwe reactie werd toegevoegd aan je blog "%s", in de log met titel "%s".');
+@define('A_NEW_TRACKBACK_BLAHBLAH', 'Een nieuwe trackback werd toegevoegd aan je log met titel "%s".');
+@define('NO_CATEGORY', 'Geen categorie');
 @define('ENTRY_BODY', 'Log aanhef');
 @define('EXTENDED_BODY', 'Log compleet');
 @define('CATEGORY', 'Categorie:');
 @define('EDIT', 'Bewerk');
 @define('NO_ENTRIES_BLAHBLAH', 'Geen logs gevonden met %s' . "\n");
-@define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Uw zoekopdracht naar %s geeft %s resultaten :');
-@define('SEARCH_TOO_SHORT', 'Uw zoekwoord moet langer zijn dan 3 karakters');
-@define('IMAGE', 'Beeld');
+@define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Je zoekopdracht naar %s geeft %s resultaten :');
+@define('SEARCH_TOO_SHORT', 'Je zoekwoord moet langer zijn dan 3 karakters');
+@define('IMAGE', 'Afbeelding');
 @define('ERROR_FILE_NOT_EXISTS', 'Fout: Oude bestandnaam bestaat niet');
 @define('ERROR_FILE_EXISTS', 'Fout: Nieuwe bestandnaam bestaat reeds.');
-@define('ERROR_SOMETHING', 'Four: Iets gaat mis.');
+@define('ERROR_SOMETHING', 'Fout: Iets gaat mis.');
 @define('ADDING_IMAGE', 'Toevoegen beeld...');
 @define('THUMB_CREATED_DONE', 'Thumbnail aangemaakt.<br>Done.');
-@define('ERROR_FILE_EXISTS_ALREADY', 'Fout: Bestand bestaat reeds op uw computer!');
-@define('GO', 'Go!');
-@define('NEWSIZE', 'Niewe grootte: ');
+@define('ERROR_FILE_EXISTS_ALREADY', 'Fout: Bestand bestaat reeds op je computer!');
+@define('GO', 'Gaan');
+@define('NEWSIZE', 'Nieuwe grootte: ');
 @define('RESIZE_BLAHBLAH', '<b>Vergroten/Verkleinen %s</b><p>');
 @define('ORIGINAL_SIZE', 'Oorspronkelijke grootte: <i>%sx%s</i> pixel');
-@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Hier kan je de grootte van het beeld aanpassen. Wil je de verhouding tussen hoogte en breedte bewaren, geef één waarde, gevolgd door de TAB toets:');
+@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Hier kun je de grootte van het beeld aanpassen. Wil je de verhouding tussen hoogte en breedte behouden, geef &eacute;&eacute;n waarde, gevolgd door de TAB toets:');
 @define('QUICKJUMP_CALENDAR', 'Kalender');
 @define('QUICKSEARCH', 'Snel zoeken');
 @define('SEARCH_FOR_ENTRY', 'Zoek een log');
 @define('ARCHIVES', 'Archief');
 @define('BROWSE_ARCHIVES', 'Doorzoek het archief op maand');
 @define('TOP_REFERRER', 'Top Referrers');
-@define('SHOWS_TOP_SITES', 'Toont de top sites die linken naar uw blogs');
+@define('SHOWS_TOP_SITES', 'Toont de top sites die linken naar je blogs');
 @define('TOP_EXITS', 'Top Exits');
 @define('SHOWS_TOP_EXIT', 'Toont waar men je blog verlaat');
 @define('SYNDICATION', 'Syndication');
@@ -127,7 +129,7 @@
 @define('SYNDICATE_THIS_BLOG', 'Syndicate deze Blog');
 @define('YOU_CHOSE', 'U kiest %s');
 @define('IMAGE_SIZE', 'Beeldgrootte');
-@define('IMAGE_AS_A_LINK', 'Toeveogen van een beeld');
+@define('IMAGE_AS_A_LINK', 'Toevoegen van een beeld');
 @define('POWERED_BY', 'Powered by');
 @define('TRACKBACKS', 'Trackbacks');
 @define('TRACKBACK', 'Trackback');
@@ -138,30 +140,30 @@
 @define('AT', 'op');
 @define('SET_AS_TEMPLATE', 'Gebruik als template');
 @define('IN', 'in');
-@define('EXCERPT', 'Uittreksel');
+@define('EXCERPT', 'Uitreksel');
 @define('TRACKED', 'Tracked');
 @define('LINK_TO_ENTRY', 'Link naar log');
 @define('LINK_TO_REMOTE_ENTRY', 'Link naar remote-log');
-@define('IP_ADDRESS', 'IP-address');
+@define('IP_ADDRESS', 'IP-adres');
 @define('USER', 'Gebruiker');
 @define('THUMBNAIL_USING_OWN', 'Ik gebruik %s omdat het reeds klein is.');
 @define('THUMBNAIL_FAILED_COPY', 'Ik wou %s gebruiken maar kon geen copy maken!');
 @define('AUTHOR', 'Auteur');
-@define('LAST_UPDATED', 'Laaste Update');
+@define('LAST_UPDATED', 'Laatste update');
 @define('TRACKBACK_SPECIFIC', 'Trackback specifiek URL voor deze log');
 @define('DIRECT_LINK', 'Directe link naar deze log');
-@define('COMMENT_ADDED', 'Dank U. Uw commentaar werd toegevoegd. ');
-@define('COMMENT_ADDED_CLICK', 'Klik  %shier om terug te gaan%s naar de commentaar en %shier om af te sluiten%s');
-@define('COMMENT_NOT_ADDED', 'Commentaar is niet toegelaten op deze log. ');
-@define('COMMENT_NOT_ADDED_CLICK', 'Klik %shier om terug te gaan%s naar de commentaar en %shier om af te sluiten%s');
-@define('COMMENTS_DISABLE', 'Commentaar verboden voor deze log');
-@define('COMMENTS_ENABLE', 'Commentaar toegelaten voor deze log');
-@define('COMMENTS_CLOSED', 'De auteur laat geen commentaar toe op deze log');
-@define('EMPTY_COMMENT', 'Geen commetaar opgegeven %sg terug%s en probeer opnieuw');
+@define('COMMENT_ADDED', 'Dank je. Je reactie is toegevoegd. ');
+@define('COMMENT_ADDED_CLICK', 'Klik  %shier om terug te gaan%s naar de reacties en %shier om af te sluiten%s');
+@define('COMMENT_NOT_ADDED', 'Reacties zijn niet toegelaten op deze log. ');
+@define('COMMENT_NOT_ADDED_CLICK', 'Klik %shier om terug te gaan%s naar de reacties of %shier om af te sluiten%s');
+@define('COMMENTS_DISABLE', 'Reacties zijn niet toegestaan voor deze log');
+@define('COMMENTS_ENABLE', 'Reacties toe laten voor dit artikel');
+@define('COMMENTS_CLOSED', 'De auteur laat geen reacties toe op deze log');
+@define('EMPTY_COMMENT', 'Geen reactie opgegeven %sga terug%s en probeer opnieuw');
 @define('ENTRIES_FOR', 'Logs voor %s');
 @define('DOCUMENT_NOT_FOUND', 'Het document %s werd niet gevonden.');
 @define('USERNAME', 'Gebruiker');
-@define('PASSWORD', 'Paswoord');
+@define('PASSWORD', 'Wachtwoord');
 @define('AUTOMATIC_LOGIN', 'Bewaar deze informatie');
 @define('SERENDIPITY_INSTALLATION', 'Serendipity installatie');
 @define('LEFT', 'links');
@@ -169,18 +171,18 @@
 @define('HIDDEN', 'verborgen');
 @define('REMOVE_TICKED_PLUGINS', 'Verwijder de aangeduide plugins');
 @define('SAVE_CHANGES_TO_LAYOUT', 'Bewaar de aanpassingen aan de layout');
-@define('COMMENTS_FROM', 'Commentaar van');
-@define('ERROR', 'Foutr');
+@define('COMMENTS_FROM', 'Reactie van');
+@define('ERROR', 'Fout');
 @define('ENTRY_SAVED', 'Log bewaard');
-@define('DELETE_SURE', 'Bent u zeker dat u #%s definitief wil verwijderen?');
+@define('DELETE_SURE', 'Weet je zeker dat je #%s definitief wilt verwijderen?');
 @define('NOT_REALLY', 'Niet echt...');
-@define('DUMP_IT', 'De weg!');
+@define('DUMP_IT', 'Doe weg!');
 @define('RIP_ENTRY', 'R.I.P. log #%s');
-@define('CATEGORY_DELETED', 'Categorie #%s verwijderd. Oude logs werden verplaatst naar #%s');
+@define('CATEGORY_DELETED', 'Categorie #%s is verwijderd. Oude logs werden verplaatst naar #%s');
 @define('CATEGORY_REMAINING', 'Verwijder deze categorie en verplaats de logs naar de categorie: %s');
 @define('INVALID_CATEGORY', 'Geen categorie opgegeven om te verwijderen');
-@define('CATEGORY_SAVED', 'Categorie bewaard');
-@define('SELECT_TEMPLATE', 'Kies de template die je wil gebruiken voor je blog');
+@define('CATEGORY_SAVED', 'Categorie is bewaard');
+@define('SELECT_TEMPLATE', 'Kies de template die je wilt gebruiken voor je blog');
 @define('ENTRIES_SUCCESSFULLY_INSERTED', 'Logs toegevoegd!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Logs werden NIET toegevoegd!');
 @define('VIEW_FEED_EXPORT', 'Toon export lijst');
@@ -195,55 +197,55 @@
 @define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; start <i>%s %s</i>');
 @define('CANT_EXECUTE_BINARY', 'Kan %s niet uitvoeren');
 @define('FILE_WRITE_ERROR', 'Kan het bestand %s niet aanmaken.');
-@define('FILE_CREATE_YOURSELF', 'Maak a.u.b. zelf het bestand en check de permissies');
+@define('FILE_CREATE_YOURSELF', 'Maak zelf het bestand en check de permissies');
 @define('COPY_CODE_BELOW', '<br />* copieer de code hierna en plaats ze in %s in %s folder:<b><pre>%s</pre></b>' . "\n");
-@define('WWW_USER', 'Verander www naar de gebruiker waarop apache wraait (bvb nobody).');
+@define('WWW_USER', 'Verander www naar de gebruiker waarop apache draait (bv. nobody).');
 @define('BROWSER_RELOAD', 'Eens dat gedaan klik "refresh" in je browser.');
-@define('DIAGNOSTIC_ERROR', 'We hebben een paar fouten gevonden:');
-@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity is nog niet geïnstalleerd. <a href="%s">install</a> nu.');
-@define('INCLUDE_ERROR', 'serendipity fout: kon %s nirt toevoegen - ik stop.');
-@define('DATABASE_ERROR', 'serendipity fout: ik kan niet aansluiten op de database - ik stop.');
+@define('DIAGNOSTIC_ERROR', 'Er zijn een paar fouten gevonden:');
+@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity is nog niet ge&iuml;nstalleerd. <a href="%s">install</a> nu.');
+@define('INCLUDE_ERROR', 'serendipity fout: kon %s niet worden toevoegd - ik stop.');
+@define('DATABASE_ERROR', 'serendipity fout: Er kon geen verbinding worden gemaakt met de database - ik stop.');
 @define('ATTEMPT_SETUP_DATABASE', 'Setup van de database...');
-@define('CHECK_DATABASE_EXISTS', 'Check of database bestaat.  Zie je een database query fout dan mag je deze negeren...');
+@define('CHECK_DATABASE_EXISTS', 'Check of database bestaat.  Zie je een database query fout dan kan je deze negeren...');
 @define('CREATE_DATABASE', 'Aanmaken default database setup...');
 @define('DATABASE_DONE', 'Database aangemaakt');
 @define('ATTEMPT_WRITE_FILE', 'Ik probeer volgende bestand %s te maken...');
-@define('SERENDIPITY_INSTALLED', '%sSerendipity werd goed geïnstalleerd.%s Vergeet je paswoord niet: "%s", Je username is "%s".%sJe nieuwe blog is te vinden op <a href="%s">right here</a>');
-@define('WRITTEN_N_SAVED', 'Configuratie &amp; bewaard');
-@define('IMAGE_ALIGNMENT', 'Beeld alignering');
+@define('SERENDIPITY_INSTALLED', '%sSerendipity werd goed geïnstalleerd.%s Vergeet je wachtwoord niet: "%s", Je username is "%s".%sUw nieuwe blog is <a href="%s">hier</a> te vinden.');
+@define('WRITTEN_N_SAVED', 'Configuratie is opgeslagen');
+@define('IMAGE_ALIGNMENT', 'Afbeelding alignering');
 @define('ENTER_NEW_NAME', 'Geef een nieuwe naam voor: ');
 @define('RESIZING', 'Vergroten/Verkleinen');
 @define('RESIZE_DONE', 'Gedaane ( %s aangepast).');
 @define('SYNCING', 'Syncronizeren van de database met de beeldfolder');
-@define('SYNC_DONE', 'Gedaan ( %s Beelden gesynchroniseerd).');
+@define('SYNC_DONE', 'Gedaan ( %s Afbeeldingen gesynchroniseerd).');
 @define('DELETE_IMAGE_FAIL' , 'Onmogelijk om het beeld te verwijderen <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'verwijder de thumbnail voor het beeld met als naam <b>%s</b>');
 @define('FILE_NOT_FOUND', 'Ik kan het bestand <b>%s</b> niet vinden, het werd vermoedelijk reeds verwijderd');
 @define('ABORT_NOW', 'Stop nu');
-@define('REMOTE_FILE_NOT_FOUND', 'Bestand niet gevonden op de server. Ben je zeker dat de URL: <b>%s</b> juist is?');
+@define('REMOTE_FILE_NOT_FOUND', 'Bestand niet gevonden op de server. Weet je zeker dat de URL: <b>%s</b> juist is?');
 @define('FILE_FETCHED', '%s opgeladen als %s');
 @define('FILE_UPLOADED', 'Bestand %s werd goed opgeladen als %s');
 @define('WORD_OR', 'Of');
 @define('SCALING_IMAGE', 'Schaal %s naar %s x %s px');
 @define('KEEP_PROPORTIONS', 'Verhouding tussen hoogte en breedte behouden');
-@define('REALLY_SCALE_IMAGE', 'Ben je zeker? Er is geen weg terug!');
-@define('TOGGLE_ALL', 'Toggle expand alles');
-@define('TOGGLE_OPTION', 'Toggle optie');
+@define('REALLY_SCALE_IMAGE', 'Weet je het zeker? Er is geen weg terug!');
+@define('TOGGLE_ALL', 'Alles uit- of inklappen');
+@define('TOGGLE_OPTION', 'Uitklappen');
 @define('SUBSCRIBE_TO_THIS_ENTRY', 'Inschrijven op deze log');
 @define('UNSUBSCRIBE_OK', "%s is nu uitgeschreven voor deze log");
-@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Nieuwe commentaar voor ingeschreven log "%s"');
-@define('SUBSCRIPTION_MAIL', "Hallo %s,\n\nEen nieuwe comment werd toegevoegd aan de log waarop je bent ingeschreven \"%s\", met als titel \"%s\"\nDe naam van de auteur is:: %s\n\nHier vind je de log: %s\n\nOm je uit te schrijven klik hier: %s\n");
-@define('SUBSCRIPTION_TRACKBACK_MAIL', "Hallo %s,\n\nEen nieuwe trackback werd toegevoegd aan de log waarop je bent ingeschreven \"%s\", met als titel \"%s\"\nde naam van de auteur is: %s\n\nHier vind je de log: %s\n\nOm je uit te schrijven klik hier: %s\n");
-@define('SIGNATURE', "\n-- \n%s is powered by Serendipity.\nDé beste blog, ook jij kan het gebruiken.\nKijk maar <http://s9y.org> en zie hoe.");
-@define('DATABASE_ALREADY_INSTALLED', 'SKIPPED: Database reeds geïnstaleerd');
+@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Nieuwe reactie voor ingeschreven log "%s"');
+@define('SUBSCRIPTION_MAIL', "Hallo %s,\n\nEen nieuwe comment werd toegevoegd aan de log waarop je bent ingeschreven \"%s\", met als titel \"%s\"\nDe naam van de auteur is: %s\n\nHier vind je de log: %s\n\nOm je uit te schrijven klik je hier: %s\n");
+@define('SUBSCRIPTION_TRACKBACK_MAIL', "Hallo %s,\n\nEen nieuwe trackback werd toegevoegd aan de log waarop je bent ingeschreven \"%s\", met als titel \"%s\"\nde naam van de auteur is: %s\n\nHier vind je de log: %s\n\nOm je uit te schrijven klik je hier: %s\n");
+@define('SIGNATURE', "\n-- \n%s is powered by Serendipity.\nKijk maar <http://s9y.org> en zie hoe.");
+@define('DATABASE_ALREADY_INSTALLED', 'SKIPPED: Database reeds ge&iuml;nstaleerd');
 @define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
 @define('SYNDICATION_PLUGIN_10', 'RSS 1.0 feed');
 @define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
-@define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 commentaar');
+@define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 reacties');
 @define('SYNDICATION_PLUGIN_ATOM03', 'ATOM 0.3 feed');
 @define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Field "Hoofdredacteur"');
 @define('SYNDICATION_PLUGIN_WEBMASTER',  'Field "webMaster"');
-@define('SYNDICATION_PLUGIN_BANNERURL', 'Beeld voor de RSS feed');
+@define('SYNDICATION_PLUGIN_BANNERURL', 'Afbeelding bij de RSS feed');
 @define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Breedte van het beeld');
 @define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Hoogte van het beeld');
 @define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'E-Mail adres van de webmaster. (leeg: verborgen) [RSS 2.0]');
@@ -261,22 +263,22 @@
 @define('PUBLISH', 'Publiceer');
 @define('PREVIEW', 'Voorbeeld');
 @define('DATE', 'Datum');
-@define('DATE_FORMAT_2', 'Y-m-d H:i'); // Moet aan ISO 8601 voldoen voor conversie!
-@define('DATE_INVALID', 'Opgelet: Ongeldige datum.Te gebruiken formaat: YYYY-MM-DD HH:MM ');
+@define('DATE_FORMAT_2', 'Y-m-d H:i'); // Must follow ISO 8601 standards for conversion
+@define('DATE_INVALID', 'Opgelet: Ongeldige datum. Het te gebruiken formaat is: YYYY-MM-DD HH:MM ');
 @define('CATEGORY_PLUGIN_DESC', 'Toon de categorie lijst.');
 @define('ALL_AUTHORS', 'Alle auteurs');
-@define('CATEGORIES_TO_FETCH', 'Op te laden Categorieën');
-@define('CATEGORIES_TO_FETCH_DESC', 'categorieën oplanden van welke auteur?');
+@define('CATEGORIES_TO_FETCH', 'Op te laden Categorie&euml;n');
+@define('CATEGORIES_TO_FETCH_DESC', 'categorie&euml;n opladen van welke auteur?');
 @define('PAGE_BROWSE_ENTRIES', 'Pagina %s van %s, telt %s logs');
 @define('PREVIOUS_PAGE', 'vorige pagina');
 @define('NEXT_PAGE', 'volgende pagina');
-@define('ALL_CATEGORIES', 'Alle categorieën');
+@define('ALL_CATEGORIES', 'Alle categorie&euml;n');
 @define('DO_MARKUP', 'Doe Markup Transformaties');
 @define('DO_MARKUP_DESCRIPTION', 'Pas markup transformaties toe op (smilies, shortcut markups via *, /, _, ...). Disabling bewaart HTML-code in de terkst. Default is "Yes".');
-@define('GENERAL_PLUGIN_DATEFORMAT', 'Formaat datum');
+@define('GENERAL_PLUGIN_DATEFORMAT', 'Datum aanduiding');
 @define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Het formaat van de datum van de log, gebruik makend van de PHP strftime() variabelen (Default: "%s")');
 @define('ERROR_TEMPLATE_FILE', 'Kan het template bestand niet openen, gelieve een update uit te voeren!');
-@define('ADVANCED_OPTIONS', 'Ge avanceerde opties');
+@define('ADVANCED_OPTIONS', 'Geavanceerde opties');
 @define('EDIT_ENTRY', 'Bewerk log');
 @define('HTACCESS_ERROR', 'Om de server installatie te controlleren moet serendipity het bestand  ".htaccess". kunnen schrijven. Dit is niet gelukt. Verander de permissies als volgt: <br />&nbsp;&nbsp;%s<br />en herlaad deze pagina.');
 @define('SIDEBAR_PLUGINS', 'Sidebar Plugins');
@@ -288,272 +290,270 @@
 @define('SORT_ORDER_WIDTH', 'Breedte van het beeld');
 @define('SORT_ORDER_HEIGHT', 'Hoogte van het beeld');
 @define('SORT_ORDER_DATE', 'Datum van opladen');
-@define('SORT_ORDER_ASC', 'Opgaand');
-@define('SORT_ORDER_DESC', 'Afgaand');
+@define('SORT_ORDER_ASC', 'Oplopend');
+@define('SORT_ORDER_DESC', 'Aflopend');
 @define('THUMBNAIL_SHORT', 'Thumbnail');
 @define('ORIGINAL_SHORT', 'Orig.');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Geen HTTP caching');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Als je dit "true" zet kan men geen caching doen om bandbreedte te besparen voor je RSS feed. Zet dit bij voorkeur op "false".');
+@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Als je dit "true" zet kan men geen caching doen om bandbreedte te besparen voor de RSS feed. Zet dit bij voorkeur op "false".');
 @define('APPLY_MARKUP_TO', 'Markup toepassen op %s');
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Start van de week');
 @define('SERENDIPITY_NEEDS_UPGRADE', 'Je installatie is %s, maar er is nu %s, je moet een upgrade uitvoeren! <a href="%s">Klik hier</a>');
 @define('SERENDIPITY_UPGRADER_WELCOME', 'Hallo, welkom voor de Serendipity upgrade.');
-@define('SERENDIPITY_UPGRADER_PURPOSE', 'Ik zal je helpen om de upgrade te doen van je %s installatie.');
-@define('SERENDIPITY_UPGRADER_WHY', 'Je ziet deze boodschap omdat je zojuist Serendipity %s hebt geïnstalleerd, maar je database moet nog worden aangepast voor deze versie');
+@define('SERENDIPITY_UPGRADER_PURPOSE', 'Ik zal helpen om de upgrade te doen van je %s installatie.');
+@define('SERENDIPITY_UPGRADER_WHY', 'Je ziet deze boodschap omdat je zojuist Serendipity %s heeft geïnstalleerd, maar de database moet nog worden aangepast voor deze versie');
 @define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Database update (%s)');
 @define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'Ik heb volgende .sql bestanden gevonden die je moet uitvoeren alvorens te starten met Serendipity');
 @define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Versie specifieke taken');
 @define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'Geen versie specifieke taken gevonden');
 @define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', 'Moet ik de hierboven vermelde taken uitvoeren?');
 @define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'Neen, Ik doe het zelf');
-@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'OK, doe maar');
-@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'Je hebt geen upgrade nodig');
+@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Okee, doe maar');
+@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'Je heeft geen upgrade nodig');
 @define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Serendipity upgraded');
-@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Je hebt de upgrade sstatus van Serendipity genegeerd, zorg ervoor dat de database juist is geïnstalleerd en dat de geplande functies werken');
+@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Je hebt de upgrade status van Serendipity genegeerd, zorg ervoor dat de database juist is ge&iuml;nstalleerd en dat de geplande functies werken');
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Je Serendipity installatie is nu versie %s');
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Om terug te gaan naar je blog klik %shier%s');
 
-/* TRANSLATE */
-@define('MANAGE_USERS', 'Manage users');
-@define('EDIT_USERS', 'Edit users');
-@define('CREATE_USERS', 'Create users');
-@define('CREATE_NEW_USER', 'Create new user');
-@define('CREATE_NOT_AUTHORIZED', 'You cannot modify users with the same userlevel as yourself');
-@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'You cannot create users with a higher userlevel than yourself');
-@define('CREATED_USER', 'A new user %s has been created');
-@define('MODIFIED_USER', 'The properties of user %s have been changed');
-@define('USER_SELF_INFO', 'logged in as %s, level %s');
-@define('USER_LEVEL', 'Userlevel');
-@define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.');
-@define('DELETED_USER', 'User #%d %s deleted.');
-@define('LIMIT_TO_NUMBER', 'How many items should be displayed?');
+@define('MANAGE_USERS', 'Gebruikers beheren');
+@define('EDIT_USERS', 'Gebruikes aanpassen');
+@define('CREATE_USERS', 'Gebruikers cre&euml;ren');
+@define('CREATE_NEW_USER', 'Nieuwe gebruiker cre&euml;ren');
+@define('CREATE_NOT_AUTHORIZED', 'Het is niet mogelijk gebruikers met hezelfde gebruikersniveau te wijzigen');
+@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Het is niet mogelijk gebruikers met een hoger gebruikersniveau dan jezelf aan te maken');
+@define('CREATED_USER', 'De nieuwe gebruiker %s is aangemaakt');
+@define('MODIFIED_USER', 'De eigenschappen van gebruiker %s zijn veranderd');
+@define('USER_SELF_INFO', 'Ingelogged als %s met gebruikersniveau %s');
+@define('USER_LEVEL', 'Gebruikersniveau');
+@define('DELETE_USER', 'Je staat op het punt gebruiker #%d %s te verwijderen. Weet je het zeker? Dit zal alle door hem toegevoegde stukken verwijderen van het blog.');
+@define('DELETED_USER', 'Gebruiker #%d %s is verwijderd.');
+@define('LIMIT_TO_NUMBER', 'Hoeveel items moeten worden weergegeven?');
 @define('FILTER', 'Filter');
-@define('ENTRIES_PER_PAGE', 'entries per page');
+@define('ENTRIES_PER_PAGE', 'artikelen per pagina');
 @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('XML_IMAGE_TO_DISPLAY_DESC','Links naar XML Feeds worden weergegeven met deze afbeelding. Laat leeg voor de standaard afbeelding of vul \'none\' in voor geen afbeelding.');
 
-@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('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('DIRECTORIES_AVAILABLE', 'In de lijst van beschikbare submap kan je ieder mapnaam aanklikken om daar een nieuwe map aan te maken.');
+@define('ALL_DIRECTORIES', 'alle mappen');
+@define('MANAGE_DIRECTORIES', 'Mappen beheren');
+@define('DIRECTORY_CREATED', 'Map <strong>%s</strong> is aangemaakt');
+@define('NEW_DIRECTORY', 'Cre&euml;er een nieuwe map');
+@define('PARENT_DIRECTORY', 'Bovenliggende map');
+@define('DELETE_DIRECTORY', 'Verwijder deze map');
+@define('CONFIRM_DELETE_DIRECTORY', 'Weet je zeker dat je alle inhoud in map %s wil verwijderen?');
+@define('ERROR_NO_DIRECTORY', 'Fout: Map %s bestaat niet');
+@define('FORCE_DELETE', 'Forceer het verwijderen van bestanden die niet in de media database staan');
+@define('CHECKING_DIRECTORY', 'Bezig met het controleren van de bestanden in map %s');
+@define('DELETING_FILE', 'Bezig met het verwijderen van bestand %s...');
+@define('ERROR_DIRECTORY_NOT_EMPTY', 'Het is niet mogelijk een niet lege map te verwijderen. Vink het "forceer verijderen" vakje aan als je de bestanden ook wilt verwijderen. Deze bestanden zijn:');
+@define('DIRECTORY_DELETE_FAILED', 'Het verwijderen van map %s is mislukt. Controleer de rechten of bovenstaande berichten.');
+@define('DIRECTORY_DELETE_SUCCESS', 'Map %s is verwijderd.');
+@define('SKIPPING_FILE_EXTENSION', 'Bestand overgeslagen: extensie van %s ontbreekt.');
+@define('SKIPPING_FILE_UNREADABLE', 'Bestand overgeslagen: %s is niet leesbaar.');
+@define('FOUND_FILE', 'Niewe of gewijzigde bestanden gevonden: %s.');
+@define('ALREADY_SUBCATEGORY', '%s is al een subcategorie van %s.');
+@define('PARENT_CATEGORY', 'Bovenliggende category');
+@define('REPLY', 'Antwoorden');
+@define('IN_REPLY_TO', 'Antwoord op');
+@define('TOP_LEVEL', 'Top niveau');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
-@define('PERMISSIONS', 'Permissions');
+@define('PERMISSIONS', 'Rechten');
 
 /* 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_CAT_DB', 'Database configuratie');
+@define('INSTALL_CAT_DB_DESC', 'Hier kan je alle informatie van de database invoeren. Serendipity heeft deze informatie nodig om te functioneren');
 @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_DBHOST_DESC', 'De hostnaam van de 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_DBUSER_DESC', 'De gebruikersnaam om verbinden te maken met de database');
+@define('INSTALL_DBPASS', 'Database wachtwoord');
+@define('INSTALL_DBPASS_DESC', 'Het wachtwoord voor de gebruikte user');
+@define('INSTALL_DBNAME', 'Database naam');
+@define('INSTALL_DBNAME_DESC', 'De naam van de database');
+@define('INSTALL_DBPREFIX', 'Database tabel prefix');
+@define('INSTALL_DBPREFIX_DESC', 'Prefix voor de tabelnamen, b.v. 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_CAT_PATHS_DESC', 'Verscheidene paths naar de verschillende essentie&euml;le mappen en bestanden. Vergeet niet de \'/\' achter de directories!');
+@define('INSTALL_FULLPATH', 'Volledige path');
+@define('INSTALL_FULLPATH_DESC', 'De volledige en absolute path naar de serendipity installatie lokatie');
 @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_UPLOADPATH_DESC', 'Alle uploads worden hier neergezet, relatief aan de \'Voledigepath\' - typisch is dit \'uploads/\'');
+@define('INSTALL_RELPATH', 'Relatieve path');
+@define('INSTALL_RELPATH_DESC', 'Path naar serendipity voor je browser, typisch \'/serendipity/\'');
+@define('INSTALL_RELTEMPLPATH', 'Relatieve template path');
+@define('INSTALL_RELTEMPLPATH_DESC', 'De path naar de map die de templates bevat templates - Relatief aan de \'relative path\'');
+@define('INSTALL_RELUPLOADPATH', 'Relatieve upload path');
+@define('INSTALL_RELUPLOADPATH_DESC', 'Path naar de uploads voor browsers - Relatief aan de \'relatieve path\'');
+@define('INSTALL_URL', 'URL naar het weblog');
+@define('INSTALL_URL_DESC', 'Basis URL naar de serendipity installatie');
 @define('INSTALL_INDEXFILE', 'Index file');
-@define('INSTALL_INDEXFILE_DESC', 'The name of your serendipity index file');
+@define('INSTALL_INDEXFILE_DESC', 'De naam van je serendipity index file');
 
 /* 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');
+@define('INSTALL_CAT_SETTINGS', 'Algemene instellingen');
+@define('INSTALL_CAT_SETTINGS_DESC', 'Aanpassen hoe Serendipity zich gedraagd');
+@define('INSTALL_USERNAME', 'Gebruikersnaam van de beheerder');
+@define('INSTALL_USERNAME_DESC', 'De gebruikersnaam van de beheerder');
+@define('INSTALL_PASSWORD', 'Berheerder wachtwoord');
+@define('INSTALL_PASSWORD_DESC', 'Wachtwoord admin login');
+@define('INSTALL_EMAIL', 'Berheerder email');
+@define('INSTALL_EMAIL_DESC', 'Email adres van de beheerder van het weblog');
+@define('INSTALL_SENDMAIL', 'Stuur email naar de beheerder?');
+@define('INSTALL_SENDMAIL_DESC', 'Wil je emails ontvangen als er reacties op je artikelen zijn gepost?');
+@define('INSTALL_SUBSCRIBE', 'Gebruikers toelaten zich te abonneren op artikelen?');
+@define('INSTALL_SUBSCRIBE_DESC', 'Gebruikers kunnen een email ontvangen wanneer er nieuwe reacties zijn geplaatst op een artikel');
+@define('INSTALL_BLOGNAME', 'Weblog naam');
+@define('INSTALL_BLOGNAME_DESC', 'De titel van je weblog');
+@define('INSTALL_BLOGDESC', 'Weblog omschrijving');
+@define('INSTALL_BLOGDESC_DESC', 'Omschrijving van je weblog');
+@define('INSTALL_LANG', 'Taal');
+@define('INSTALL_LANG_DESC', 'Selecteer de taal van je weblog');
 
 /* 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_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('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_CAT_DISPLAY', 'Uiterlijk en opties');
+@define('INSTALL_CAT_DISPLAY_DESC', 'Aanpassen hoe Serendipity er uitziet en zich gedraagt');
+@define('INSTALL_EXTERNALSTYLE', 'Externe Stylesheet');
+@define('INSTALL_EXTERNALSTYLE_DESC', 'Hier kun je een stylesheet URI opgeven, extra aan de instellingen in de admin interface (Vul \'none\' in als je did niet nodig hebt)');
+@define('INSTALL_WYSIWYG', 'Gebruik een WYSIWYG editor');
+@define('INSTALL_WYSIWYG_DESC', 'Wil je de WYSIWYG editor gebruiken?  (Werkt met IE5+, en gedeeltelijk in Mozilla 1.3+)');
+@define('INSTALL_XHTML11', 'Forceer XHTML 1.1 standaard');
+@define('INSTALL_XHTML11_DESC', 'Wil je XHTML 1.1 standaard forceren (dit kan problemen veroorzaken met oudere 4e generatie browsers)');
+@define('INSTALL_POPUP', 'Gebruik popups');
+@define('INSTALL_POPUP_DESC', 'Wil je dat dit weblog popup windows gebruikt voor reacties, trackbacks en dergelijke?');
+@define('INSTALL_EMBED', 'Is serendipity ge&iuml;ntregeerd?');
+@define('INSTALL_EMBED_DESC', 'Als serendipity wil integreren in een reguliere pagina vink dan deze optie aan om alleen inhoud weer te geven een geen headers. Je kan gebruik maken van de indexFile optie om een wrapper class te maken waar je de normale webpagina headers kan inzetten. Zie het README bestand voor meer informatie!');
+@define('INSTALL_TOP_AS_LINKS', 'Toon Top Exits/Referrers als links?');
+@define('INSTALL_TOP_AS_LINKS_DESC', '"nee": Exits en Referrers worden weergegeven als plain text om google spam te voorkomen. "yes": Exits en Referrers worden als hyperlinks getoont.  "default": Gebruik de instellingen van de globale configuratie (aanbevolen).');
+@define('INSTALL_BLOCKREF', 'Geblokeerde Referers');
+@define('INSTALL_BLOCKREF_DESC', 'Zijn er host die niet getoont moeten worden in de referers lijst? Gebruik \';\' als scheidingsteken tussen de hosts en merk op dat de host word geblokeerd als een deel van de naam overeenkomt!');
 @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_REWRITE_DESC', 'Selecteer welke regels je wilt gebruiken om URLs te genereren. Het gebuik van \'rewrite\' regel maakt nette URLs voor je weblog en maakt het beter indexeerbaar voor spiders zoals google. Het is noodzakelijk dat de webserver "mod_rewrite" or "AllowOverride All" voor de serendipity directory ondersteunt. De standaard instelling is auto-detected');
 
 /* 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_CAT_IMAGECONV', 'Configuratiegegevens voor de conversie van afbeeldingen');
+@define('INSTALL_CAT_IMAGECONV_DESC', 'Voer hier de informatie in over hoe serendipity moet omgaan met afbeeldingen');
+@define('INSTALL_IMAGEMAGICK', 'Gebruik Imagemagick');
+@define('INSTALL_IMAGEMAGICK_DESC', 'Is image magick ge&iuml;nstalleerd en wil je afbeeldingen kunnen vergroten of verkleinen?');
+@define('INSTALL_IMAGEMAGICKPATH', 'Path naar convert binary');
+@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Volledige path &amp; naam van de 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_THUMBSUFFIX_DESC', 'Thumbnails zullen benoemd worden op de volgende wijze: original.[suffix].ext');
+@define('INSTALL_THUMBWIDTH', 'Thumbnail dimensies');
+@define('INSTALL_THUMBWIDTH_DESC', 'Statisch maximum breedte van de automatisch gegeneerde thumbnails');
 
 /* Personal details */
-@define('USERCONF_CAT_PERSONAL', 'Your personal details');
-@define('USERCONF_CAT_PERSONAL_DESC', 'Change your personal details');
-@define('USERCONF_USERNAME', 'Your username');
-@define('USERCONF_USERNAME_DESC', 'The username you use to log in to the blog');
-@define('USERCONF_PASSWORD', 'Your password');
-@define('USERCONF_PASSWORD_DESC', 'The password you wish to use to log in to the blog');
-@define('USERCONF_USERLEVEL', 'Permissionlevel');
-@define('USERCONF_USERLEVEL_DESC', 'Userlevel. Should be one of the following: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chief editor, [USERLEVEL_EDITOR] - Standard editor.');
-@define('USERCONF_EMAIL', 'Your e-mail address');
-@define('USERCONF_EMAIL_DESC', 'Your personal e-mail address');
-@define('USERCONF_SENDCOMMENTS', 'Send comment announcements?');
-@define('USERCONF_SENDCOMMENTS_DESC', 'Do you want to receive emails when comments are posted to your entries?');
-@define('USERCONF_SENDTRACKBACKS', 'Send trackback announcements?');
-@define('USERCONF_SENDTRACKBACKS_DESC', 'Do you want to receive emails when trackbacks are posted to your entries?');
-@define('USERCONF_ALLOWPUBLISH', 'Rights: Publishing entries?');
-@define('USERCONF_ALLOWPUBLISH_DESC', 'Is this user allowed to publish entries?');
-@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('USERCONF_CAT_PERSONAL', 'Persoonlijke details');
+@define('USERCONF_CAT_PERSONAL_DESC', 'Verander je persoonlijke details');
+@define('USERCONF_USERNAME', 'Je gebruikersnaam');
+@define('USERCONF_USERNAME_DESC', 'Je gebruikersnaam om in te loggen op het weblog');
+@define('USERCONF_PASSWORD', 'Je wachtwoord');
+@define('USERCONF_PASSWORD_DESC', 'Het wachtwoord om in te loggen');
+@define('USERCONF_USERLEVEL', 'Gebruikersniveau');
+@define('USERCONF_USERLEVEL_DESC', 'Gebruikersniveau. Dit moet een van de volgende waarden hebben: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chief editor, [USERLEVEL_EDITOR] - Standard editor.');
+@define('USERCONF_EMAIL', 'Je e-mail adres');
+@define('USERCONF_EMAIL_DESC', 'Je persoonlijke e-mail adres');
+@define('USERCONF_SENDCOMMENTS', 'Stuur een e-mail bij reacties?');
+@define('USERCONF_SENDCOMMENTS_DESC', 'Wil je een e-mail ontvangen als er reacties op je artikel worden gepost?');
+@define('USERCONF_SENDTRACKBACKS', 'Stuur een e-mail bij trackbacks?');
+@define('USERCONF_SENDTRACKBACKS_DESC', 'Wil je een e-mail ontvangen als er een trackbacks op je artikel worden geplaatst?');
+@define('USERCONF_ALLOWPUBLISH', 'Rechten: Artikelen plaatsen?');
+@define('USERCONF_ALLOWPUBLISH_DESC', 'Is deze gebruiker bevoegd om artikelen te plaatsen?');
+@define('SUCCESS', 'Succes');
+@define('POWERED_BY_SHOW_TEXT', 'Toon "Serendipity" als tekst');
+@define('POWERED_BY_SHOW_TEXT_DESC', 'Toon "Serendipity Weblog" als tekst');
+@define('POWERED_BY_SHOW_IMAGE', 'Toon "Serendipity" met een logo');
+@define('POWERED_BY_SHOW_IMAGE_DESC', 'Toont het Serendipity logo');
 
-/* 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 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('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('VIEW_EXTENDED_ENTRY', 'Continue reading "%s"'); // 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('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('COMMENTS_MODERATE', 'Comments & trackbacks to this entry requires moderation'); // Re-translate
-@define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login');
-@define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
-@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?'); // Translate
-@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"no": Unchecked external links (Top Exits, Top Referrers, User comments) are not shown/shown as plain text where applicable to prevent google spam (recommended). "yes": Unchecked external links are shown as hyperlinks. Can be overridden within sidebar plugin configuration!'); // Translate
-@define('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('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate
-@define('MEDIA', 'Media'); // Translate
-@define('MEDIA_LIBRARY', 'Media library'); // Translate
-@define('ADD_MEDIA', 'Add media'); // Translate
-@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate
-@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate
-@define('SAVE_FILE_AS', 'Save the file as:'); // Translate
-@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate
-@define('MEDIA_RENAME', 'Rename this file'); // Translate
-@define('IMAGE_RESIZE', 'Resize this image'); // Translate
-@define('MEDIA_DELETE', 'Delete this file'); // Translate
-@define('FILES_PER_PAGE', 'Files per page'); // Translate
-@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate
-@define('SELECT_FILE', 'Select file to insert'); // Translate
-@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate
-@define('CALENDAR_BOW_DESC', 'The day of the week that should be considered the beginning of the week. Default is Monday'); // Translate
-@define('SUPERUSER', 'Blog Administration'); // Translate
-@define('ALLOWS_YOU_BLAHBLAH', 'Provides a link in the sidebar to your blog administration'); // Translate
-@define('CALENDAR', 'Calendar'); // Translate
-@define('SUPERUSER_OPEN_ADMIN', 'Open administration'); // Translate
-@define('SUPERUSER_OPEN_LOGIN', 'Open login screen'); // Translate
-@define('INVERT_SELECTIONS', 'Invert Selections'); // Translate
-@define('COMMENTS_DELETE_CONFIRM', 'Are you sure you wish to delete the selected comments?'); // Translate
-@define('COMMENT_DELETE_CONFIRM', 'Are you sure you wish to delete comment #%d, written by %s?'); // Translate
-@define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate
-@define('VIEW_COMMENT', 'View comment'); // Translate
-@define('VIEW_ENTRY', 'View entry'); // Translate
-@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate
-@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate
-@define('TRACKBACK_SENDING', 'Sending trackback to URI %s...'); // Translate
-@define('TRACKBACK_SENT', 'Trackback successful'); // Translate
-@define('TRACKBACK_FAILED', 'Trackback failed: %s'); // Translate
-@define('TRACKBACK_NOT_FOUND', 'No trackback-URI found.'); // Translate
-@define('TRACKBACK_URI_MISMATCH', 'The autodiscovered trackback URI does not match our target URI.'); // Translate
-@define('TRACKBACK_CHECKING', 'Checking <u>%s</u> for possible trackbacks...'); // Translate
-@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('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
+@define('SETTINGS_SAVED_AT', 'De nieuwe configuratie is opgeslagen als %s');
+@define('PLUGIN_ITEM_DISPLAY', 'Waar moet de plugin worden weergegen?');
+@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 opent een RSS feed en voegt alle artikelen toe in de verzameling. Je kan kiezen of je deez wilt importeren als proef als gelijk wilt publiceren. Categorie&euml;n in de ge&iuml;mporteerde feed moeten exact dezelfde naam hebben als in Serendipity. Via de het andere invulveld kun je de categorie kiezen die er anders aan toegekend moet worden.');
+@define('RSS_IMPORT_CATEGORY', 'Gebruik deze categorie voor niet matchende ge&euml;mporteerde artikel');
+@define('ERROR_UNKNOWN_NOUPLOAD', 'Er is een ongedefini&euml;erde fout opgetreden. Het bestand is niet geupload. Mogelijk is de bestandsgrootte groter dan het maximum toegestaan door de server. Vraag je ISP of bewerk je php.ini bestand om groter bestand uploads toe te laten.');
+@define('COMMENTS_WILL_BE_MODERATED', 'Reacties zullen eerst worden gemoderreerd voordat het getoond wordt.');
+@define('YOU_HAVE_THESE_OPTIONS', 'De volgende opties zijn mogelijk:');
+@define('THIS_COMMENT_NEEDS_REVIEW', 'Waarschuwing: Deze reactie moet eerst worden goedgekeurd voordat het getoond wordt');
+@define('DELETE_COMMENT', 'Verwijder reactie');
+@define('APPROVE_COMMENT', 'Keur reactie goed');
+@def...
 
[truncated message content]

[php-blog-cvs] serendipity/lang serendipity_lang_nl.inc.php,1.40,1.41

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

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

Modified Files:
	serendipity_lang_nl.inc.php 
Log Message:
updated durch language file, thanks to Ronald Goris


Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- serendipity_lang_nl.inc.php	20 Oct 2004 16:27:25 -0000	1.40
+++ serendipity_lang_nl.inc.php	27 Oct 2004 08:46:19 -0000	1.41
@@ -11,6 +11,8 @@
 #                           pa...@ti...                          #
 #                           blog: http://www.time-smart.org/serendipity  #
 #                                                                        #
+#                           Ronald Goris                                 #
+#                                                                        #
 ##########################################################################
 
 @define('LANG_CHARSET', 'ISO-8859-1');
@@ -19,8 +21,8 @@
 @define('WYSIWYG_LANG', 'nl');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administratie');
-@define('HAVE_TO_BE_LOGGED_ON', 'u moet ingelogd zijn om deze pagina te zien');
-@define('WRONG_USERNAME_OR_PASSWORD', 'Naam en/of paswoord verkeerd!');
+@define('HAVE_TO_BE_LOGGED_ON', 'je moet ingelogd zijn om deze pagina te bekijken');
+@define('WRONG_USERNAME_OR_PASSWORD', 'Naam en/of wachtwoord is verkeerd!');
 @define('APPEARANCE', 'Look');
 @define('MANAGE_STYLES', 'Beheer stijlen');
 @define('CONFIGURE_PLUGINS', 'Configuratie Plugins');
@@ -31,27 +33,27 @@
 @define('LOGIN', 'Login');
 @define('LOGOUT', 'Loguit');
 @define('LOGGEDOUT', 'Uitgelogged.');
-@define('CREATE', 'Maak');
+@define('CREATE', 'Aanmaken');
 @define('EDIT_THIS_CAT', 'Bewerken "%s - %s"');
-@define('SAVE', 'Bewaar');
+@define('SAVE', 'Bewaren');
 @define('NAME', 'Naam');
-@define('CLICK_CAT_TO_EDIT', 'Klik op een categorie om ze te bewerken');
+@define('CLICK_CAT_TO_EDIT', 'Klik op een categorie om deze te bewerken');
 @define('CREATE_NEW_CAT', 'Maak een nieuwe categorie');
 @define('I_WANT_THUMB', 'Ik wil de thumbnail gebruiken in mijn input.');
 @define('I_WANT_BIG_IMAGE', 'Ik wil een groter beeld in mijn input');
 @define('I_WANT_NO_LINK', ' Ik wil het tonen als een beeld');
-@define('I_WANT_IT_TO_LINK', 'Iik wil het tonen als een link naar deze url:');
+@define('I_WANT_IT_TO_LINK', 'Ik wil het tonen als een link naar deze url:');
 @define('BACK', 'Terug');
 @define('FORWARD', 'Verder');
 @define('ANONYMOUS', 'Anoniem');
-@define('LINK_TO_COMMENT', 'Link naar commentaar #');
+@define('LINK_TO_COMMENT', 'Link naar reactie #');
 @define('SEND_MAIL_TO', 'Stuur mail naar');
 @define('NEW_TRACKBACK_TO', 'Nieuwe trackback aangemaakt naar');
-@define('NEW_COMMENT_TO', 'Nieuwe commentaar geplaatst op');
+@define('NEW_COMMENT_TO', 'Nieuwe reactie geplaatst op');
 @define('RECENT', 'Recent...');
 @define('OLDER', 'Ouder...');
 @define('DONE', 'Gedaan');
-@define('WELCOME_BACK', 'Blij u terug te zien,');
+@define('WELCOME_BACK', 'Welkom terug,');
 @define('RUNNING', 'Je werkt met Serendipity v.');
 @define('ADD_PLUGIN', 'Plugin toevoegen');
 @define('TITLE', 'Titel');
@@ -59,61 +61,61 @@
 @define('PLACEMENT', 'Plaats');
 @define('DELETE', 'Verwijder');
 @define('SAVE', 'Bewaar');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Kies de plugin die u wil toevoegen');
+@define('SELECT_A_PLUGIN_TO_ADD', 'Kies de plugin die je wilt toevoegen');
 @define('UP', 'OP');
 @define('DOWN', 'NEER');
 @define('ENTRIES', 'Logs:');
 @define('NEW_ENTRY', 'Nieuwe log');
 @define('AUTHOR_SUITE', 'Auteur Suite');
 @define('EDIT_ENTRIES', 'Bewerk logs');
-@define('CATEGORIES', 'Categorieën');
-@define('EDIT_CATEGORIES', 'Beheer Categorieën');
-@define('WARNING_THIS_BLAHBLAH', "OPGELET:\\nAls er vele beelden zonder thumbnail zijn zou dit lang kunnen duren.");
-@define('CREATE_THUMBS', 'Aanmaken van Thumbnailss');
-@define('MANAGE_IMAGES', 'Beheer Beelden');
+@define('CATEGORIES', 'Categorieën');
+@define('EDIT_CATEGORIES', 'Beheer Categorieën');
+@define('WARNING_THIS_BLAHBLAH', "OPGELET:\\nAls er vele beelden zonder thumbnail zijn kan dit lang duren.");
+@define('CREATE_THUMBS', 'Aanmaken van Thumbnails');
+@define('MANAGE_IMAGES', 'Beheer Afbeeldingen');
 @define('ADMIN_INTERFACE', 'Admin interface');
-@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Autheur Suite');
+@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Auteur Suite');
 @define('NAME', 'Naam');
 @define('EMAIL', 'E-mail');
 @define('HOMEPAGE', 'Homepage');
-@define('COMMENT', 'Commentaar');
+@define('COMMENT', 'Reacties');
 @define('REMEMBER_INFO', 'Informatie bewaren? ');
-@define('SUBMIT_COMMENT', 'Commentaar toevoegen');
+@define('SUBMIT_COMMENT', 'Reactie toevoegen');
 @define('NO_ENTRIES_TO_PRINT', 'Geen logs gevonden.');
-@define('COMMENTS', 'Commentaar');
-@define('ADD_COMMENT', 'Commentaar toeveoegen');
-@define('NO_COMMENTS', 'Geen commentaar.');
-@define('POSTED_BY', 'Aangepaakt door');
+@define('COMMENTS', 'Reactie');
+@define('ADD_COMMENT', 'Reactie toevoegen');
+@define('NO_COMMENTS', 'Geen reacties.');
+@define('POSTED_BY', 'Gepost door');
 @define('ON', 'aan');
-@define('A_NEW_COMMENT_BLAHBLAH', 'Een nieuwe commentaar werd toegevoegd aan uw blog "%s", in de log met titel "%s".');
-@define('A_NEW_TRACKBACK_BLAHBLAH', 'Een nieuwe trackback werd toegevoegd aan uw log met titel "%s".');
-@define('NO_CATEGORY', 'Geen Categorie');
+@define('A_NEW_COMMENT_BLAHBLAH', 'Een nieuwe reactie werd toegevoegd aan je blog "%s", in de log met titel "%s".');
+@define('A_NEW_TRACKBACK_BLAHBLAH', 'Een nieuwe trackback werd toegevoegd aan je log met titel "%s".');
+@define('NO_CATEGORY', 'Geen categorie');
 @define('ENTRY_BODY', 'Log aanhef');
 @define('EXTENDED_BODY', 'Log compleet');
 @define('CATEGORY', 'Categorie:');
 @define('EDIT', 'Bewerk');
 @define('NO_ENTRIES_BLAHBLAH', 'Geen logs gevonden met %s' . "\n");
-@define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Uw zoekopdracht naar %s geeft %s resultaten :');
-@define('SEARCH_TOO_SHORT', 'Uw zoekwoord moet langer zijn dan 3 karakters');
-@define('IMAGE', 'Beeld');
+@define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Je zoekopdracht naar %s geeft %s resultaten :');
+@define('SEARCH_TOO_SHORT', 'Je zoekwoord moet langer zijn dan 3 karakters');
+@define('IMAGE', 'Afbeelding');
 @define('ERROR_FILE_NOT_EXISTS', 'Fout: Oude bestandnaam bestaat niet');
 @define('ERROR_FILE_EXISTS', 'Fout: Nieuwe bestandnaam bestaat reeds.');
-@define('ERROR_SOMETHING', 'Four: Iets gaat mis.');
+@define('ERROR_SOMETHING', 'Fout: Iets gaat mis.');
 @define('ADDING_IMAGE', 'Toevoegen beeld...');
 @define('THUMB_CREATED_DONE', 'Thumbnail aangemaakt.<br>Done.');
-@define('ERROR_FILE_EXISTS_ALREADY', 'Fout: Bestand bestaat reeds op uw computer!');
-@define('GO', 'Go!');
-@define('NEWSIZE', 'Niewe grootte: ');
+@define('ERROR_FILE_EXISTS_ALREADY', 'Fout: Bestand bestaat reeds op je computer!');
+@define('GO', 'Gaan');
+@define('NEWSIZE', 'Nieuwe grootte: ');
 @define('RESIZE_BLAHBLAH', '<b>Vergroten/Verkleinen %s</b><p>');
 @define('ORIGINAL_SIZE', 'Oorspronkelijke grootte: <i>%sx%s</i> pixel');
-@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Hier kan je de grootte van het beeld aanpassen. Wil je de verhouding tussen hoogte en breedte bewaren, geef één waarde, gevolgd door de TAB toets:');
+@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Hier kun je de grootte van het beeld aanpassen. Wil je de verhouding tussen hoogte en breedte behouden, geef &eacute;&eacute;n waarde, gevolgd door de TAB toets:');
 @define('QUICKJUMP_CALENDAR', 'Kalender');
 @define('QUICKSEARCH', 'Snel zoeken');
 @define('SEARCH_FOR_ENTRY', 'Zoek een log');
 @define('ARCHIVES', 'Archief');
 @define('BROWSE_ARCHIVES', 'Doorzoek het archief op maand');
 @define('TOP_REFERRER', 'Top Referrers');
-@define('SHOWS_TOP_SITES', 'Toont de top sites die linken naar uw blogs');
+@define('SHOWS_TOP_SITES', 'Toont de top sites die linken naar je blogs');
 @define('TOP_EXITS', 'Top Exits');
 @define('SHOWS_TOP_EXIT', 'Toont waar men je blog verlaat');
 @define('SYNDICATION', 'Syndication');
@@ -127,7 +129,7 @@
 @define('SYNDICATE_THIS_BLOG', 'Syndicate deze Blog');
 @define('YOU_CHOSE', 'U kiest %s');
 @define('IMAGE_SIZE', 'Beeldgrootte');
-@define('IMAGE_AS_A_LINK', 'Toeveogen van een beeld');
+@define('IMAGE_AS_A_LINK', 'Toevoegen van een beeld');
 @define('POWERED_BY', 'Powered by');
 @define('TRACKBACKS', 'Trackbacks');
 @define('TRACKBACK', 'Trackback');
@@ -138,30 +140,30 @@
 @define('AT', 'op');
 @define('SET_AS_TEMPLATE', 'Gebruik als template');
 @define('IN', 'in');
-@define('EXCERPT', 'Uittreksel');
+@define('EXCERPT', 'Uitreksel');
 @define('TRACKED', 'Tracked');
 @define('LINK_TO_ENTRY', 'Link naar log');
 @define('LINK_TO_REMOTE_ENTRY', 'Link naar remote-log');
-@define('IP_ADDRESS', 'IP-address');
+@define('IP_ADDRESS', 'IP-adres');
 @define('USER', 'Gebruiker');
 @define('THUMBNAIL_USING_OWN', 'Ik gebruik %s omdat het reeds klein is.');
 @define('THUMBNAIL_FAILED_COPY', 'Ik wou %s gebruiken maar kon geen copy maken!');
 @define('AUTHOR', 'Auteur');
-@define('LAST_UPDATED', 'Laaste Update');
+@define('LAST_UPDATED', 'Laatste update');
 @define('TRACKBACK_SPECIFIC', 'Trackback specifiek URL voor deze log');
 @define('DIRECT_LINK', 'Directe link naar deze log');
-@define('COMMENT_ADDED', 'Dank U. Uw commentaar werd toegevoegd. ');
-@define('COMMENT_ADDED_CLICK', 'Klik  %shier om terug te gaan%s naar de commentaar en %shier om af te sluiten%s');
-@define('COMMENT_NOT_ADDED', 'Commentaar is niet toegelaten op deze log. ');
-@define('COMMENT_NOT_ADDED_CLICK', 'Klik %shier om terug te gaan%s naar de commentaar en %shier om af te sluiten%s');
-@define('COMMENTS_DISABLE', 'Commentaar verboden voor deze log');
-@define('COMMENTS_ENABLE', 'Commentaar toegelaten voor deze log');
-@define('COMMENTS_CLOSED', 'De auteur laat geen commentaar toe op deze log');
-@define('EMPTY_COMMENT', 'Geen commetaar opgegeven %sg terug%s en probeer opnieuw');
+@define('COMMENT_ADDED', 'Dank je. Je reactie is toegevoegd. ');
+@define('COMMENT_ADDED_CLICK', 'Klik  %shier om terug te gaan%s naar de reacties en %shier om af te sluiten%s');
+@define('COMMENT_NOT_ADDED', 'Reacties zijn niet toegelaten op deze log. ');
+@define('COMMENT_NOT_ADDED_CLICK', 'Klik %shier om terug te gaan%s naar de reacties of %shier om af te sluiten%s');
+@define('COMMENTS_DISABLE', 'Reacties zijn niet toegestaan voor deze log');
+@define('COMMENTS_ENABLE', 'Reacties toe laten voor dit artikel');
+@define('COMMENTS_CLOSED', 'De auteur laat geen reacties toe op deze log');
+@define('EMPTY_COMMENT', 'Geen reactie opgegeven %sga terug%s en probeer opnieuw');
 @define('ENTRIES_FOR', 'Logs voor %s');
 @define('DOCUMENT_NOT_FOUND', 'Het document %s werd niet gevonden.');
 @define('USERNAME', 'Gebruiker');
-@define('PASSWORD', 'Paswoord');
+@define('PASSWORD', 'Wachtwoord');
 @define('AUTOMATIC_LOGIN', 'Bewaar deze informatie');
 @define('SERENDIPITY_INSTALLATION', 'Serendipity installatie');
 @define('LEFT', 'links');
@@ -169,18 +171,18 @@
 @define('HIDDEN', 'verborgen');
 @define('REMOVE_TICKED_PLUGINS', 'Verwijder de aangeduide plugins');
 @define('SAVE_CHANGES_TO_LAYOUT', 'Bewaar de aanpassingen aan de layout');
-@define('COMMENTS_FROM', 'Commentaar van');
-@define('ERROR', 'Foutr');
+@define('COMMENTS_FROM', 'Reactie van');
+@define('ERROR', 'Fout');
 @define('ENTRY_SAVED', 'Log bewaard');
-@define('DELETE_SURE', 'Bent u zeker dat u #%s definitief wil verwijderen?');
+@define('DELETE_SURE', 'Weet je zeker dat je #%s definitief wilt verwijderen?');
 @define('NOT_REALLY', 'Niet echt...');
-@define('DUMP_IT', 'De weg!');
+@define('DUMP_IT', 'Doe weg!');
 @define('RIP_ENTRY', 'R.I.P. log #%s');
-@define('CATEGORY_DELETED', 'Categorie #%s verwijderd. Oude logs werden verplaatst naar #%s');
+@define('CATEGORY_DELETED', 'Categorie #%s is verwijderd. Oude logs werden verplaatst naar #%s');
 @define('CATEGORY_REMAINING', 'Verwijder deze categorie en verplaats de logs naar de categorie: %s');
 @define('INVALID_CATEGORY', 'Geen categorie opgegeven om te verwijderen');
-@define('CATEGORY_SAVED', 'Categorie bewaard');
-@define('SELECT_TEMPLATE', 'Kies de template die je wil gebruiken voor je blog');
+@define('CATEGORY_SAVED', 'Categorie is bewaard');
+@define('SELECT_TEMPLATE', 'Kies de template die je wilt gebruiken voor je blog');
 @define('ENTRIES_SUCCESSFULLY_INSERTED', 'Logs toegevoegd!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Logs werden NIET toegevoegd!');
 @define('VIEW_FEED_EXPORT', 'Toon export lijst');
@@ -195,55 +197,55 @@
 @define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; start <i>%s %s</i>');
 @define('CANT_EXECUTE_BINARY', 'Kan %s niet uitvoeren');
 @define('FILE_WRITE_ERROR', 'Kan het bestand %s niet aanmaken.');
-@define('FILE_CREATE_YOURSELF', 'Maak a.u.b. zelf het bestand en check de permissies');
+@define('FILE_CREATE_YOURSELF', 'Maak zelf het bestand en check de permissies');
 @define('COPY_CODE_BELOW', '<br />* copieer de code hierna en plaats ze in %s in %s folder:<b><pre>%s</pre></b>' . "\n");
-@define('WWW_USER', 'Verander www naar de gebruiker waarop apache wraait (bvb nobody).');
+@define('WWW_USER', 'Verander www naar de gebruiker waarop apache draait (bv. nobody).');
 @define('BROWSER_RELOAD', 'Eens dat gedaan klik "refresh" in je browser.');
-@define('DIAGNOSTIC_ERROR', 'We hebben een paar fouten gevonden:');
-@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity is nog niet geïnstalleerd. <a href="%s">install</a> nu.');
-@define('INCLUDE_ERROR', 'serendipity fout: kon %s nirt toevoegen - ik stop.');
-@define('DATABASE_ERROR', 'serendipity fout: ik kan niet aansluiten op de database - ik stop.');
+@define('DIAGNOSTIC_ERROR', 'Er zijn een paar fouten gevonden:');
+@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity is nog niet ge&iuml;nstalleerd. <a href="%s">install</a> nu.');
+@define('INCLUDE_ERROR', 'serendipity fout: kon %s niet worden toevoegd - ik stop.');
+@define('DATABASE_ERROR', 'serendipity fout: Er kon geen verbinding worden gemaakt met de database - ik stop.');
 @define('ATTEMPT_SETUP_DATABASE', 'Setup van de database...');
-@define('CHECK_DATABASE_EXISTS', 'Check of database bestaat.  Zie je een database query fout dan mag je deze negeren...');
+@define('CHECK_DATABASE_EXISTS', 'Check of database bestaat.  Zie je een database query fout dan kan je deze negeren...');
 @define('CREATE_DATABASE', 'Aanmaken default database setup...');
 @define('DATABASE_DONE', 'Database aangemaakt');
 @define('ATTEMPT_WRITE_FILE', 'Ik probeer volgende bestand %s te maken...');
-@define('SERENDIPITY_INSTALLED', '%sSerendipity werd goed geïnstalleerd.%s Vergeet je paswoord niet: "%s", Je username is "%s".%sJe nieuwe blog is te vinden op <a href="%s">right here</a>');
-@define('WRITTEN_N_SAVED', 'Configuratie &amp; bewaard');
-@define('IMAGE_ALIGNMENT', 'Beeld alignering');
+@define('SERENDIPITY_INSTALLED', '%sSerendipity werd goed geïnstalleerd.%s Vergeet je wachtwoord niet: "%s", Je username is "%s".%sUw nieuwe blog is <a href="%s">hier</a> te vinden.');
+@define('WRITTEN_N_SAVED', 'Configuratie is opgeslagen');
+@define('IMAGE_ALIGNMENT', 'Afbeelding alignering');
 @define('ENTER_NEW_NAME', 'Geef een nieuwe naam voor: ');
 @define('RESIZING', 'Vergroten/Verkleinen');
 @define('RESIZE_DONE', 'Gedaane ( %s aangepast).');
 @define('SYNCING', 'Syncronizeren van de database met de beeldfolder');
-@define('SYNC_DONE', 'Gedaan ( %s Beelden gesynchroniseerd).');
+@define('SYNC_DONE', 'Gedaan ( %s Afbeeldingen gesynchroniseerd).');
 @define('DELETE_IMAGE_FAIL' , 'Onmogelijk om het beeld te verwijderen <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'verwijder de thumbnail voor het beeld met als naam <b>%s</b>');
 @define('FILE_NOT_FOUND', 'Ik kan het bestand <b>%s</b> niet vinden, het werd vermoedelijk reeds verwijderd');
 @define('ABORT_NOW', 'Stop nu');
-@define('REMOTE_FILE_NOT_FOUND', 'Bestand niet gevonden op de server. Ben je zeker dat de URL: <b>%s</b> juist is?');
+@define('REMOTE_FILE_NOT_FOUND', 'Bestand niet gevonden op de server. Weet je zeker dat de URL: <b>%s</b> juist is?');
 @define('FILE_FETCHED', '%s opgeladen als %s');
 @define('FILE_UPLOADED', 'Bestand %s werd goed opgeladen als %s');
 @define('WORD_OR', 'Of');
 @define('SCALING_IMAGE', 'Schaal %s naar %s x %s px');
 @define('KEEP_PROPORTIONS', 'Verhouding tussen hoogte en breedte behouden');
-@define('REALLY_SCALE_IMAGE', 'Ben je zeker? Er is geen weg terug!');
-@define('TOGGLE_ALL', 'Toggle expand alles');
-@define('TOGGLE_OPTION', 'Toggle optie');
+@define('REALLY_SCALE_IMAGE', 'Weet je het zeker? Er is geen weg terug!');
+@define('TOGGLE_ALL', 'Alles uit- of inklappen');
+@define('TOGGLE_OPTION', 'Uitklappen');
 @define('SUBSCRIBE_TO_THIS_ENTRY', 'Inschrijven op deze log');
 @define('UNSUBSCRIBE_OK', "%s is nu uitgeschreven voor deze log");
-@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Nieuwe commentaar voor ingeschreven log "%s"');
-@define('SUBSCRIPTION_MAIL', "Hallo %s,\n\nEen nieuwe comment werd toegevoegd aan de log waarop je bent ingeschreven \"%s\", met als titel \"%s\"\nDe naam van de auteur is:: %s\n\nHier vind je de log: %s\n\nOm je uit te schrijven klik hier: %s\n");
-@define('SUBSCRIPTION_TRACKBACK_MAIL', "Hallo %s,\n\nEen nieuwe trackback werd toegevoegd aan de log waarop je bent ingeschreven \"%s\", met als titel \"%s\"\nde naam van de auteur is: %s\n\nHier vind je de log: %s\n\nOm je uit te schrijven klik hier: %s\n");
-@define('SIGNATURE', "\n-- \n%s is powered by Serendipity.\nDé beste blog, ook jij kan het gebruiken.\nKijk maar <http://s9y.org> en zie hoe.");
-@define('DATABASE_ALREADY_INSTALLED', 'SKIPPED: Database reeds geïnstaleerd');
+@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Nieuwe reactie voor ingeschreven log "%s"');
+@define('SUBSCRIPTION_MAIL', "Hallo %s,\n\nEen nieuwe comment werd toegevoegd aan de log waarop je bent ingeschreven \"%s\", met als titel \"%s\"\nDe naam van de auteur is: %s\n\nHier vind je de log: %s\n\nOm je uit te schrijven klik je hier: %s\n");
+@define('SUBSCRIPTION_TRACKBACK_MAIL', "Hallo %s,\n\nEen nieuwe trackback werd toegevoegd aan de log waarop je bent ingeschreven \"%s\", met als titel \"%s\"\nde naam van de auteur is: %s\n\nHier vind je de log: %s\n\nOm je uit te schrijven klik je hier: %s\n");
+@define('SIGNATURE', "\n-- \n%s is powered by Serendipity.\nKijk maar <http://s9y.org> en zie hoe.");
+@define('DATABASE_ALREADY_INSTALLED', 'SKIPPED: Database reeds ge&iuml;nstaleerd');
 @define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
 @define('SYNDICATION_PLUGIN_10', 'RSS 1.0 feed');
 @define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
-@define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 commentaar');
+@define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 reacties');
 @define('SYNDICATION_PLUGIN_ATOM03', 'ATOM 0.3 feed');
 @define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Field "Hoofdredacteur"');
 @define('SYNDICATION_PLUGIN_WEBMASTER',  'Field "webMaster"');
-@define('SYNDICATION_PLUGIN_BANNERURL', 'Beeld voor de RSS feed');
+@define('SYNDICATION_PLUGIN_BANNERURL', 'Afbeelding bij de RSS feed');
 @define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Breedte van het beeld');
 @define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Hoogte van het beeld');
 @define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'E-Mail adres van de webmaster. (leeg: verborgen) [RSS 2.0]');
@@ -261,22 +263,22 @@
 @define('PUBLISH', 'Publiceer');
 @define('PREVIEW', 'Voorbeeld');
 @define('DATE', 'Datum');
-@define('DATE_FORMAT_2', 'Y-m-d H:i'); // Moet aan ISO 8601 voldoen voor conversie!
-@define('DATE_INVALID', 'Opgelet: Ongeldige datum.Te gebruiken formaat: YYYY-MM-DD HH:MM ');
+@define('DATE_FORMAT_2', 'Y-m-d H:i'); // Must follow ISO 8601 standards for conversion
+@define('DATE_INVALID', 'Opgelet: Ongeldige datum. Het te gebruiken formaat is: YYYY-MM-DD HH:MM ');
 @define('CATEGORY_PLUGIN_DESC', 'Toon de categorie lijst.');
 @define('ALL_AUTHORS', 'Alle auteurs');
-@define('CATEGORIES_TO_FETCH', 'Op te laden Categorieën');
-@define('CATEGORIES_TO_FETCH_DESC', 'categorieën oplanden van welke auteur?');
+@define('CATEGORIES_TO_FETCH', 'Op te laden Categorie&euml;n');
+@define('CATEGORIES_TO_FETCH_DESC', 'categorie&euml;n opladen van welke auteur?');
 @define('PAGE_BROWSE_ENTRIES', 'Pagina %s van %s, telt %s logs');
 @define('PREVIOUS_PAGE', 'vorige pagina');
 @define('NEXT_PAGE', 'volgende pagina');
-@define('ALL_CATEGORIES', 'Alle categorieën');
+@define('ALL_CATEGORIES', 'Alle categorie&euml;n');
 @define('DO_MARKUP', 'Doe Markup Transformaties');
 @define('DO_MARKUP_DESCRIPTION', 'Pas markup transformaties toe op (smilies, shortcut markups via *, /, _, ...). Disabling bewaart HTML-code in de terkst. Default is "Yes".');
-@define('GENERAL_PLUGIN_DATEFORMAT', 'Formaat datum');
+@define('GENERAL_PLUGIN_DATEFORMAT', 'Datum aanduiding');
 @define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Het formaat van de datum van de log, gebruik makend van de PHP strftime() variabelen (Default: "%s")');
 @define('ERROR_TEMPLATE_FILE', 'Kan het template bestand niet openen, gelieve een update uit te voeren!');
-@define('ADVANCED_OPTIONS', 'Ge avanceerde opties');
+@define('ADVANCED_OPTIONS', 'Geavanceerde opties');
 @define('EDIT_ENTRY', 'Bewerk log');
 @define('HTACCESS_ERROR', 'Om de server installatie te controlleren moet serendipity het bestand  ".htaccess". kunnen schrijven. Dit is niet gelukt. Verander de permissies als volgt: <br />&nbsp;&nbsp;%s<br />en herlaad deze pagina.');
 @define('SIDEBAR_PLUGINS', 'Sidebar Plugins');
@@ -288,277 +290,275 @@
 @define('SORT_ORDER_WIDTH', 'Breedte van het beeld');
 @define('SORT_ORDER_HEIGHT', 'Hoogte van het beeld');
 @define('SORT_ORDER_DATE', 'Datum van opladen');
-@define('SORT_ORDER_ASC', 'Opgaand');
-@define('SORT_ORDER_DESC', 'Afgaand');
+@define('SORT_ORDER_ASC', 'Oplopend');
+@define('SORT_ORDER_DESC', 'Aflopend');
 @define('THUMBNAIL_SHORT', 'Thumbnail');
 @define('ORIGINAL_SHORT', 'Orig.');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Geen HTTP caching');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Als je dit "true" zet kan men geen caching doen om bandbreedte te besparen voor je RSS feed. Zet dit bij voorkeur op "false".');
+@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Als je dit "true" zet kan men geen caching doen om bandbreedte te besparen voor de RSS feed. Zet dit bij voorkeur op "false".');
 @define('APPLY_MARKUP_TO', 'Markup toepassen op %s');
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Start van de week');
 @define('SERENDIPITY_NEEDS_UPGRADE', 'Je installatie is %s, maar er is nu %s, je moet een upgrade uitvoeren! <a href="%s">Klik hier</a>');
 @define('SERENDIPITY_UPGRADER_WELCOME', 'Hallo, welkom voor de Serendipity upgrade.');
-@define('SERENDIPITY_UPGRADER_PURPOSE', 'Ik zal je helpen om de upgrade te doen van je %s installatie.');
-@define('SERENDIPITY_UPGRADER_WHY', 'Je ziet deze boodschap omdat je zojuist Serendipity %s hebt geïnstalleerd, maar je database moet nog worden aangepast voor deze versie');
+@define('SERENDIPITY_UPGRADER_PURPOSE', 'Ik zal helpen om de upgrade te doen van je %s installatie.');
+@define('SERENDIPITY_UPGRADER_WHY', 'Je ziet deze boodschap omdat je zojuist Serendipity %s heeft geïnstalleerd, maar de database moet nog worden aangepast voor deze versie');
 @define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Database update (%s)');
 @define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'Ik heb volgende .sql bestanden gevonden die je moet uitvoeren alvorens te starten met Serendipity');
 @define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Versie specifieke taken');
 @define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'Geen versie specifieke taken gevonden');
 @define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', 'Moet ik de hierboven vermelde taken uitvoeren?');
 @define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'Neen, Ik doe het zelf');
-@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'OK, doe maar');
-@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'Je hebt geen upgrade nodig');
+@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Okee, doe maar');
+@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'Je heeft geen upgrade nodig');
 @define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Serendipity upgraded');
-@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Je hebt de upgrade sstatus van Serendipity genegeerd, zorg ervoor dat de database juist is geïnstalleerd en dat de geplande functies werken');
+@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Je hebt de upgrade status van Serendipity genegeerd, zorg ervoor dat de database juist is ge&iuml;nstalleerd en dat de geplande functies werken');
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Je Serendipity installatie is nu versie %s');
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Om terug te gaan naar je blog klik %shier%s');
 
-/* TRANSLATE */
-@define('MANAGE_USERS', 'Manage users');
-@define('EDIT_USERS', 'Edit users');
-@define('CREATE_USERS', 'Create users');
-@define('CREATE_NEW_USER', 'Create new user');
-@define('CREATE_NOT_AUTHORIZED', 'You cannot modify users with the same userlevel as yourself');
-@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'You cannot create users with a higher userlevel than yourself');
-@define('CREATED_USER', 'A new user %s has been created');
-@define('MODIFIED_USER', 'The properties of user %s have been changed');
-@define('USER_SELF_INFO', 'logged in as %s, level %s');
-@define('USER_LEVEL', 'Userlevel');
-@define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.');
-@define('DELETED_USER', 'User #%d %s deleted.');
-@define('LIMIT_TO_NUMBER', 'How many items should be displayed?');
+@define('MANAGE_USERS', 'Gebruikers beheren');
+@define('EDIT_USERS', 'Gebruikes aanpassen');
+@define('CREATE_USERS', 'Gebruikers cre&euml;ren');
+@define('CREATE_NEW_USER', 'Nieuwe gebruiker cre&euml;ren');
+@define('CREATE_NOT_AUTHORIZED', 'Het is niet mogelijk gebruikers met hezelfde gebruikersniveau te wijzigen');
+@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Het is niet mogelijk gebruikers met een hoger gebruikersniveau dan jezelf aan te maken');
+@define('CREATED_USER', 'De nieuwe gebruiker %s is aangemaakt');
+@define('MODIFIED_USER', 'De eigenschappen van gebruiker %s zijn veranderd');
+@define('USER_SELF_INFO', 'Ingelogged als %s met gebruikersniveau %s');
+@define('USER_LEVEL', 'Gebruikersniveau');
+@define('DELETE_USER', 'Je staat op het punt gebruiker #%d %s te verwijderen. Weet je het zeker? Dit zal alle door hem toegevoegde stukken verwijderen van het blog.');
+@define('DELETED_USER', 'Gebruiker #%d %s is verwijderd.');
+@define('LIMIT_TO_NUMBER', 'Hoeveel items moeten worden weergegeven?');
 @define('FILTER', 'Filter');
-@define('ENTRIES_PER_PAGE', 'entries per page');
+@define('ENTRIES_PER_PAGE', 'artikelen per pagina');
 @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('XML_IMAGE_TO_DISPLAY_DESC','Links naar XML Feeds worden weergegeven met deze afbeelding. Laat leeg voor de standaard afbeelding of vul \'none\' in voor geen afbeelding.');
 
-@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('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('DIRECTORIES_AVAILABLE', 'In de lijst van beschikbare submap kan je ieder mapnaam aanklikken om daar een nieuwe map aan te maken.');
+@define('ALL_DIRECTORIES', 'alle mappen');
+@define('MANAGE_DIRECTORIES', 'Mappen beheren');
+@define('DIRECTORY_CREATED', 'Map <strong>%s</strong> is aangemaakt');
+@define('NEW_DIRECTORY', 'Cre&euml;er een nieuwe map');
+@define('PARENT_DIRECTORY', 'Bovenliggende map');
+@define('DELETE_DIRECTORY', 'Verwijder deze map');
+@define('CONFIRM_DELETE_DIRECTORY', 'Weet je zeker dat je alle inhoud in map %s wil verwijderen?');
+@define('ERROR_NO_DIRECTORY', 'Fout: Map %s bestaat niet');
+@define('FORCE_DELETE', 'Forceer het verwijderen van bestanden die niet in de media database staan');
+@define('CHECKING_DIRECTORY', 'Bezig met het controleren van de bestanden in map %s');
+@define('DELETING_FILE', 'Bezig met het verwijderen van bestand %s...');
+@define('ERROR_DIRECTORY_NOT_EMPTY', 'Het is niet mogelijk een niet lege map te verwijderen. Vink het "forceer verijderen" vakje aan als je de bestanden ook wilt verwijderen. Deze bestanden zijn:');
+@define('DIRECTORY_DELETE_FAILED', 'Het verwijderen van map %s is mislukt. Controleer de rechten of bovenstaande berichten.');
+@define('DIRECTORY_DELETE_SUCCESS', 'Map %s is verwijderd.');
+@define('SKIPPING_FILE_EXTENSION', 'Bestand overgeslagen: extensie van %s ontbreekt.');
+@define('SKIPPING_FILE_UNREADABLE', 'Bestand overgeslagen: %s is niet leesbaar.');
+@define('FOUND_FILE', 'Niewe of gewijzigde bestanden gevonden: %s.');
+@define('ALREADY_SUBCATEGORY', '%s is al een subcategorie van %s.');
+@define('PARENT_CATEGORY', 'Bovenliggende category');
+@define('REPLY', 'Antwoorden');
+@define('IN_REPLY_TO', 'Antwoord op');
+@define('TOP_LEVEL', 'Top niveau');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
-@define('PERMISSIONS', 'Permissions');
+@define('PERMISSIONS', 'Rechten');
 
 /* 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_CAT_DB', 'Database configuratie');
+@define('INSTALL_CAT_DB_DESC', 'Hier kan je alle informatie van de database invoeren. Serendipity heeft deze informatie nodig om te functioneren');
 @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_DBHOST_DESC', 'De hostnaam van de 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_DBUSER_DESC', 'De gebruikersnaam om verbinden te maken met de database');
+@define('INSTALL_DBPASS', 'Database wachtwoord');
+@define('INSTALL_DBPASS_DESC', 'Het wachtwoord voor de gebruikte user');
+@define('INSTALL_DBNAME', 'Database naam');
+@define('INSTALL_DBNAME_DESC', 'De naam van de database');
+@define('INSTALL_DBPREFIX', 'Database tabel prefix');
+@define('INSTALL_DBPREFIX_DESC', 'Prefix voor de tabelnamen, b.v. 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_CAT_PATHS_DESC', 'Verscheidene paths naar de verschillende essentie&euml;le mappen en bestanden. Vergeet niet de \'/\' achter de directories!');
+@define('INSTALL_FULLPATH', 'Volledige path');
+@define('INSTALL_FULLPATH_DESC', 'De volledige en absolute path naar de serendipity installatie lokatie');
 @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_UPLOADPATH_DESC', 'Alle uploads worden hier neergezet, relatief aan de \'Voledigepath\' - typisch is dit \'uploads/\'');
+@define('INSTALL_RELPATH', 'Relatieve path');
+@define('INSTALL_RELPATH_DESC', 'Path naar serendipity voor je browser, typisch \'/serendipity/\'');
+@define('INSTALL_RELTEMPLPATH', 'Relatieve template path');
+@define('INSTALL_RELTEMPLPATH_DESC', 'De path naar de map die de templates bevat templates - Relatief aan de \'relative path\'');
+@define('INSTALL_RELUPLOADPATH', 'Relatieve upload path');
+@define('INSTALL_RELUPLOADPATH_DESC', 'Path naar de uploads voor browsers - Relatief aan de \'relatieve path\'');
+@define('INSTALL_URL', 'URL naar het weblog');
+@define('INSTALL_URL_DESC', 'Basis URL naar de serendipity installatie');
 @define('INSTALL_INDEXFILE', 'Index file');
-@define('INSTALL_INDEXFILE_DESC', 'The name of your serendipity index file');
+@define('INSTALL_INDEXFILE_DESC', 'De naam van je serendipity index file');
 
 /* 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');
+@define('INSTALL_CAT_SETTINGS', 'Algemene instellingen');
+@define('INSTALL_CAT_SETTINGS_DESC', 'Aanpassen hoe Serendipity zich gedraagd');
+@define('INSTALL_USERNAME', 'Gebruikersnaam van de beheerder');
+@define('INSTALL_USERNAME_DESC', 'De gebruikersnaam van de beheerder');
+@define('INSTALL_PASSWORD', 'Berheerder wachtwoord');
+@define('INSTALL_PASSWORD_DESC', 'Wachtwoord admin login');
+@define('INSTALL_EMAIL', 'Berheerder email');
+@define('INSTALL_EMAIL_DESC', 'Email adres van de beheerder van het weblog');
+@define('INSTALL_SENDMAIL', 'Stuur email naar de beheerder?');
+@define('INSTALL_SENDMAIL_DESC', 'Wil je emails ontvangen als er reacties op je artikelen zijn gepost?');
+@define('INSTALL_SUBSCRIBE', 'Gebruikers toelaten zich te abonneren op artikelen?');
+@define('INSTALL_SUBSCRIBE_DESC', 'Gebruikers kunnen een email ontvangen wanneer er nieuwe reacties zijn geplaatst op een artikel');
+@define('INSTALL_BLOGNAME', 'Weblog naam');
+@define('INSTALL_BLOGNAME_DESC', 'De titel van je weblog');
+@define('INSTALL_BLOGDESC', 'Weblog omschrijving');
+@define('INSTALL_BLOGDESC_DESC', 'Omschrijving van je weblog');
+@define('INSTALL_LANG', 'Taal');
+@define('INSTALL_LANG_DESC', 'Selecteer de taal van je weblog');
 
 /* 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_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('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_CAT_DISPLAY', 'Uiterlijk en opties');
+@define('INSTALL_CAT_DISPLAY_DESC', 'Aanpassen hoe Serendipity er uitziet en zich gedraagt');
+@define('INSTALL_EXTERNALSTYLE', 'Externe Stylesheet');
+@define('INSTALL_EXTERNALSTYLE_DESC', 'Hier kun je een stylesheet URI opgeven, extra aan de instellingen in de admin interface (Vul \'none\' in als je did niet nodig hebt)');
+@define('INSTALL_WYSIWYG', 'Gebruik een WYSIWYG editor');
+@define('INSTALL_WYSIWYG_DESC', 'Wil je de WYSIWYG editor gebruiken?  (Werkt met IE5+, en gedeeltelijk in Mozilla 1.3+)');
+@define('INSTALL_XHTML11', 'Forceer XHTML 1.1 standaard');
+@define('INSTALL_XHTML11_DESC', 'Wil je XHTML 1.1 standaard forceren (dit kan problemen veroorzaken met oudere 4e generatie browsers)');
+@define('INSTALL_POPUP', 'Gebruik popups');
+@define('INSTALL_POPUP_DESC', 'Wil je dat dit weblog popup windows gebruikt voor reacties, trackbacks en dergelijke?');
+@define('INSTALL_EMBED', 'Is serendipity ge&iuml;ntregeerd?');
+@define('INSTALL_EMBED_DESC', 'Als serendipity wil integreren in een reguliere pagina vink dan deze optie aan om alleen inhoud weer te geven een geen headers. Je kan gebruik maken van de indexFile optie om een wrapper class te maken waar je de normale webpagina headers kan inzetten. Zie het README bestand voor meer informatie!');
+@define('INSTALL_TOP_AS_LINKS', 'Toon Top Exits/Referrers als links?');
+@define('INSTALL_TOP_AS_LINKS_DESC', '"nee": Exits en Referrers worden weergegeven als plain text om google spam te voorkomen. "yes": Exits en Referrers worden als hyperlinks getoont.  "default": Gebruik de instellingen van de globale configuratie (aanbevolen).');
+@define('INSTALL_BLOCKREF', 'Geblokeerde Referers');
+@define('INSTALL_BLOCKREF_DESC', 'Zijn er host die niet getoont moeten worden in de referers lijst? Gebruik \';\' als scheidingsteken tussen de hosts en merk op dat de host word geblokeerd als een deel van de naam overeenkomt!');
 @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_REWRITE_DESC', 'Selecteer welke regels je wilt gebruiken om URLs te genereren. Het gebuik van \'rewrite\' regel maakt nette URLs voor je weblog en maakt het beter indexeerbaar voor spiders zoals google. Het is noodzakelijk dat de webserver "mod_rewrite" or "AllowOverride All" voor de serendipity directory ondersteunt. De standaard instelling is auto-detected');
 
 /* 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_CAT_IMAGECONV', 'Configuratiegegevens voor de conversie van afbeeldingen');
+@define('INSTALL_CAT_IMAGECONV_DESC', 'Voer hier de informatie in over hoe serendipity moet omgaan met afbeeldingen');
+@define('INSTALL_IMAGEMAGICK', 'Gebruik Imagemagick');
+@define('INSTALL_IMAGEMAGICK_DESC', 'Is image magick ge&iuml;nstalleerd en wil je afbeeldingen kunnen vergroten of verkleinen?');
+@define('INSTALL_IMAGEMAGICKPATH', 'Path naar convert binary');
+@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Volledige path &amp; naam van de 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_THUMBSUFFIX_DESC', 'Thumbnails zullen benoemd worden op de volgende wijze: original.[suffix].ext');
+@define('INSTALL_THUMBWIDTH', 'Thumbnail dimensies');
+@define('INSTALL_THUMBWIDTH_DESC', 'Statisch maximum breedte van de automatisch gegeneerde thumbnails');
 
 /* Personal details */
-@define('USERCONF_CAT_PERSONAL', 'Your personal details');
-@define('USERCONF_CAT_PERSONAL_DESC', 'Change your personal details');
-@define('USERCONF_USERNAME', 'Your username');
-@define('USERCONF_USERNAME_DESC', 'The username you use to log in to the blog');
-@define('USERCONF_PASSWORD', 'Your password');
-@define('USERCONF_PASSWORD_DESC', 'The password you wish to use to log in to the blog');
-@define('USERCONF_USERLEVEL', 'Permissionlevel');
-@define('USERCONF_USERLEVEL_DESC', 'Userlevel. Should be one of the following: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chief editor, [USERLEVEL_EDITOR] - Standard editor.');
-@define('USERCONF_EMAIL', 'Your e-mail address');
-@define('USERCONF_EMAIL_DESC', 'Your personal e-mail address');
-@define('USERCONF_SENDCOMMENTS', 'Send comment announcements?');
-@define('USERCONF_SENDCOMMENTS_DESC', 'Do you want to receive emails when comments are posted to your entries?');
-@define('USERCONF_SENDTRACKBACKS', 'Send trackback announcements?');
-@define('USERCONF_SENDTRACKBACKS_DESC', 'Do you want to receive emails when trackbacks are posted to your entries?');
-@define('USERCONF_ALLOWPUBLISH', 'Rights: Publishing entries?');
-@define('USERCONF_ALLOWPUBLISH_DESC', 'Is this user allowed to publish entries?');
-@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('USERCONF_CAT_PERSONAL', 'Persoonlijke details');
+@define('USERCONF_CAT_PERSONAL_DESC', 'Verander je persoonlijke details');
+@define('USERCONF_USERNAME', 'Je gebruikersnaam');
+@define('USERCONF_USERNAME_DESC', 'Je gebruikersnaam om in te loggen op het weblog');
+@define('USERCONF_PASSWORD', 'Je wachtwoord');
+@define('USERCONF_PASSWORD_DESC', 'Het wachtwoord om in te loggen');
+@define('USERCONF_USERLEVEL', 'Gebruikersniveau');
+@define('USERCONF_USERLEVEL_DESC', 'Gebruikersniveau. Dit moet een van de volgende waarden hebben: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chief editor, [USERLEVEL_EDITOR] - Standard editor.');
+@define('USERCONF_EMAIL', 'Je e-mail adres');
+@define('USERCONF_EMAIL_DESC', 'Je persoonlijke e-mail adres');
+@define('USERCONF_SENDCOMMENTS', 'Stuur een e-mail bij reacties?');
+@define('USERCONF_SENDCOMMENTS_DESC', 'Wil je een e-mail ontvangen als er reacties op je artikel worden gepost?');
+@define('USERCONF_SENDTRACKBACKS', 'Stuur een e-mail bij trackbacks?');
+@define('USERCONF_SENDTRACKBACKS_DESC', 'Wil je een e-mail ontvangen als er een trackbacks op je artikel worden geplaatst?');
+@define('USERCONF_ALLOWPUBLISH', 'Rechten: Artikelen plaatsen?');
+@define('USERCONF_ALLOWPUBLISH_DESC', 'Is deze gebruiker bevoegd om artikelen te plaatsen?');
+@define('SUCCESS', 'Succes');
+@define('POWERED_BY_SHOW_TEXT', 'Toon "Serendipity" als tekst');
+@define('POWERED_BY_SHOW_TEXT_DESC', 'Toon "Serendipity Weblog" als tekst');
+@define('POWERED_BY_SHOW_IMAGE', 'Toon "Serendipity" met een logo');
+@define('POWERED_BY_SHOW_IMAGE_DESC', 'Toont het Serendipity logo');
 
-/* 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 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('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('VIEW_EXTENDED_ENTRY', 'Continue reading "%s"'); // 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('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('COMMENTS_MODERATE', 'Comments & trackbacks to this entry requires moderation'); // Re-translate
-@define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login');
-@define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
-@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?'); // Translate
-@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"no": Unchecked external links (Top Exits, Top Referrers, User comments) are not shown/shown as plain text where applicable to prevent google spam (recommended). "yes": Unchecked external links are shown as hyperlinks. Can be overridden within sidebar plugin configuration!'); // Translate
-@define('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('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate
-@define('MEDIA', 'Media'); // Translate
-@define('MEDIA_LIBRARY', 'Media library'); // Translate
-@define('ADD_MEDIA', 'Add media'); // Translate
-@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate
-@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate
-@define('SAVE_FILE_AS', 'Save the file as:'); // Translate
-@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate
-@define('MEDIA_RENAME', 'Rename this file'); // Translate
-@define('IMAGE_RESIZE', 'Resize this image'); // Translate
-@define('MEDIA_DELETE', 'Delete this file'); // Translate
-@define('FILES_PER_PAGE', 'Files per page'); // Translate
-@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate
-@define('SELECT_FILE', 'Select file to insert'); // Translate
-@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate
-@define('CALENDAR_BOW_DESC', 'The day of the week that should be considered the beginning of the week. Default is Monday'); // Translate
-@define('SUPERUSER', 'Blog Administration'); // Translate
-@define('ALLOWS_YOU_BLAHBLAH', 'Provides a link in the sidebar to your blog administration'); // Translate
-@define('CALENDAR', 'Calendar'); // Translate
-@define('SUPERUSER_OPEN_ADMIN', 'Open administration'); // Translate
-@define('SUPERUSER_OPEN_LOGIN', 'Open login screen'); // Translate
-@define('INVERT_SELECTIONS', 'Invert Selections'); // Translate
-@define('COMMENTS_DELETE_CONFIRM', 'Are you sure you wish to delete the selected comments?'); // Translate
-@define('COMMENT_DELETE_CONFIRM', 'Are you sure you wish to delete comment #%d, written by %s?'); // Translate
-@define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate
-@define('VIEW_COMMENT', 'View comment'); // Translate
-@define('VIEW_ENTRY', 'View entry'); // Translate
-@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate
-@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate
-@define('TRACKBACK_SENDING', 'Sending trackback to URI %s...'); // Translate
-@define('TRACKBACK_SENT', 'Trackback successful'); // Translate
-@define('TRACKBACK_FAILED', 'Trackback failed: %s'); // Translate
-@define('TRACKBACK_NOT_FOUND', 'No trackback-URI found.'); // Translate
-@define('TRACKBACK_URI_MISMATCH', 'The autodiscovered trackback URI does not match our target URI.'); // Translate
-@define('TRACKBACK_CHECKING', 'Checking <u>%s</u> for possible trackbacks...'); // Translate
-@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('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
+@define('SETTINGS_SAVED_AT', 'De nieuwe configuratie is opgeslagen als %s');
+@define('PLUGIN_ITEM_DISPLAY', 'Waar moet de plugin worden weergegen?');
+@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 opent een RSS feed en voegt alle artikelen toe in de verzameling. Je kan kiezen of je deez wilt importeren als proef als gelijk wilt publiceren. Categorie&euml;n in de ge&iuml;mporteerde feed moeten exact dezelfde naam hebben als in Serendipity. Via de het andere invulveld kun je de categorie kiezen die er anders aan toegekend moet worden.');
+@define('RSS_IMPORT_CATEGORY', 'Gebruik deze categorie voor niet matchende ge&euml;mporteerde artikel');
+@define('ERROR_UNKNOWN_NOUPLOAD', 'Er is een ongedefini&euml;erde fout opgetreden. Het bestand is niet geupload. Mogelijk is de bestandsgrootte groter dan het maximum toegestaan door de server. Vraag je ISP of bewerk je php.ini bestand om groter bestand uploads toe te laten.');
+@define('COMMENTS_WILL_BE_MODERATED', 'Reacties zullen eerst worden gemoderreerd voordat het getoond wordt.');
+@define('YOU_HAVE_THESE_OPTIONS', 'De volgende opties zijn mogelijk:');
+@define('THIS_COMMENT_NEEDS_REVIEW', 'Waarschuwing: Deze reactie moet eerst worden goedgekeurd voordat het getoond wordt');
+@define('DELETE_COMMENT', 'Verwijder reactie');
+@define('APPROVE_COMMENT', 'Keur reactie goed');
+@define('REQUIRES_REVIEW', 'Heeft goedkeuring nodig');
+@define('COMMENT_APPROVED', 'Reactie #%s is goedgekeurd');
+@define('COMMENT_DELETED', 'Reactie #%s is verwijderd');
+@define('VIEW', 'Toon');
+@define('COMMENT_ALREADY_APPROVED', 'Reactie #%s lijkt al te zijn goedgekeurd');
+@define('COMMENT_EDITED', 'De geselecteerde reactie is aangepast');
+@define('HIDE', 'Verbergen');
+@define('VIEW_EXTENDED_ENTRY', 'Doorgaan met lezen "%s"');
+@define('TRACKBACK_SPECIFIC_ON_CLICK', 'Deze link is niet bedoelt om op te klikken. Het bevat de trackback URI for dit artikel. Deze URI kan gebruikt worden voor het zenden van ping- & trackbacks vanuit je eigen weblog naar dit artikel.');
+@define('THIS_TRACKBACK_NEEDS_REVIEW', 'Waarschuwing: Deze trackback heeft goedkeuring nodig voordat het getoond wordt');
+@define('DELETE_TRACKBACK', 'Verwijder trackback');
+@define('APPROVE_TRACKBACK', 'Keur trackback goed');
+@define('TRACKBACK_APPROVED', 'Trackback #%s is goedgekeurd');
+@define('TRACKBACK_DELETED', 'Trackback #%s is verwijderd');
+@define('COMMENTS_MODERATE', 'Reacties & trackbacks naar dit artikel eerste modereren');
+@define('PLUGIN_SUPERUSER_HTTPS', 'Gebruik https voor inloggen');
+@define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Laat de login-link verwijzen naar een https-lokatie. Je webserver moet dit ondersteunen!');
+@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Maak extene links aanklikbaar?');
+@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"nee": 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', 'Pagina %s van %s, totaal %s reacties');
+@define('FILTERS', 'Filters');
+@define('FIND_ENTRIES', 'Zoek artikelen');
+@define('FIND_COMMENTS', 'Zoek reactie');
+@define('FIND_MEDIA', 'Zoek media');
+@define('FILTER_DIRECTORY', 'Directory');
+@define('SORT_BY', 'Sorteren op');
+@define('TRACKBACK_COULD_NOT_CONNECT', 'Geen Trackback verzonden: Verbinding naar %s op poort %d was niet mogelijk');
+@define('MEDIA', 'Media');
+@define('MEDIA_LIBRARY', 'Media bibliotheek');
+@define('ADD_MEDIA', 'Media toevoegen');
+@define('ENTER_MEDIA_URL', 'Vul de URL in van het te downloaden bestand om te downloaden');
+@define('ENTER_MEDIA_UPLOAD', 'Selecteer het bestand dat je wil uploaden:');
+@define('SAVE_FILE_AS', 'Sla het bestand op als:');
+@define('STORE_IN_DIRECTORY', 'Opslaan in de volgende directory: ');
+@define('MEDIA_RENAME', 'Hernoem het bestand');
+@define('IMAGE_RESIZE', 'Vergroot of verklein het plaatje');
+@define('MEDIA_DELETE', 'Verwijder het bestand');
+@define('FILES_PER_PAGE', 'Bestanden per pagina');
+@define('CLICK_FILE_TO_INSERT', 'Klik op het bestand dat je wilt invoegen:');
+@define('SELECT_FILE', 'Selecteer het bestand dat je wilt invoegen');
+@define('MEDIA_FULLSIZE', 'Volledige grootte');
+@define('CALENDAR_BOW_DESC', 'De dag van de week die als begin beschouwd moet worden. Standaard is maandag');
+@define('SUPERUSER', 'Weblog Administratie');
+@define('ALLOWS_YOU_BLAHBLAH', 'Toont een link in de sidebar naar de weblog administratie');
+@define('CALENDAR', 'Kalender');
+@define('SUPERUSER_OPEN_ADMIN', 'Open administratie');
+@define('SUPERUSER_OPEN_LOGIN', 'Open login scherm');
+@define('INVERT_SELECTIONS', 'Inverteer de selectie');
+@define('COMMENTS_DELETE_CONFIRM', 'Weet je zeker dat je de geselecteerde reactie wilt verwijderen?');
+@define('COMMENT_DELETE_CONFIRM', 'Weet je zeker dat je reactie #%d, gescrhreven door %s wilt verwijderen?');
+@define('DELETE_SELECTED_COMMENTS', 'Verwijder de geselecteerde reactie');
+@define('VIEW_COMMENT', 'Reactie weergeven');
+@define('VIEW_ENTRY', 'Toon artikel');
+@define('DELETE_FILE', 'Verwijder het bestand genaamd <b>%s</b>');
+@define('ABOUT_TO_DELETE_FILE', 'Je wil het bestand <b>%s</b><br /> verwijderen. Als dit bestand in een van de artikelen gebruikt word veroorzaakt dit dode links en plaatjes<br />Weet je zeker dat je door wil gaan?<br /><br />');
+@define('TRACKBACK_SENDING', 'Trackback wordt verstuurd naar URI %s...');
+@define('TRAC...
 
[truncated message content]

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.419.2.54,1.419.2.55 NEWS,1.214.2.38,1.214.2.39

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_functions.inc.php NEWS 
Log Message:
when searching for autodetected links, now not only accept text within <a> tags, but also <img> tags. Their alt-attribute will be used as description for the link title.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.38
retrieving revision 1.214.2.39
diff -u -d -r1.214.2.38 -r1.214.2.39
--- NEWS	22 Oct 2004 17:33:51 -0000	1.214.2.38
+++ NEWS	26 Oct 2004 14:27:58 -0000	1.214.2.39
@@ -3,7 +3,10 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
-    * Implement plugin install() and uninstall() methods that are called 
+    * Routine for autodetecting links within an entry will now also
+      allow images to be used as description. (garvinhicking)
+
+    * Implement plugin install() and uninstall() methods that are called
       on installation and removal of a plugin (tomsommer)
 
     * Improve overall rewrite path syntax (tomsommer)

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.54
retrieving revision 1.419.2.55
diff -u -d -r1.419.2.54 -r1.419.2.55
--- serendipity_functions.inc.php	26 Oct 2004 13:33:47 -0000	1.419.2.54
+++ serendipity_functions.inc.php	26 Oct 2004 14:27:56 -0000	1.419.2.55
@@ -2064,7 +2064,7 @@
 function serendipity_handle_references($id, $author, $title, $text) {
     global $serendipity;
 
-    if (!preg_match_all('@<a[^>]+?href\s*=\s*["\']?([^\'" >]+?)[ \'"][^>]*>([^<]*)</a>@i', $text, $matches)) {
+    if (!preg_match_all('@<a[^>]+?href\s*=\s*["\']?([^\'" >]+?)[ \'"][^>]*>(.+?)</a>@i', $text, $matches)) {
         return;
     }
 
@@ -2076,7 +2076,8 @@
 
     // Add URL references
     $locations = $matches[0];
-    $names = $matches[1];
+    $names     = $matches[1];
+
     $tmpid = serendipity_db_escape_string($id);
 
     $checked_locations = array();
@@ -2085,10 +2086,20 @@
             $locations[$i] = 'http' . (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off' ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . $locations[$i];
         }
 
-        if ( isset($checked_locations[$locations[$i]]) ) {
+        if (isset($checked_locations[$locations[$i]])) {
             continue;
         }
 
+        if (preg_match_all('@<img[^>]+?alt=["\']?([^\'">]+?)[\'"][^>]+?>@i', $names[$i], $img_alt)) {
+            if (is_array($img_alt) && is_array($img_alt[0])) {
+                foreach($img_alt[0] as $alt_idx => $alt_img) {
+                    // Replace all <img>s within a link with their respective ALT tag, so that references
+                    // can be stored with a title.
+                    $names[$i] = str_replace($alt_img, $img_alt[1][$alt_idx], $names[$i]);
+                }
+            }
+        }
+
         $query = "SELECT COUNT(id) FROM {$serendipity['dbPrefix']}references
                                   WHERE entry_id = '". (int)$tmpid ."'
                                     AND link = '" . serendipity_db_escape_string($locations[$i]) . "'";
@@ -2107,7 +2118,7 @@
 
     for ($i = 0; $i < $j; ++$i) {
         $query = "INSERT INTO {$serendipity['dbPrefix']}references (entry_id, name, link) VALUES(";
-        $query .= "'$tmpid', '" . serendipity_db_escape_string($names[$i]) . "', '";
+        $query .= "'$tmpid', '" . serendipity_db_escape_string(strip_tags($names[$i])) . "', '";
         $query .= serendipity_db_escape_string($locations[$i]) . "')";
 
         serendipity_db_query($query);

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.4.2.19,1.4.2.20

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_spamblock.php 
Log Message:
one last MFH for jannis ;)


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.4.2.19
retrieving revision 1.4.2.20
diff -u -d -r1.4.2.19 -r1.4.2.20
--- serendipity_event_spamblock.php	7 Oct 2004 10:32:03 -0000	1.4.2.19
+++ serendipity_event_spamblock.php	26 Oct 2004 13:36:00 -0000	1.4.2.20
@@ -351,7 +351,7 @@
                     if ($show_captcha) {
                         echo '<div class="serendipity_commentDirection">';
                         if (!isset($serendipity['POST']['preview']) || strtolower($serendipity['POST']['captcha'] != strtolower($_SESSION['spamblock']['captcha']))) {
-                            echo '<br />' . PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC . '<br /><label for="captcha">';
+                            echo '<br />' . PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC . '<br />';
                             if ($use_gd) {
                                 printf('<img src="%s" title="%s" alt="CAPTCHA" class="captcha" />',
                                     $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/captcha_' . md5(time()),
@@ -370,8 +370,8 @@
                                 }
                                 echo '</div>';
                             }
-                            echo '</label><br />';
-                            echo PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3 . '<br /><input type="text" size="5" name="serendipity[captcha]" value="" id="captcha" />';
+                            echo '<br /><label for="captcha">';
+                            echo PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3 . '</label><br /><input type="text" size="5" name="serendipity[captcha]" value="" id="captcha" />';
                         } elseif (isset($serendipity['POST']['captcha'])) {
                             echo '<input type="hidden" name="serendipity[captcha]" value="' . htmlspecialchars($serendipity['POST']['captcha']) . '" />';
                         }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.419.2.53,1.419.2.54

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_functions.inc.php 
Log Message:
MFHx


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.53
retrieving revision 1.419.2.54
diff -u -d -r1.419.2.53 -r1.419.2.54
--- serendipity_functions.inc.php	22 Oct 2004 17:33:51 -0000	1.419.2.53
+++ serendipity_functions.inc.php	26 Oct 2004 13:33:47 -0000	1.419.2.54
@@ -333,7 +333,7 @@
                          c.category_icon,
                          c.parentid
                     FROM {$serendipity['dbPrefix']}category AS c
-                    JOIN {$serendipity['dbPrefix']}entrycat AS ec
+              INNER JOIN {$serendipity['dbPrefix']}entrycat AS ec
                       ON ec.categoryid = c.categoryid
                    WHERE ec.entryid = {$entryid}";
 

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.450,1.451

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
mysql 3.x does not support a simple 'JOIN', so an 'INNER' one is needed.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -d -r1.450 -r1.451
--- serendipity_functions.inc.php	22 Oct 2004 17:31:09 -0000	1.450
+++ serendipity_functions.inc.php	26 Oct 2004 13:32:19 -0000	1.451
@@ -592,7 +592,7 @@
                          c.category_icon,
                          c.parentid
                     FROM {$serendipity['dbPrefix']}category AS c
-                    JOIN {$serendipity['dbPrefix']}entrycat AS ec
+              INNER JOIN {$serendipity['dbPrefix']}entrycat AS ec
                       ON ec.categoryid = c.categoryid
                    WHERE ec.entryid = {$entryid}";
 

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.24,1.25

[Jannis H. <jhe...@us...>]

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
Don't produce invalid (X)HTML: <div> inside <label> is not allowed. Do you
agree with labeling the kaptcha input field like this? Or should the long
description be the label?


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_event_spamblock.php	7 Oct 2004 10:31:22 -0000	1.24
+++ serendipity_event_spamblock.php	26 Oct 2004 13:24:16 -0000	1.25
@@ -351,7 +351,7 @@
                     if ($show_captcha) {
                         echo '<div class="serendipity_commentDirection">';
                         if (!isset($serendipity['POST']['preview']) || strtolower($serendipity['POST']['captcha'] != strtolower($_SESSION['spamblock']['captcha']))) {
-                            echo '<br />' . PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC . '<br /><label for="captcha">';
+                            echo '<br />' . PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC . '<br />';
                             if ($use_gd) {
                                 printf('<img src="%s" title="%s" alt="CAPTCHA" class="captcha" />',
                                     $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/captcha_' . md5(time()),
@@ -370,8 +370,8 @@
                                 }
                                 echo '</div>';
                             }
-                            echo '</label><br />';
-                            echo PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3 . '<br /><input type="text" size="5" name="serendipity[captcha]" value="" id="captcha" />';
+                            echo '<br />';
+                            echo '<label for="captcha">'. PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3 . '</label><br /><input type="text" size="5" name="serendipity[captcha]" value="" id="captcha" />';
                         } elseif (isset($serendipity['POST']['captcha'])) {
                             echo '<input type="hidden" name="serendipity[captcha]" value="' . htmlspecialchars($serendipity['POST']['captcha']) . '" />';
                         }

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

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

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

Modified Files:
	serendipity_admin_plugins.inc.php 
Log Message:
- Fix invalid javascript redirection URI


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- serendipity_admin_plugins.inc.php	3 Sep 2004 23:12:48 -0000	1.44
+++ serendipity_admin_plugins.inc.php	24 Oct 2004 16:55:09 -0000	1.45
@@ -347,8 +347,8 @@
         if ($value === 'unset') {
             /* Try and the default value for the config item */
             $value = $cbag->get('default');
-           
-            /* Still, we don't have a value, try and get (bool)false - from an old plugin */ 
+
+            /* 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);
             }
@@ -559,7 +559,7 @@
 
         /* Only play with the plugin if there is something to play with */
         if ($bag->is_set('configuration')) {
-            echo '<script type="text/javascript">location.href = \'' . $serendipity['baseurl'] . '?serendipity[adminModule]=plugins&amp;serendipity[plugin_to_conf]=' . $inst . '\';</script>';
+            echo '<script type="text/javascript">location.href = \'' . $serendipity['baseurl'] . '?serendipity[adminModule]=plugins&serendipity[plugin_to_conf]=' . $inst . '\';</script>';
             die();
         }
     }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.419.2.52,1.419.2.53 NEWS,1.214.2.37,1.214.2.38

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_functions.inc.php NEWS 
Log Message:
- MFH


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.37
retrieving revision 1.214.2.38
diff -u -d -r1.214.2.37 -r1.214.2.38
--- NEWS	17 Oct 2004 20:04:34 -0000	1.214.2.37
+++ NEWS	22 Oct 2004 17:33:51 -0000	1.214.2.38
@@ -47,6 +47,12 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed comment counter for deleting non-approved comments
+      (tomsommer, griffinn)
+
+Version 0.7-rc1 (October 20th, 2004)
+------------------------------------------------------------------------
+
     * Fixed possible HTTP Response Splitting security issue. Thanks to
       ChaoticEvil for reporting! (jannis, garvinhicking)
 
@@ -149,9 +155,6 @@
 
     * Fixed missing CSS-class for BBCode Event-Plugin (Jez Hancock)
 
-    * Fixed comment counter for deleting non-approved comments
-      (tomsommer)
-
     * Fixed possible SQL injections. Thanks to aCiDBiTS!
 
     * Fixed postgreSQL quicksearch, thanks to Mauri Sahlberg!

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.52
retrieving revision 1.419.2.53
diff -u -d -r1.419.2.52 -r1.419.2.53
--- serendipity_functions.inc.php	16 Oct 2004 17:27:12 -0000	1.419.2.52
+++ serendipity_functions.inc.php	22 Oct 2004 17:33:51 -0000	1.419.2.53
@@ -1086,7 +1086,7 @@
         $sql = serendipity_db_query("SELECT status FROM {$serendipity['dbPrefix']}comments
                                             WHERE entry_id = '". (int)$entry_id ."'
                                                     AND id = '". (int)$id ."'
-                                                    $admin");
+                                                    $admin", true);
 
         serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}comments
                                     WHERE entry_id = '". (int)$entry_id ."'

[php-blog-cvs] serendipity NEWS,1.244,1.245 serendipity_functions.inc.php,1.449,1.450

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

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

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
- Really fix comment counter for deleting non-approved comments, thanks to griffinn


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -d -r1.449 -r1.450
--- serendipity_functions.inc.php	20 Oct 2004 16:27:23 -0000	1.449
+++ serendipity_functions.inc.php	22 Oct 2004 17:31:09 -0000	1.450
@@ -1476,7 +1476,7 @@
         $sql = serendipity_db_query("SELECT status FROM {$serendipity['dbPrefix']}comments
                                             WHERE entry_id = '". (int)$entry_id ."'
                                                     AND id = '". (int)$id ."'
-                                                    $admin");
+                                                    $admin", true);
 
         serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}comments
                                     WHERE entry_id = '". (int)$entry_id ."'

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- NEWS	20 Oct 2004 17:02:02 -0000	1.244
+++ NEWS	22 Oct 2004 17:31:08 -0000	1.245
@@ -3,7 +3,10 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
-Version 0.7 (October 20th, 2004)
+    * Fixed comment counter for deleting non-approved comments
+      (tomsommer, griffinn)
+
+Version 0.7-rc1 (October 20th, 2004)
 ------------------------------------------------------------------------
 
     * Fixed possible HTTP Response Splitting security issue. Thanks to
@@ -108,9 +111,6 @@
 
     * Fixed missing CSS-class for BBCode Event-Plugin (Jez Hancock)
 
-    * Fixed comment counter for deleting non-approved comments
-      (tomsommer)
-
     * Fixed possible SQL injections. Thanks to aCiDBiTS!
 
     * Fixed postgreSQL quicksearch, thanks to Mauri Sahlberg!

[php-blog-cvs] serendipity NEWS,1.243,1.244

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

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

Modified Files:
	NEWS 
Log Message:
release


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- NEWS	16 Oct 2004 09:09:46 -0000	1.243
+++ NEWS	20 Oct 2004 17:02:02 -0000	1.244
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+Version 0.7 (October 20th, 2004)
+------------------------------------------------------------------------
+
     * Fixed possible HTTP Response Splitting security issue. Thanks to
       ChaoticEvil for reporting! (jannis, garvinhicking)
 

[php-blog-cvs] serendipity serendipity_config.inc.php,1.98,1.99

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
- Get ready for 0.7-rc1


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- serendipity_config.inc.php	14 Oct 2004 16:25:19 -0000	1.98
+++ serendipity_config.inc.php	20 Oct 2004 16:37:30 -0000	1.99
@@ -15,7 +15,7 @@
 
 include_once(S9Y_INCLUDE_PATH . 'compat.php');
 
-$serendipity['version']         = '0.7-beta4';
+$serendipity['version']         = '0.7-rc1';
 $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme
 $serendipity['production']      = 1;
 $serendipity['rewrite']         = 'none';

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.18,1.19 serendipity_lang_cs.inc.php,1.64,1.65 serendipity_lang_cz.inc.php,1.64,1.65 serendipity_lang_da.inc.php,1.84,1.85 serendipity_lang_de.inc.php,1.102,1.103 serendipity_lang_en.inc.php,1.84,1.85 serendipity_lang_es.inc.php,1.80,1.81 serendipity_lang_fr.inc.php,1.62,1.63 serendipity_lang_it.inc.php,1.5,1.6 serendipity_lang_nl.inc.php,1.39,1.40 serendipity_lang_no.inc.php,1.5,1.6 serendipity_lang_pt.inc.php,1.40,1.41

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

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10712/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_it.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
Log Message:
- Revert Jannis' popup patch


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- serendipity_lang_cs.inc.php	18 Oct 2004 18:22:08 -0000	1.64
+++ serendipity_lang_cs.inc.php	20 Oct 2004 16:27:24 -0000	1.65
@@ -554,7 +554,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
-@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_lang_no.inc.php	18 Oct 2004 18:22:09 -0000	1.5
+++ serendipity_lang_no.inc.php	20 Oct 2004 16:27:25 -0000	1.6
@@ -549,6 +549,5 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
-@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
+
 ?>
\ 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.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- serendipity_lang_nl.inc.php	18 Oct 2004 18:22:09 -0000	1.39
+++ serendipity_lang_nl.inc.php	20 Oct 2004 16:27:25 -0000	1.40
@@ -559,7 +559,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
-@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
+
 /* 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.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- serendipity_lang_en.inc.php	18 Oct 2004 18:22:08 -0000	1.84
+++ serendipity_lang_en.inc.php	20 Oct 2004 16:27:25 -0000	1.85
@@ -551,7 +551,5 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved');
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval');
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.');
-@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
-@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_lang_bg.inc.php	18 Oct 2004 18:22:08 -0000	1.18
+++ serendipity_lang_bg.inc.php	20 Oct 2004 16:27:24 -0000	1.19
@@ -536,7 +536,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
-@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
+
 /* 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.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- serendipity_lang_pt.inc.php	18 Oct 2004 18:22:09 -0000	1.40
+++ serendipity_lang_pt.inc.php	20 Oct 2004 16:27:25 -0000	1.41
@@ -555,7 +555,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
-@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_lang_it.inc.php	18 Oct 2004 18:22:09 -0000	1.5
+++ serendipity_lang_it.inc.php	20 Oct 2004 16:27:25 -0000	1.6
@@ -551,7 +551,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
-@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
+
 /* 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.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- serendipity_lang_da.inc.php	18 Oct 2004 18:22:08 -0000	1.84
+++ serendipity_lang_da.inc.php	20 Oct 2004 16:27:24 -0000	1.85
@@ -549,7 +549,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Kun godkendte');
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Afventer godkendelse');
 @define('RSS_IMPORT_BODYONLY', 'Anbring al tekst i "body" sektionen og undlad at opdele det i en "udvidet artikel" sektion.');
-@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
-@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- serendipity_lang_fr.inc.php	18 Oct 2004 18:22:09 -0000	1.62
+++ serendipity_lang_fr.inc.php	20 Oct 2004 16:27:25 -0000	1.63
@@ -557,7 +557,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
-@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
+
 /* 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.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- serendipity_lang_cz.inc.php	18 Oct 2004 18:22:08 -0000	1.64
+++ serendipity_lang_cz.inc.php	20 Oct 2004 16:27:24 -0000	1.65
@@ -552,7 +552,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
-@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
+
 /* 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.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- serendipity_lang_es.inc.php	18 Oct 2004 18:22:09 -0000	1.80
+++ serendipity_lang_es.inc.php	20 Oct 2004 16:27:25 -0000	1.81
@@ -558,7 +558,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
-@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
+
 /* 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.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- serendipity_lang_de.inc.php	18 Oct 2004 18:22:08 -0000	1.102
+++ serendipity_lang_de.inc.php	20 Oct 2004 16:27:25 -0000	1.103
@@ -551,7 +551,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Nur bewilligte');
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Zu bewilligende');
 @define('RSS_IMPORT_BODYONLY', 'Füge den gesamten importierten Text in das einzelne "Text"-Feld ein. Verhindert die Aufteilung in den "Erweiterten Eintrag"-Bereich.');
-@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'XML-RPC Pings werden ausgeführt. Das kann eine Weile dauern! Sie können entweder zugucken und warten, oder diese Seite verlassen, während ich im Hintergrund die Pings durchführe.');
-@define('PERFORMING_XMLRPC_DONE', 'Pings erledigt');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_admin_entries.inc.php,1.38,1.39 serendipity_entries.php,1.42,1.43 serendipity_functions.inc.php,1.448,1.449 serendipity_rss_exchange.inc.php,1.12,1.13 serendipity_xmlrpc.php,1.18,1.19

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

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

Modified Files:
	serendipity_admin_entries.inc.php serendipity_entries.php 
	serendipity_functions.inc.php serendipity_rss_exchange.inc.php 
	serendipity_xmlrpc.php 
Log Message:
- Revert Jannis' popup patch


Index: serendipity_xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_xmlrpc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_xmlrpc.php	18 Oct 2004 18:22:07 -0000	1.18
+++ serendipity_xmlrpc.php	20 Oct 2004 16:27:23 -0000	1.19
@@ -212,7 +212,7 @@
     $entry['body']  = $val->getval();
     $entry['allow_comments'] = $serendipity['allowCommentsDefault'];
     $entry['moderate_comments'] = $serendipity['moderateCommentsDefault'];
-    $id = serendipity_updertEntry($entry, $foo);
+    $id = serendipity_updertEntry($entry);
     return new XML_RPC_Response(new XML_RPC_Value($id, 'string'));
 }
 
@@ -229,7 +229,7 @@
     $val = $message->params[4];
     $entry['body']  = $val->getval();
     $entry['author'] = $username;
-    $id = serendipity_updertEntry($entry, $foo);
+    $id = serendipity_updertEntry($entry);
     return new XML_RPC_Response(new XML_RPC_Value($id, 'string'));
 }
 
@@ -296,7 +296,7 @@
     $entry['allow_comments']    = $serendipity['allowCommentsDefault'];
     $entry['moderate_comments'] = $serendipity['moderateCommentsDefault'];
 
-    $id = serendipity_updertEntry($entry, $foo);
+    $id = serendipity_updertEntry($entry);
 
     return new XML_RPC_Response(new XML_RPC_Value($id, 'string'));
 }
@@ -318,7 +318,7 @@
     $entry['isdraft']    = 'false';
     $entry['id']         = $postid;
 
-    $id = serendipity_updertEntry($entry, $foo);
+    $id = serendipity_updertEntry($entry);
     return new XML_RPC_Response(new XML_RPC_Value($id ? true : false, 'boolean'));
 }
 
@@ -350,7 +350,7 @@
     $entry['authorid']      = $serendipity['authorid'];
     $entry['id']            = $postid;
 
-    $id = serendipity_updertEntry($entry, $foo);
+    $id = serendipity_updertEntry($entry);
     return new XML_RPC_Response(new XML_RPC_Value($id ? true : false, 'boolean'));
 }
 

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- serendipity_entries.php	18 Oct 2004 18:22:06 -0000	1.42
+++ serendipity_entries.php	20 Oct 2004 16:27:23 -0000	1.43
@@ -35,21 +35,19 @@
 </head>
 
 <body class="s9y_wrap" id="serendipity_admin_entries_page" onload="if (self.Spawnextended) { Spawnextended(); } if (self.Spawnbody) { Spawnbody(); }">
-<?php if (!$serendipity['GET']['noHeader']) { ?>    
     <div id="serendipity_banner">
         <h1><?php echo $serendipity['blogTitle'] ; ?></h1>
-        <h2><?php echo SERENDIPITY_AUTHORING_SUITE . ((serendipity_userLoggedIn()) ? ' ('. sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']) .')' : ''); ?></h2>
+        <h2><?php echo SERENDIPITY_AUTHORING_SUITE . ' ('. sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']) .')'; ?></h2>
     </div>
+
     <table id="mainpane">
         <tr valign="top">
-<?php } ?>
 <?php
 if ( !serendipity_userLoggedIn() ) {
    serendipity_printLogin();
 } else {
 ?>
-<?php if (!$serendipity['GET']['noHeader']) { ?>            
-            <td id="serendipityLeftSideBar">         
+            <td id="serendipityLeftSideBar">
                 <div class="serendipitySideBarItem">
                     <div class="serendipitySideBarTitle"><?php echo ucfirst(ENTRIES); ?>:</div>
                     <div class="serendipitySideBarContent">
@@ -89,9 +87,9 @@
                     </div>
                 </div>
             </td>
+
             <td id="content">
                 <div class="serendipity_Admin_title"><?php echo SERENDIPITY_AUTHORING_SUITE; ?></div>
-<?php } ?>                
                 <div class="serendipity_Admin">
 <?php
     if (!isset($serendipity['GET']['adminModule'])) {
@@ -130,12 +128,10 @@
                 </div>
 <?php
 }
-if (!$serendipity['GET']['noHeader']) { 
 ?>
             </td>
         </tr>
     </table>
-<?php } ?>
 </body>
 </html>
 <?php

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- serendipity_admin_entries.inc.php	18 Oct 2004 18:22:06 -0000	1.38
+++ serendipity_admin_entries.inc.php	20 Oct 2004 16:27:23 -0000	1.39
@@ -283,7 +283,7 @@
 
         // Save the entry, or just display a preview
         if ($serendipity['POST']['preview'] != 'true') {
-            $res = serendipity_updertEntry($entry, $backendPublish);
+            $res = serendipity_updertEntry($entry);
             if (is_string($res)) {
                 serendipity_printEntryForm(
                   '?',
@@ -295,13 +295,7 @@
                   $entry,
                   ERROR . ': <b>' . $res . '</b>');
             } else {
-                echo '<div class="serendipity_msg_notice">' . ENTRY_SAVED . '<br />' .PERFORMING_XMLRPC_PLEASE_WAIT. '</div>';
-                echo '<iframe style="border:0;" src="?serendipity[noHeader]=true&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=handleReferences&amp;serendipity[id]='.$res.
-                     '&amp;serendipity[backendPublish]='.$backendPublish;
-                foreach($serendipity['POST']['announce_entries'] as $k => $v) {
-                    echo '&amp;serendipity[announce_entries]['.$k.']='.$v;
-                }
-                echo '" height="500" width="700" name="s9yTrackbackWindow" />';
+                echo '<div class="serendipity_msg_notice">' . ENTRY_SAVED . '</div>';
             }
         } else {
             // Only display the preview
@@ -336,17 +330,6 @@
         }
         break;
 
-    case 'handleReferences':
-        ignore_user_abort(true);
-        $entry = serendipity_fetchEntry('id', $serendipity[GET]['id']);       
-        flush();        
-        serendipity_handle_references($entry['id'], $serendipity['blogTitle'], $entry['title'], $entry['body'] . $entry['extended'], $newEntry);
-        if ($serendipity['GET']['backendPublish']=='true') {
-            serendipity_plugin_api::hook_event('backend_publish', $entry);
-        }
-        echo '<br />'.PERFORMING_XMLRPC_DONE;        
-        break;
-        
     case 'editSelect':
         serendipity_drawList();
         break;

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -d -r1.448 -r1.449
--- serendipity_functions.inc.php	19 Oct 2004 20:29:45 -0000	1.448
+++ serendipity_functions.inc.php	20 Oct 2004 16:27:23 -0000	1.449
@@ -2588,7 +2588,7 @@
 /**
 * Inserts a new entry into the database or updates an existing
 **/
-function serendipity_updertEntry($entry, &$backendPublish) {
+function serendipity_updertEntry($entry) {
     global $serendipity;
 
     $categories = $entry['categories'];
@@ -2688,15 +2688,17 @@
 
     if ($entry['isdraft'] == 'false') {
         serendipity_plugin_api::hook_event('frontend_display', $entry, array('no_scramble' => true));
-        
+        serendipity_handle_references($entry['id'], $serendipity['blogTitle'], $entry['title'], $entry['body'] . $entry['extended'], $newEntry);
     }
 
     serendipity_purgeEntry($entry['id'], $entry['timestamp']);
 
     // Send publish tags if either a new article has been inserted from scratch, or if the entry was previously
     // stored as draft and is now published
-    $backendPublish = ($entry['isdraft'] == 'false' && ($newEntry || $_entry['isdraft'] == 'true')) ? 'true' : 'false';
-    
+    if ($entry['isdraft'] == 'false' && ($newEntry || $_entry['isdraft'] == 'true')) {
+        serendipity_plugin_api::hook_event('backend_publish', $entry);
+    }
+
     return (int)$entry['id'];
 }
 

Index: serendipity_rss_exchange.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_rss_exchange.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_rss_exchange.inc.php	18 Oct 2004 18:22:07 -0000	1.12
+++ serendipity_rss_exchange.inc.php	20 Oct 2004 16:27:23 -0000	1.13
@@ -74,7 +74,7 @@
     $serendipity['noautodiscovery'] = 1;
     while ($item = $c->getNextItem()) {
         if (serendipity_rss_buildEntry($item, $entry)) {
-            serendipity_updertEntry($entry, $foo);
+            serendipity_updertEntry($entry);
         }
     }
 

[php-blog-cvs] serendipity/plugins/serendipity_event_weblogping serendipity_event_weblogping.php,1.10,1.11

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

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

Modified Files:
	serendipity_event_weblogping.php 
Log Message:
- Revert Jannis' popup patch


Index: serendipity_event_weblogping.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_weblogping/serendipity_event_weblogping.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_event_weblogping.php	18 Oct 2004 18:22:10 -0000	1.10
+++ serendipity_event_weblogping.php	20 Oct 2004 16:27:26 -0000	1.11
@@ -153,14 +153,14 @@
                     foreach($this->services AS $index => $service) {
                         // Detect if the current checkbox needs to be saved. We use the field chk_timestamp to see,
                         // if the form has already been submitted and individual changes shall be preserved
-                        $selected = (($serendipity['POST']['chk_timestamp'] && $serendipity['POST']['announce_entries][' . $service['name']]) || (!isset($serendipity['POST']['chk_timestamp']) && $this->get_config($service['name']) == 'true') ? 'checked="checked"' : '');
+                        $selected = (($serendipity['POST']['chk_timestamp'] && $serendipity['POST']['announce_entries_' . $service['name']]) || (!isset($serendipity['POST']['chk_timestamp']) && $this->get_config($service['name']) == 'true') ? 'checked="checked"' : '');
 
                         $onclick = '';
                         if (!empty($service['supersedes'])) {
                             $onclick    = 'onclick="';
                             $supersedes = explode(', ', $service['supersedes']);
                             foreach($supersedes AS $sid => $servicename) {
-                                $onclick .= 'document.getElementById(\'serendipity[announce_entries][' . $servicename . ']\').checked = false; ';
+                                $onclick .= 'document.getElementById(\'serendipity[announce_entries_' . $servicename . ']\').checked = false; ';
                             }
                             $onclick    .= '"';
                         }
@@ -168,8 +168,8 @@
                         $title    = sprintf(PLUGIN_EVENT_WEBLOGPING_SENDINGPING, $service['name'])
                                   . (!empty($service['supersedes']) ?  ' ' . sprintf(PLUGIN_EVENT_WEBLOGPING_SUPERSEDES, $service['supersedes']) : '');
 ?>
-                            <input <?php echo $onclick; ?> style="margin: 0px; padding: 0px; vertical-align: bottom;" type="checkbox" name="serendipity[announce_entries][<?php echo $service['name']; ?>]" id="serendipity[announce_entries][<?php echo $service['name']; ?>]" value="true" <?php echo $selected; ?> />
-                                <label title="<?php echo $title; ?>" style="vertical-align: bottom; margin: 0px; padding: 0px;" for="serendipity[announce_entries][<?php echo $service['name']; ?>]">&nbsp;<?php echo $service['name']; ?>&nbsp;&nbsp;</label><br />
+                            <input <?php echo $onclick; ?> style="margin: 0px; padding: 0px; vertical-align: bottom;" type="checkbox" name="serendipity[announce_entries_<?php echo $service['name']; ?>]" id="serendipity[announce_entries_<?php echo $service['name']; ?>]" value="true" <?php echo $selected; ?> />
+                                <label title="<?php echo $title; ?>" style="vertical-align: bottom; margin: 0px; padding: 0px;" for="serendipity[announce_entries_<?php echo $service['name']; ?>]">&nbsp;<?php echo $service['name']; ?>&nbsp;&nbsp;</label><br />
 <?php
     }
 ?>
@@ -181,17 +181,17 @@
                 case 'backend_publish':
                     // First cycle through list of services to remove superseding services which may have been checked
                     foreach ($this->services as $index => $service) {
-                        if (!empty($service['supersedes']) && isset($serendipity['POST']['announce_entries][' . $service['name']])) {
+                        if (!empty($service['supersedes']) && isset($serendipity['POST']['announce_entries_' . $service['name']])) {
                             $supersedes = explode(', ', $service['supersedes']);
                             foreach($supersedes AS $sid => $servicename) {
                                 // A service has been checked that is superseded by another checked meta-service. Remove that service from the list of services to be ping'd
-                                unset($serendipity['POST']['announce_entries][' . $servicename]);
+                                unset($serendipity['POST']['announce_entries_' . $servicename]);
                             }
                         }
                     }
 
                     foreach ($this->services as $index => $service) {
-                        if (isset($serendipity['GET']['announce_entries'][$service['name']])) {
+                        if (isset($serendipity['POST']['announce_entries_' . $service['name']])) {
                             printf(PLUGIN_EVENT_WEBLOGPING_SENDINGPING . '...<br />', $service['host']);
                             flush();
 

[php-blog-cvs] serendipity rss.php,1.30,1.31 serendipity_functions.inc.php,1.447,1.448

[Kristian K. <is...@us...>]

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

Modified Files:
	rss.php serendipity_functions.inc.php 
Log Message:
garvin:
>i would like to ask you to please revert that change.
done



Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -d -r1.447 -r1.448
--- serendipity_functions.inc.php	19 Oct 2004 19:34:47 -0000	1.447
+++ serendipity_functions.inc.php	19 Oct 2004 20:29:45 -0000	1.448
@@ -2026,7 +2026,7 @@
     return preg_replace($p, $r, $html);
 }
 
-function serendipity_printEntries_rss($entries, $version, $comments = false, $full = false) {
+function serendipity_printEntries_rss($entries, $version, $comments = false) {
     global $serendipity;
 
     if (is_array($entries)) {
@@ -2041,10 +2041,7 @@
 
             // Embed a link to extended entry, if existing
             if ($entry['exflag']) {
-                if ($full === true)
-                    $ext = htmlspecialchars($entry['extended']);
-                else
-                    $ext = '<br /><a href="' . $guid . '#extended">' . sprintf(VIEW_EXTENDED_ENTRY, htmlspecialchars($entry['title'])) . '</a>';
+                $ext = '<br /><a href="' . $guid . '#extended">' . sprintf(VIEW_EXTENDED_ENTRY, htmlspecialchars($entry['title'])) . '</a>';
             } else {
                 $ext = '';
             }

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- rss.php	19 Oct 2004 19:34:46 -0000	1.30
+++ rss.php	19 Oct 2004 20:29:44 -0000	1.31
@@ -14,12 +14,6 @@
     $serendipity['GET']['category'] = $_GET['category'];
 }
 
-if (isset($_GET['full'])) {
-    $full = ($_GET['full'] == "true");
-} else {
-    $full = false;
-}
-
 if (!isset($_GET['type'])) {
     $_GET['type'] = 'content';
 }
@@ -225,7 +219,7 @@
     die("Invalid RSS version specified\n");
 }
 
-serendipity_printEntries_rss($entries, $version, $comments, $full);
+serendipity_printEntries_rss($entries, $version, $comments);
 
 switch ($version) {
 case '0.91':

[php-blog-cvs] serendipity rss.php,1.29,1.30 serendipity_functions.inc.php,1.446,1.447

[Kristian K. <is...@us...>]

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

Modified Files:
	rss.php serendipity_functions.inc.php 
Log Message:
* append 'full=true' to your RSS URLs to get a full text feed including
  extended entries.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -d -r1.446 -r1.447
--- serendipity_functions.inc.php	18 Oct 2004 18:22:06 -0000	1.446
+++ serendipity_functions.inc.php	19 Oct 2004 19:34:47 -0000	1.447
@@ -2026,7 +2026,7 @@
     return preg_replace($p, $r, $html);
 }
 
-function serendipity_printEntries_rss($entries, $version, $comments = false) {
+function serendipity_printEntries_rss($entries, $version, $comments = false, $full = false) {
     global $serendipity;
 
     if (is_array($entries)) {
@@ -2041,7 +2041,10 @@
 
             // Embed a link to extended entry, if existing
             if ($entry['exflag']) {
-                $ext = '<br /><a href="' . $guid . '#extended">' . sprintf(VIEW_EXTENDED_ENTRY, htmlspecialchars($entry['title'])) . '</a>';
+                if ($full === true)
+                    $ext = htmlspecialchars($entry['extended']);
+                else
+                    $ext = '<br /><a href="' . $guid . '#extended">' . sprintf(VIEW_EXTENDED_ENTRY, htmlspecialchars($entry['title'])) . '</a>';
             } else {
                 $ext = '';
             }

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- rss.php	8 Oct 2004 11:09:16 -0000	1.29
+++ rss.php	19 Oct 2004 19:34:46 -0000	1.30
@@ -14,6 +14,12 @@
     $serendipity['GET']['category'] = $_GET['category'];
 }
 
+if (isset($_GET['full'])) {
+    $full = ($_GET['full'] == "true");
+} else {
+    $full = false;
+}
+
 if (!isset($_GET['type'])) {
     $_GET['type'] = 'content';
 }
@@ -219,7 +225,7 @@
     die("Invalid RSS version specified\n");
 }
 
-serendipity_printEntries_rss($entries, $version, $comments);
+serendipity_printEntries_rss($entries, $version, $comments, $full);
 
 switch ($version) {
 case '0.91':

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.17,1.18 serendipity_lang_cs.inc.php,1.63,1.64 serendipity_lang_cz.inc.php,1.63,1.64 serendipity_lang_da.inc.php,1.83,1.84 serendipity_lang_de.inc.php,1.101,1.102 serendipity_lang_en.inc.php,1.83,1.84 serendipity_lang_es.inc.php,1.79,1.80 serendipity_lang_fr.inc.php,1.61,1.62 serendipity_lang_it.inc.php,1.4,1.5 serendipity_lang_nl.inc.php,1.38,1.39 serendipity_lang_no.inc.php,1.4,1.5 serendipity_lang_pt.inc.php,1.39,1.40

[Jannis H. <jhe...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22863/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_it.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
Log Message:
This one's dirrty. As dirty as serendipity_entries.php. 

When an entry is saved, the trackbacks and xmlrpc pings are opened in an iframe
that has ignore_user_abort(true) in it. Even though the status-iframe's content
is not scrolling nicely but popping up all in one, it's still better than the old
solution. 

You can now hit save and close the browser. Or wait to see if the pings work. There
is the possibility that the pings aren't performed, when the user leaves the page
_before_ the iframe's content has _started_ to load. Do you think this is likely? 
Maybe on a dialup connection? If so, the constant PERFORMING_XMLRPC_PLEASE_WAIT
should contain something like 'wait a few seconds before you load a new page' or so.

I don't have much time atm, so please, have a look at this commit and try it out, 
since the serendipity_updertEntry() function has been modified (added a parameter. 
Again, this is dirrty and I don't like it. But you can't define something like
function foo(&$bar = false);

As Garvin asked me to pack up rc1 tomorrow, we really need this tested, because there
has been chaotic code added to chaotic code. Potentially dangerous :-)

Alright, enough babbling. cvs upd and spank me if I broke something or forgot
to reomve debug statements or so...



Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- serendipity_lang_cs.inc.php	27 Sep 2004 10:15:37 -0000	1.63
+++ serendipity_lang_cs.inc.php	18 Oct 2004 18:22:08 -0000	1.64
@@ -554,6 +554,7 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
+@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_lang_no.inc.php	27 Sep 2004 10:15:38 -0000	1.4
+++ serendipity_lang_no.inc.php	18 Oct 2004 18:22:09 -0000	1.5
@@ -549,5 +549,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
+@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
 ?>
\ 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.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- serendipity_lang_nl.inc.php	27 Sep 2004 10:15:38 -0000	1.38
+++ serendipity_lang_nl.inc.php	18 Oct 2004 18:22:09 -0000	1.39
@@ -559,6 +559,7 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
+@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
 /* 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.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- serendipity_lang_en.inc.php	27 Sep 2004 10:15:38 -0000	1.83
+++ serendipity_lang_en.inc.php	18 Oct 2004 18:22:08 -0000	1.84
@@ -551,5 +551,7 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved');
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval');
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.');
+@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
+@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_lang_bg.inc.php	27 Sep 2004 10:15:37 -0000	1.17
+++ serendipity_lang_bg.inc.php	18 Oct 2004 18:22:08 -0000	1.18
@@ -536,6 +536,7 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
+@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
 /* 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.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- serendipity_lang_pt.inc.php	27 Sep 2004 10:15:38 -0000	1.39
+++ serendipity_lang_pt.inc.php	18 Oct 2004 18:22:09 -0000	1.40
@@ -555,6 +555,7 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
+@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_lang_it.inc.php	27 Sep 2004 10:15:38 -0000	1.4
+++ serendipity_lang_it.inc.php	18 Oct 2004 18:22:09 -0000	1.5
@@ -551,6 +551,7 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
+@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
 /* 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.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- serendipity_lang_da.inc.php	12 Oct 2004 19:20:49 -0000	1.83
+++ serendipity_lang_da.inc.php	18 Oct 2004 18:22:08 -0000	1.84
@@ -549,6 +549,7 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Kun godkendte');
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Afventer godkendelse');
 @define('RSS_IMPORT_BODYONLY', 'Anbring al tekst i "body" sektionen og undlad at opdele det i en "udvidet artikel" sektion.');
-
+@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
+@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- serendipity_lang_fr.inc.php	27 Sep 2004 10:15:38 -0000	1.61
+++ serendipity_lang_fr.inc.php	18 Oct 2004 18:22:09 -0000	1.62
@@ -557,6 +557,7 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
+@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
 /* 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.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- serendipity_lang_cz.inc.php	27 Sep 2004 10:15:38 -0000	1.63
+++ serendipity_lang_cz.inc.php	18 Oct 2004 18:22:08 -0000	1.64
@@ -552,6 +552,7 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
+@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
 /* 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.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- serendipity_lang_es.inc.php	27 Sep 2004 10:15:38 -0000	1.79
+++ serendipity_lang_es.inc.php	18 Oct 2004 18:22:09 -0000	1.80
@@ -558,6 +558,7 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'Performing XML-RPC pings, this can take really long. You can sit and watch, or leave this page while I\'m pinging in the background');
+@define('PERFORMING_XMLRPC_DONE', 'Ping complete.');
 /* 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.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- serendipity_lang_de.inc.php	27 Sep 2004 10:15:38 -0000	1.101
+++ serendipity_lang_de.inc.php	18 Oct 2004 18:22:08 -0000	1.102
@@ -551,6 +551,7 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Nur bewilligte');
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Zu bewilligende');
 @define('RSS_IMPORT_BODYONLY', 'Füge den gesamten importierten Text in das einzelne "Text"-Feld ein. Verhindert die Aufteilung in den "Erweiterten Eintrag"-Bereich.');
-
+@define('PERFORMING_XMLRPC_PLEASE_WAIT', 'XML-RPC Pings werden ausgeführt. Das kann eine Weile dauern! Sie können entweder zugucken und warten, oder diese Seite verlassen, während ich im Hintergrund die Pings durchführe.');
+@define('PERFORMING_XMLRPC_DONE', 'Pings erledigt');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_weblogping serendipity_event_weblogping.php,1.9,1.10

[Jannis H. <jhe...@us...>]

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

Modified Files:
	serendipity_event_weblogping.php 
Log Message:
This one's dirrty. As dirty as serendipity_entries.php. 

When an entry is saved, the trackbacks and xmlrpc pings are opened in an iframe
that has ignore_user_abort(true) in it. Even though the status-iframe's content
is not scrolling nicely but popping up all in one, it's still better than the old
solution. 

You can now hit save and close the browser. Or wait to see if the pings work. There
is the possibility that the pings aren't performed, when the user leaves the page
_before_ the iframe's content has _started_ to load. Do you think this is likely? 
Maybe on a dialup connection? If so, the constant PERFORMING_XMLRPC_PLEASE_WAIT
should contain something like 'wait a few seconds before you load a new page' or so.

I don't have much time atm, so please, have a look at this commit and try it out, 
since the serendipity_updertEntry() function has been modified (added a parameter. 
Again, this is dirrty and I don't like it. But you can't define something like
function foo(&$bar = false);

As Garvin asked me to pack up rc1 tomorrow, we really need this tested, because there
has been chaotic code added to chaotic code. Potentially dangerous :-)

Alright, enough babbling. cvs upd and spank me if I broke something or forgot
to reomve debug statements or so...



Index: serendipity_event_weblogping.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_weblogping/serendipity_event_weblogping.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_event_weblogping.php	22 Jun 2004 13:45:47 -0000	1.9
+++ serendipity_event_weblogping.php	18 Oct 2004 18:22:10 -0000	1.10
@@ -153,14 +153,14 @@
                     foreach($this->services AS $index => $service) {
                         // Detect if the current checkbox needs to be saved. We use the field chk_timestamp to see,
                         // if the form has already been submitted and individual changes shall be preserved
-                        $selected = (($serendipity['POST']['chk_timestamp'] && $serendipity['POST']['announce_entries_' . $service['name']]) || (!isset($serendipity['POST']['chk_timestamp']) && $this->get_config($service['name']) == 'true') ? 'checked="checked"' : '');
+                        $selected = (($serendipity['POST']['chk_timestamp'] && $serendipity['POST']['announce_entries][' . $service['name']]) || (!isset($serendipity['POST']['chk_timestamp']) && $this->get_config($service['name']) == 'true') ? 'checked="checked"' : '');
 
                         $onclick = '';
                         if (!empty($service['supersedes'])) {
                             $onclick    = 'onclick="';
                             $supersedes = explode(', ', $service['supersedes']);
                             foreach($supersedes AS $sid => $servicename) {
-                                $onclick .= 'document.getElementById(\'serendipity[announce_entries_' . $servicename . ']\').checked = false; ';
+                                $onclick .= 'document.getElementById(\'serendipity[announce_entries][' . $servicename . ']\').checked = false; ';
                             }
                             $onclick    .= '"';
                         }
@@ -168,8 +168,8 @@
                         $title    = sprintf(PLUGIN_EVENT_WEBLOGPING_SENDINGPING, $service['name'])
                                   . (!empty($service['supersedes']) ?  ' ' . sprintf(PLUGIN_EVENT_WEBLOGPING_SUPERSEDES, $service['supersedes']) : '');
 ?>
-                            <input <?php echo $onclick; ?> style="margin: 0px; padding: 0px; vertical-align: bottom;" type="checkbox" name="serendipity[announce_entries_<?php echo $service['name']; ?>]" id="serendipity[announce_entries_<?php echo $service['name']; ?>]" value="true" <?php echo $selected; ?> />
-                                <label title="<?php echo $title; ?>" style="vertical-align: bottom; margin: 0px; padding: 0px;" for="serendipity[announce_entries_<?php echo $service['name']; ?>]">&nbsp;<?php echo $service['name']; ?>&nbsp;&nbsp;</label><br />
+                            <input <?php echo $onclick; ?> style="margin: 0px; padding: 0px; vertical-align: bottom;" type="checkbox" name="serendipity[announce_entries][<?php echo $service['name']; ?>]" id="serendipity[announce_entries][<?php echo $service['name']; ?>]" value="true" <?php echo $selected; ?> />
+                                <label title="<?php echo $title; ?>" style="vertical-align: bottom; margin: 0px; padding: 0px;" for="serendipity[announce_entries][<?php echo $service['name']; ?>]">&nbsp;<?php echo $service['name']; ?>&nbsp;&nbsp;</label><br />
 <?php
     }
 ?>
@@ -181,17 +181,17 @@
                 case 'backend_publish':
                     // First cycle through list of services to remove superseding services which may have been checked
                     foreach ($this->services as $index => $service) {
-                        if (!empty($service['supersedes']) && isset($serendipity['POST']['announce_entries_' . $service['name']])) {
+                        if (!empty($service['supersedes']) && isset($serendipity['POST']['announce_entries][' . $service['name']])) {
                             $supersedes = explode(', ', $service['supersedes']);
                             foreach($supersedes AS $sid => $servicename) {
                                 // A service has been checked that is superseded by another checked meta-service. Remove that service from the list of services to be ping'd
-                                unset($serendipity['POST']['announce_entries_' . $servicename]);
+                                unset($serendipity['POST']['announce_entries][' . $servicename]);
                             }
                         }
                     }
 
                     foreach ($this->services as $index => $service) {
-                        if (isset($serendipity['POST']['announce_entries_' . $service['name']])) {
+                        if (isset($serendipity['GET']['announce_entries'][$service['name']])) {
                             printf(PLUGIN_EVENT_WEBLOGPING_SENDINGPING . '...<br />', $service['host']);
                             flush();
 

[php-blog-cvs] serendipity serendipity_admin_entries.inc.php,1.37,1.38 serendipity_entries.php,1.41,1.42 serendipity_functions.inc.php,1.445,1.446 serendipity_rss_exchange.inc.php,1.11,1.12 serendipity_xmlrpc.php,1.17,1.18

[Jannis H. <jhe...@us...>]

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

Modified Files:
	serendipity_admin_entries.inc.php serendipity_entries.php 
	serendipity_functions.inc.php serendipity_rss_exchange.inc.php 
	serendipity_xmlrpc.php 
Log Message:
This one's dirrty. As dirty as serendipity_entries.php. 

When an entry is saved, the trackbacks and xmlrpc pings are opened in an iframe
that has ignore_user_abort(true) in it. Even though the status-iframe's content
is not scrolling nicely but popping up all in one, it's still better than the old
solution. 

You can now hit save and close the browser. Or wait to see if the pings work. There
is the possibility that the pings aren't performed, when the user leaves the page
_before_ the iframe's content has _started_ to load. Do you think this is likely? 
Maybe on a dialup connection? If so, the constant PERFORMING_XMLRPC_PLEASE_WAIT
should contain something like 'wait a few seconds before you load a new page' or so.

I don't have much time atm, so please, have a look at this commit and try it out, 
since the serendipity_updertEntry() function has been modified (added a parameter. 
Again, this is dirrty and I don't like it. But you can't define something like
function foo(&$bar = false);

As Garvin asked me to pack up rc1 tomorrow, we really need this tested, because there
has been chaotic code added to chaotic code. Potentially dangerous :-)

Alright, enough babbling. cvs upd and spank me if I broke something or forgot
to reomve debug statements or so...



Index: serendipity_xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_xmlrpc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_xmlrpc.php	20 Sep 2004 14:00:14 -0000	1.17
+++ serendipity_xmlrpc.php	18 Oct 2004 18:22:07 -0000	1.18
@@ -212,7 +212,7 @@
     $entry['body']  = $val->getval();
     $entry['allow_comments'] = $serendipity['allowCommentsDefault'];
     $entry['moderate_comments'] = $serendipity['moderateCommentsDefault'];
-    $id = serendipity_updertEntry($entry);
+    $id = serendipity_updertEntry($entry, $foo);
     return new XML_RPC_Response(new XML_RPC_Value($id, 'string'));
 }
 
@@ -229,7 +229,7 @@
     $val = $message->params[4];
     $entry['body']  = $val->getval();
     $entry['author'] = $username;
-    $id = serendipity_updertEntry($entry);
+    $id = serendipity_updertEntry($entry, $foo);
     return new XML_RPC_Response(new XML_RPC_Value($id, 'string'));
 }
 
@@ -296,7 +296,7 @@
     $entry['allow_comments']    = $serendipity['allowCommentsDefault'];
     $entry['moderate_comments'] = $serendipity['moderateCommentsDefault'];
 
-    $id = serendipity_updertEntry($entry);
+    $id = serendipity_updertEntry($entry, $foo);
 
     return new XML_RPC_Response(new XML_RPC_Value($id, 'string'));
 }
@@ -318,7 +318,7 @@
     $entry['isdraft']    = 'false';
     $entry['id']         = $postid;
 
-    $id = serendipity_updertEntry($entry);
+    $id = serendipity_updertEntry($entry, $foo);
     return new XML_RPC_Response(new XML_RPC_Value($id ? true : false, 'boolean'));
 }
 
@@ -350,7 +350,7 @@
     $entry['authorid']      = $serendipity['authorid'];
     $entry['id']            = $postid;
 
-    $id = serendipity_updertEntry($entry);
+    $id = serendipity_updertEntry($entry, $foo);
     return new XML_RPC_Response(new XML_RPC_Value($id ? true : false, 'boolean'));
 }
 

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- serendipity_entries.php	28 Sep 2004 10:03:47 -0000	1.41
+++ serendipity_entries.php	18 Oct 2004 18:22:06 -0000	1.42
@@ -35,19 +35,21 @@
 </head>
 
 <body class="s9y_wrap" id="serendipity_admin_entries_page" onload="if (self.Spawnextended) { Spawnextended(); } if (self.Spawnbody) { Spawnbody(); }">
+<?php if (!$serendipity['GET']['noHeader']) { ?>    
     <div id="serendipity_banner">
         <h1><?php echo $serendipity['blogTitle'] ; ?></h1>
         <h2><?php echo SERENDIPITY_AUTHORING_SUITE . ((serendipity_userLoggedIn()) ? ' ('. sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']) .')' : ''); ?></h2>
     </div>
-
     <table id="mainpane">
         <tr valign="top">
+<?php } ?>
 <?php
 if ( !serendipity_userLoggedIn() ) {
    serendipity_printLogin();
 } else {
 ?>
-            <td id="serendipityLeftSideBar">
+<?php if (!$serendipity['GET']['noHeader']) { ?>            
+            <td id="serendipityLeftSideBar">         
                 <div class="serendipitySideBarItem">
                     <div class="serendipitySideBarTitle"><?php echo ucfirst(ENTRIES); ?>:</div>
                     <div class="serendipitySideBarContent">
@@ -87,9 +89,9 @@
                     </div>
                 </div>
             </td>
-
             <td id="content">
                 <div class="serendipity_Admin_title"><?php echo SERENDIPITY_AUTHORING_SUITE; ?></div>
+<?php } ?>                
                 <div class="serendipity_Admin">
 <?php
     if (!isset($serendipity['GET']['adminModule'])) {
@@ -128,10 +130,12 @@
                 </div>
 <?php
 }
+if (!$serendipity['GET']['noHeader']) { 
 ?>
             </td>
         </tr>
     </table>
+<?php } ?>
 </body>
 </html>
 <?php

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- serendipity_admin_entries.inc.php	1 Sep 2004 17:17:41 -0000	1.37
+++ serendipity_admin_entries.inc.php	18 Oct 2004 18:22:06 -0000	1.38
@@ -283,7 +283,7 @@
 
         // Save the entry, or just display a preview
         if ($serendipity['POST']['preview'] != 'true') {
-            $res = serendipity_updertEntry($entry);
+            $res = serendipity_updertEntry($entry, $backendPublish);
             if (is_string($res)) {
                 serendipity_printEntryForm(
                   '?',
@@ -295,7 +295,13 @@
                   $entry,
                   ERROR . ': <b>' . $res . '</b>');
             } else {
-                echo '<div class="serendipity_msg_notice">' . ENTRY_SAVED . '</div>';
+                echo '<div class="serendipity_msg_notice">' . ENTRY_SAVED . '<br />' .PERFORMING_XMLRPC_PLEASE_WAIT. '</div>';
+                echo '<iframe style="border:0;" src="?serendipity[noHeader]=true&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=handleReferences&amp;serendipity[id]='.$res.
+                     '&amp;serendipity[backendPublish]='.$backendPublish;
+                foreach($serendipity['POST']['announce_entries'] as $k => $v) {
+                    echo '&amp;serendipity[announce_entries]['.$k.']='.$v;
+                }
+                echo '" height="500" width="700" name="s9yTrackbackWindow" />';
             }
         } else {
             // Only display the preview
@@ -330,6 +336,17 @@
         }
         break;
 
+    case 'handleReferences':
+        ignore_user_abort(true);
+        $entry = serendipity_fetchEntry('id', $serendipity[GET]['id']);       
+        flush();        
+        serendipity_handle_references($entry['id'], $serendipity['blogTitle'], $entry['title'], $entry['body'] . $entry['extended'], $newEntry);
+        if ($serendipity['GET']['backendPublish']=='true') {
+            serendipity_plugin_api::hook_event('backend_publish', $entry);
+        }
+        echo '<br />'.PERFORMING_XMLRPC_DONE;        
+        break;
+        
     case 'editSelect':
         serendipity_drawList();
         break;

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -d -r1.445 -r1.446
--- serendipity_functions.inc.php	16 Oct 2004 20:38:16 -0000	1.445
+++ serendipity_functions.inc.php	18 Oct 2004 18:22:06 -0000	1.446
@@ -2588,7 +2588,7 @@
 /**
 * Inserts a new entry into the database or updates an existing
 **/
-function serendipity_updertEntry($entry) {
+function serendipity_updertEntry($entry, &$backendPublish) {
     global $serendipity;
 
     $categories = $entry['categories'];
@@ -2688,17 +2688,15 @@
 
     if ($entry['isdraft'] == 'false') {
         serendipity_plugin_api::hook_event('frontend_display', $entry, array('no_scramble' => true));
-        serendipity_handle_references($entry['id'], $serendipity['blogTitle'], $entry['title'], $entry['body'] . $entry['extended'], $newEntry);
+        
     }
 
     serendipity_purgeEntry($entry['id'], $entry['timestamp']);
 
     // Send publish tags if either a new article has been inserted from scratch, or if the entry was previously
     // stored as draft and is now published
-    if ($entry['isdraft'] == 'false' && ($newEntry || $_entry['isdraft'] == 'true')) {
-        serendipity_plugin_api::hook_event('backend_publish', $entry);
-    }
-
+    $backendPublish = ($entry['isdraft'] == 'false' && ($newEntry || $_entry['isdraft'] == 'true')) ? 'true' : 'false';
+    
     return (int)$entry['id'];
 }
 

Index: serendipity_rss_exchange.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_rss_exchange.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_rss_exchange.inc.php	7 Oct 2004 10:34:27 -0000	1.11
+++ serendipity_rss_exchange.inc.php	18 Oct 2004 18:22:07 -0000	1.12
@@ -74,7 +74,7 @@
     $serendipity['noautodiscovery'] = 1;
     while ($item = $c->getNextItem()) {
         if (serendipity_rss_buildEntry($item, $entry)) {
-            serendipity_updertEntry($entry);
+            serendipity_updertEntry($entry, $foo);
         }
     }
 

[php-blog-cvs] serendipity rss.php,1.28.2.3,1.28.2.4

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

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

Modified Files:
      Tag: branch-smarty
	rss.php 
Log Message:
- Preserve BC


Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.28.2.3
retrieving revision 1.28.2.4
diff -u -d -r1.28.2.3 -r1.28.2.4
--- rss.php	16 Oct 2004 17:27:12 -0000	1.28.2.3
+++ rss.php	17 Oct 2004 20:26:51 -0000	1.28.2.4
@@ -2,12 +2,14 @@
 header('Content-Type: text/xml; charset=utf-8');
 
 include_once('serendipity_config.inc.php');
-$version = strtolower($_GET['version']);
-
+$version         = $_GET['version'];
 $description     = $serendipity['blogDescription'];
 $title           = $serendipity['blogTitle'];
 $comments        = FALSE;
 
+if ( empty($version) ) {
+    list($version) = serendipity_discover_rss($_GET['file'], $_GET['ext']);
+}
 
 if (isset($_GET['category'])) {
     $serendipity['GET']['category'] = $_GET['category'];

[php-blog-cvs] serendipity serendipity_plugin_api.php,1.23.2.6,1.23.2.7

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_plugin_api.php 
Log Message:
- Wrong return type


Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.23.2.6
retrieving revision 1.23.2.7
diff -u -d -r1.23.2.6 -r1.23.2.7
--- serendipity_plugin_api.php	17 Oct 2004 20:04:34 -0000	1.23.2.6
+++ serendipity_plugin_api.php	17 Oct 2004 20:06:50 -0000	1.23.2.7
@@ -501,11 +501,11 @@
     }
 
     /* Called by Serendipity when the plugin is removed/uninstalled.
-     * Can be used to drop installed database tables
+     * Can be used to drop installed database tables etc.
      */
     function uninstall(&$propbag)
     {
-        return false;
+        return true;
     }
 
     /* Called by serendipity when it wants to display information

[php-blog-cvs] serendipity NEWS,1.214.2.36,1.214.2.37 serendipity_plugin_api.php,1.23.2.5,1.23.2.6

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

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

Modified Files:
      Tag: branch-smarty
	NEWS serendipity_plugin_api.php 
Log Message:
- Implement plugin install() and uninstall() methods that are called by Serendipity upen plugin installation and removal


Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.23.2.5
retrieving revision 1.23.2.6
diff -u -d -r1.23.2.5 -r1.23.2.6
--- serendipity_plugin_api.php	27 Sep 2004 19:54:58 -0000	1.23.2.5
+++ serendipity_plugin_api.php	17 Oct 2004 20:04:34 -0000	1.23.2.6
@@ -78,6 +78,7 @@
 
         /* Check for multiple dependencies */
         $plugin =& serendipity_plugin_api::load_plugin($key);
+        $plugin->install();
         $bag    = new serendipity_property_bag;
         $plugin->introspect($bag);
         $plugin->register_dependencies(false, $authorid);
@@ -92,6 +93,7 @@
         $plugin =& serendipity_plugin_api::load_plugin($plugin_instance_id);
         $bag    = new serendipity_property_bag;
         $plugin->introspect($bag);
+        $plugin->uninstall($bag);
 
         serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}plugins where name='$plugin_instance_id'");
 
@@ -490,6 +492,22 @@
         $this->instance = $instance;
     }
 
+    /* Called by Serendipity when the plugin is first installed.
+     * Can be used to install database tables etc.
+     */
+    function install()
+    {
+        return true;
+    }
+
+    /* Called by Serendipity when the plugin is removed/uninstalled.
+     * Can be used to drop installed database tables
+     */
+    function uninstall(&$propbag)
+    {
+        return false;
+    }
+
     /* Called by serendipity when it wants to display information
      * about your plugin.
      * You need to override this method in your child class.

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.36
retrieving revision 1.214.2.37
diff -u -d -r1.214.2.36 -r1.214.2.37
--- NEWS	16 Oct 2004 17:27:11 -0000	1.214.2.36
+++ NEWS	17 Oct 2004 20:04:34 -0000	1.214.2.37
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Implement plugin install() and uninstall() methods that are called 
+      on installation and removal of a plugin (tomsommer)
+
     * Improve overall rewrite path syntax (tomsommer)
 
     * Allow the display of month, weeks and days in archive sidebar

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.444,1.445

[Jannis H. <jhe...@us...>]

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Don't fetch drafts when fetchEntries is used to fetch entries from a given
timerange. My bad...


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -d -r1.444 -r1.445
--- serendipity_functions.inc.php	16 Oct 2004 09:09:46 -0000	1.444
+++ serendipity_functions.inc.php	16 Oct 2004 20:38:16 -0000	1.445
@@ -654,6 +654,9 @@
         $startts = (int)$range[0];
         $endts   = (int)$range[1];
         $and = " WHERE timestamp >= $startts AND timestamp <= $endts";
+        if ($drafts) {
+            $and .= " AND $drafts";
+        }
     }
      else {
         if ($modified_since) {