diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1d65b1ff..f1ec2f7d 100755
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -5,6 +5,7 @@ Version 2.5.1, released February xxth, 2004
 - Added CSV output
 - During synchronization, display link to received entries
 - Implemented calendar
+- Added entry counter
 
 Version 2.5.0, released January 28th, 2004
 ==========================================
diff --git a/eloglang.brazilian b/eloglang.brazilian
index 8473539b..ac19e8a1 100755
--- a/eloglang.brazilian
+++ b/eloglang.brazilian
@@ -250,3 +250,6 @@ Entry deleted remotely =
 All entries identical = 
 Invalid mirror_id or entry_date = 
 Synchronize all logbooks = 
+Display comma-separated values (CSV) = 
+Calendar = 
+Remote entry received = 
diff --git a/eloglang.dutch b/eloglang.dutch
index b0cd5f83..0ed9498f 100755
--- a/eloglang.dutch
+++ b/eloglang.dutch
@@ -252,3 +252,6 @@ Entry deleted remotely =
 All entries identical = 
 Invalid mirror_id or entry_date = 
 Synchronize all logbooks = 
+Display comma-separated values (CSV) = 
+Calendar = 
+Remote entry received = 
diff --git a/eloglang.french b/eloglang.french
index f6754951..56a3cf3d 100755
--- a/eloglang.french
+++ b/eloglang.french
@@ -157,7 +157,7 @@ and their replies =	avec leurs r
 moved successfully from "%s" to "%s" = déplacés avec succès de "%s" à "%s"
 copied successfully from "%s" to "%s" = copiés avec succès de "%s" à "%s"
 Only user <i>%s</i> can delete this entry = Seul l'utilisateur <i>%s</i> peut supprimer cette entrée
-Search text also in attributes = Text auch in Attributen suchen
+Search text also in attributes = Rechercher également le texte dans les attributs
 Goto logbook selection page = Aller à la page de sélection des registres
 Login as different user = Se connecter sous un compte différent
 User <i>"%s"</i> has no access to logbook <i>"%s"</i> = L'utilisateur <i>"%s"</i> n'a pas accès au registre <i>"%s"</i>
@@ -182,70 +182,73 @@ Maximum number of attachments reached = Le nombre maximal d'attachements a 
 Invalid user name <i>"%s"</i> = Le nom d'utilisateur <i>"%s"</i> est incorrect
 on = sur
 Entry is currently edited by = Entrée actuellement en cours de modification par
+Old password = Ancien mot de passe
+Maximum number of replies (%d) exceeded = Nombre maximum de réponses (%d) dépassé
+Update = Actualiser
+Add %s = Ajouter %s
+Add new option here = Ajouter une nouvelle option ici
+Suppress shell execution = Empêcher l'exécution de commandes
+Change %s = Modifier %s
+Error sending Email via <i>"%s"</i> = Erreur lors de l'envoi d'un mél. via <i>"%s"</i>
+User name <i>"%s"</i> not registered = Le nom d'utilisateur <i>"%s"</i> n'est pas enregistré
+Synchronization = Synchronisation
+recipients = destinataires
+Error: Value <b>%s</b> not allowed for boolean attributes = Erreur : la valeur <b>%s</b> n'est pas valide pour les attributs booléens
+Error: Attribute option <b>%s</b> not existing = Erreur : l'option  <b>%s</b> n'existe pas pour l'attribut
+Last submission = Dernière entrée
+Expand all = Tout développer
+Synchronize = Synchroniser
+No mirror server defined in configuration file = Aucun serveur miroir n'est défini dans la configuration
+New password = Nouveau mot de passe
+user = utilisateur
+Entry can only be edited %1.2lg hours after creation = Cette entrée ne peut être modifiée que %1.2lg heures après sa création
+Display full entries = Afficher les entrées complètes
+No entry selected for deletion = Aucune entrée n'est sélectionnée pour supprssion
+Cannot read entry from local logbook = Impossible de lire l'entrée depuis le registre local
+Cannot create socket = Impossible de créer un "socket"
+Cannot resolve host name "%s" = Impossible de résoudre le nom de l'hôte "%s"
+Cannot connect to host %s, port %d = Impossible de se connecter à l'hôte %s sur le port %d
+Not enough memory = Mémoire insuffisante
+Cannot receive "%s" = Impossible de recevoir "%s"
+Received wrong entry id "%d" = L'identifiant de l'entrée reçue est erronné (%d)
+Entry #%d is locked on remote server = L'entrée #%d est verrouillée sur le serveur distant
+Cannot save remote entry locally = Impossible d'enregistrer l'entrée distante en local
+local = local(e)
+remote = distant(e)
+Please delete %s or %s entry to resolve conflict =  Il faut supprimer l'une des deux entrées %s ou %s pour résoudre le conflit
+Error sending local entry = Erreur lors de l'envoie de l'entrée locale
+Local entry submitted = L'entrée locale a été transmise
+Error deleting remote entry = Erreur lors de la suppression de l'entrée locale
+New entry cannot be written to directory "%s" = La nouvelle entrée ne peut être écrite dans le répertoire "%s"
+Entry %s cannot be read from logbook "%s" =  L'entrée %s ne peut être lue dans le registre "%s"
+No entry selected = Aucune entrée n'est sélectionnée
+One entry = Une entrée
+This entry has been deleted = Cette entrée a été supprimée
+by = par
+Entries = Entrées
+Cannot connect to remote server "%s" = Impossible de se connecter au serveur distant "%s"
+Remote server is not an ELOG server = Le serveur distant n'est pas un serveur ELOG
+Incorrect remote ELOG server version %s = La version du serveur ELOG distant est incorrecte (%s)
+User "%s" has no access to remote logbook = L'utilisateur "%s" n'a pas accès au registre distant
+Passwords for user "%s" do not match locally and remotely = Les mots de passe local et distant de l'utilisateur "%s" ne correspondent pas
+Error accessing remote logbook = Erreur lors de l'accès au registre distant
+Invalid HTTP header = En-tête HTTP invalide
+No user name supplied to access remote logbook = Aucun nom d'utilisateur n'a été fourni pour l'accès au registre distant
+Synchronizing logbook %s with server "%s" = Synchronisation du registre %s avec le serveur distant "%s"
+Configuration has been changed locally and remotely = Les configurations locale et distante ont été modifiées
+Please merge manually to resolve conflict = Il faut fusionner manuellement pour résoudre le conflit
+Logbook "%s" does not exist on remote server = Le registre "%s" n'existe pas sur le serveur distant
+Entry has been changed locally and remotely = Les entrées locale et distante ont été modifiées
+Entry deleted locally = Entrée locale supprimée
+Changed local entry ID to %d = Identifiant de l'entrée locale modifié en %d
+Entry deleted remotely = Entrée distante supprimée
+All entries identical = Toutes les entrées sont identiques
+Invalid mirror_id or entry_date = Valeur de mirror_id ou entry_date incorrecte
+Synchronize all logbooks = Synchroniser tous les registres
 
 #
-#---------- please translate following items ----------#
+#---- please translate following items and then remove this comment ----#
 #
-Old password = 
-Maximum number of replies (%d) exceeded = 
-Update = 
-Add %s = 
-Add new option here = 
-Suppress shell execution = 
-Change %s = 
-Error sending Email via <i>"%s"</i> = 
-User name <i>"%s"</i> not registered = 
-Synchronization = 
-recipients = 
-Error: Value <b>%s</b> not allowed for boolean attributes = 
-Error: Attribute option <b>%s</b> not existing = 
-Last submission = 
-Expand all = 
-Synchronize = 
-No mirror server defined in configuration file = 
-New password = 
-user = 
-Entry can only be edited %1.2lg hours after creation = 
-Display full entries = 
-No entry selected for deletion = 
-Cannot read entry from local logbook = 
-Cannot create socket = 
-Cannot resolve host name "%s" = 
-Cannot connect to host %s, port %d = 
-Not enough memory = 
-Cannot receive "%s" = 
-Received wrong entry id "%d" = 
-Entry #%d is locked on remote server = 
-Cannot save remote entry locally = 
-local = 
-remote = 
-Please delete %s or %s entry to resolve conflict = 
-Error sending local entry = 
-Local entry submitted = 
-Error deleting remote entry = 
-New entry cannot be written to directory "%s" = 
-Entry %s cannot be read from logbook "%s" = 
-No entry selected = 
-One entry = 
-This entry has been deleted = 
-by = 
-Entries = 
-Cannot connect to remote server "%s" = 
-Remote server is not an ELOG server = 
-Incorrect remote ELOG server version %s = 
-User "%s" has no access to remote logbook = 
-Passwords for user "%s" do not match locally and remotely = 
-Error accessing remote logbook = 
-Invalid HTTP header = 
-No user name supplied to access remote logbook = 
-Synchronizing logbook %s with server "%s" = 
-Configuration has been changed locally and remotely = 
-Please merge manually to resolve conflict = 
-Logbook "%s" does not exist on remote server = 
-Entry has been changed locally and remotely = 
-Entry deleted locally = 
-Changed local entry ID to %d = 
-Entry deleted remotely = 
-All entries identical = 
-Invalid mirror_id or entry_date = 
-Synchronize all logbooks = 
+Display comma-separated values (CSV) = 
+Calendar = 
+Remote entry received = 
diff --git a/eloglang.german b/eloglang.german
index 36010a67..c43952df 100755
--- a/eloglang.german
+++ b/eloglang.german
@@ -245,4 +245,6 @@ Entry deleted remotely = Entfernter Eintrag gel
 All entries identical = Alle Einträge identisch
 Invalid mirror_id or entry_date = Falsche mirror_id oder entry_date
 Synchronize all logbooks = Alle Logbücher synchronisieren
-
+Display comma-separated values (CSV) = Komma-getrennte Werte anzeigen (CSV)
+Calendar = Kalender
+Remote entry received = Entfernter Eintrag empfangen
diff --git a/eloglang.italian b/eloglang.italian
index b4466ec5..9f2a0d17 100755
--- a/eloglang.italian
+++ b/eloglang.italian
@@ -249,3 +249,6 @@ Entry deleted remotely =
 All entries identical = 
 Invalid mirror_id or entry_date = 
 Synchronize all logbooks = 
+Display comma-separated values (CSV) = 
+Calendar = 
+Remote entry received = 
diff --git a/eloglang.spanish b/eloglang.spanish
index 9a5599ec..e1c6b03e 100755
--- a/eloglang.spanish
+++ b/eloglang.spanish
@@ -247,3 +247,6 @@ Entry deleted remotely =
 All entries identical = 
 Invalid mirror_id or entry_date = 
 Synchronize all logbooks = 
+Display comma-separated values (CSV) = 
+Calendar = 
+Remote entry received = 
diff --git a/src/elogd.c b/src/elogd.c
index 5700907d..27554b85 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -6,6 +6,9 @@
    Contents:     Web server program for Electronic Logbook ELOG
   
    $Log$
+   Revision 1.221  2004/01/30 09:50:51  midas
+   Added entry counter
+
    Revision 1.220  2004/01/30 09:25:17  midas
    Finished calendar in find form
 
@@ -10526,6 +10529,8 @@ void show_page_filters(LOGBOOK * lbs, int n_msg, int page_n, int n_page, BOOL to
          }
       }
 
+      rsprintf("&nbsp;<b>%d Entries</b>", n_msg);
+
       rsprintf("</td>\n");
    }
 
@@ -10707,8 +10712,8 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
 {
    int i, j, n, index, size, status, d1, m1, y1, d2, m2, y2, n_line;
    int current_year, current_month, current_day, printable, n_logbook,
-       n_display, reverse, n_attr_disp, n_msg, search_all, message_id, n_page, i_start,
-       i_stop, in_reply_to_id;
+       n_display, reverse, n_attr_disp, total_n_msg, n_msg, search_all, message_id, 
+       n_page, i_start, i_stop, in_reply_to_id;
    char date[80], attrib[MAX_N_ATTR][NAME_LENGTH], disp_attr[MAX_N_ATTR + 4][NAME_LENGTH],
        list[10000], *text, *text1, *text2, in_reply_to[80], reply_to[MAX_REPLY_TO * 10],
        attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], locked_by[256];
@@ -11212,6 +11217,8 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
 
    /*---- compact messasges ----*/
 
+   total_n_msg = n_msg;
+
    for (i = j = 0; i < n_msg; i++)
       if (msg_list[i].lbs)
          memcpy(&msg_list[j++], &msg_list[i], sizeof(MSG_LIST));
@@ -11417,7 +11424,6 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n)
             buf[size] = 0;
             fclose(f);
 
-
             rsputs(buf);
 
          } else