Release 2.6.5-1

SVN revision: 1844

NT/elogd.sln

@@ -19,10 +19,10 @@ Global
 		{FD6FCAF3-A94B-40FA-AE52-07705DE2E519}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FD6FCAF3-A94B-40FA-AE52-07705DE2E519}.Release|Win32.ActiveCfg = Release|Win32
 		{CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}.Debug|Win32.Build.0 = Debug|Win32
 		{CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}.Release|Win32.ActiveCfg = Release|Win32
 		{CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}.Release|Win32.Build.0 = Release|Win32
 		{77ED3530-9382-4830-8513-9729C051A93E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{77ED3530-9382-4830-8513-9729C051A93E}.Debug|Win32.Build.0 = Debug|Win32
 		{77ED3530-9382-4830-8513-9729C051A93E}.Release|Win32.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution

NT/locext.vcproj

@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -68,8 +68,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\Debug/locext.exe"
+				OutputFile="\elog\locext.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/locext.pdb"

doc/ChangeLog

@@ -1,3 +1,21 @@
+Version 2.6.5, released Apr. 13th, 2007
+=======================================
+
+- Added array bounds checking
+- Added date/time button with AJAX updating
+- Changed 'remember me...' text
+- Implemente museremail, remove '|' in email list and remove duplicate email addresses
+- Check for forbidden attributes "Date" and "ID"
+- Documented keyboard shortcuts
+- Made conditional attributes work for quick filters
+- Skip locked entries during synchronization
+- Added CTRL+P and CTRL+S shortcuts
+- Added CTRL key shortcuts for ELCode
+- Replaced 'hidden attributes' by 'show attributes edit'
+- Implemented 'search all logbooks = 2'
+- Removed parameter sorting (did screw up group ordering, not really needed)
+- Implemented simple tables
+
 Version 2.6.4, released Feb. 17th, 2007
 =======================================
 

doc/index.html

@@ -25,7 +25,7 @@
             &nbsp;[<a class="nav" href="#links">Links</a>]&nbsp; *&nbsp;</div>
       <P class="Sub">Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt&#64;psi.ch">
             Stefan Ritt</a></P>
-      <div class="version">Current version is : 2.6.4</div>
+      <div class="version">Current version is : 2.6.5</div>
       <hr>
       <a name="whatis">
          <div class="section">&nbsp; What is ELOG ? &nbsp;</div>

resources/eloglang.brazilian

@@ -164,7 +164,6 @@ A old entry has been updated on %s = Uma antiga entrada foi atualizada em %s
 recipients = receptores
 Error: Value <b>%s</b> not allowed for boolean attributes = Error: Valor <b>%s<;b> não permitido para atributos booleanos 
 Error: Attribute option <b>%s</b> not existing = Error: Opção de atributo <b>%s</b> não existe
-Remember me on this computer = Lembre-me neste computador
 Forgot password? = Esqueceu a senha?
 Register as new user = Registrar como novo usuário 
 Entries = Entradas
@@ -342,18 +341,6 @@ Quote = Cita
 Insert current time = Inserir a data corrente 
 Please enter numeric value for year of attribute '%s' = Por favor, entre com um valor numérico para o ano do atributo '%s'  
 Preview = Preview 
-bold text = texto em negrito 
-italics text = texto em italico 
-underlined text = texto sublinhado
-centered text = texto centralizado
-insert hyperlink = inserir hyperlink
-insert email = inserir email
-insert image = inserir imagem
-insert quote = inserir citação
-insert list = inserir lista 
-insert code = inserir código 
-hide the smiley bar = esconder a barra do smiley  
-show the smiley bar = exibir a barra do smiley 
 FONT = FONTE 
 SIZE = TAMANHO 
 COLOR = COR 
@@ -404,7 +391,6 @@ Cannot send email notification to "%s" = N
 Error: Command "<b>%s</b>" is not allowed for user "<b>%s</b>" = Erro: O Comando "<b>%s</b>" não é permitido para o usuário "<b>%s</b>" 
 Shell execution not enabled via -x flag = Execução de shell não permitida via flag -x 
 Enter heading level (1, 2 or 3) = Entre com o nível de título (1, 2 ou 3)  
-insert heading = inserir título
 User name may not contain blanks = O nome do usuário não pode conter brancos 
 Empty password not allowed = Não é permitida senha vazia 
 Password may not contain blanks = A senha não pode conter brancos 
@@ -424,3 +410,24 @@ Last 6 Months =
 Last Year = 
 Enter %s = 
 Select %s = 
+Bold text CTRL+B = 
+Italics text CTRL+I = 
+Underlined text CTRL+U = 
+Centered text = 
+Insert hyperlink = 
+Insert email = 
+Insert image CTRL+M = 
+Insert quote = 
+Insert list CTRL+L = 
+Insert table = 
+Insert heading CTRL+H = 
+Insert code CTRL+O = 
+Hide the smiley bar = 
+Show the smiley bar = 
+Insert current time/date = 
+Entry is locked on local server and therefore skipped = 
+Keep me logged in on this computer = 
+for the next %d minutes = 
+for the next hour = 
+for the next %d hours = 
+for the next %d days = 

resources/eloglang.bulgarian

@@ -81,7 +81,6 @@ Resubmit as new entry =
 Attachment = Ïðèêà÷åí ôàéë
 A old entry has been updated on %s = Ñòàð çàïèñ å îáíîâåí ñ %s
 Email sent to = Èçïðàùàíå íà åë.ïîùà äî
-Remember me on this computer = Çàïîìíè ìîÿ êîìïþòúð
 Forgot password? = Çàáðàâåíà ïàðîëà?
 Register as new user = Ðåãèñòðèðàíå êàòî íîâ ïîòðåáèòåë
 Collapse = Ñâèâàíå
@@ -349,18 +348,6 @@ Quote =
 Insert current time = 
 Please enter numeric value for year of attribute '%s' = 
 Preview = 
-bold text = 
-italics text = 
-underlined text = 
-centered text = 
-insert hyperlink = 
-insert email = 
-insert image = 
-insert quote = 
-insert list = 
-insert code = 
-hide the smiley bar = 
-show the smiley bar = 
 FONT = 
 SIZE = 
 COLOR = 
@@ -408,7 +395,6 @@ Cannot send email notification to "%s" =
 Error: Command "<b>%s</b>" is not allowed for user "<b>%s</b>" = 
 Shell execution not enabled via -x flag = 
 Enter heading level (1, 2 or 3) = 
-insert heading = 
 User name may not contain blanks = 
 Empty password not allowed = 
 Password may not contain blanks = 
@@ -424,3 +410,24 @@ Last 6 Months =
 Last Year = 
 Enter %s = 
 Select %s = 
+Bold text CTRL+B = 
+Italics text CTRL+I = 
+Underlined text CTRL+U = 
+Centered text = 
+Insert hyperlink = 
+Insert email = 
+Insert image CTRL+M = 
+Insert quote = 
+Insert list CTRL+L = 
+Insert table = 
+Insert heading CTRL+H = 
+Insert code CTRL+O = 
+Hide the smiley bar = 
+Show the smiley bar = 
+Insert current time/date = 
+Entry is locked on local server and therefore skipped = 
+Keep me logged in on this computer = 
+for the next %d minutes = 
+for the next hour = 
+for the next %d hours = 
+for the next %d days = 

resources/eloglang.czech

@@ -150,7 +150,6 @@ Only user <i>%s</i> can delete this entry = Pouze uživatel <i>%s</i> může maz
 Search text also in attributes = Hledej text také v atributech
 Date = Date
 ID = ID
-Remember me on this computer = Zapamatuj si mě na tomto počítači
 Forgot password? = Zapoměl si heslo?
 Email address <i>"%s"</i> not registered = Adresa Emailu <i>"%s"</i> není registrována
 ELOG password recovery = ELOG obnova hesla
@@ -342,18 +341,6 @@ Cannot connect to server = Nelze se připojit k serveru
 Quote = Citace
 Please enter numeric value for year of attribute '%s' = Zadejte číselnou hodnotu pro atribut '%s'
 Preview = Náhled
-bold text = tučně
-italics text =  kurzíva
-underlined text = podtržený
-centered text = centrovaný
-insert hyperlink = vložte hyperlink
-insert email = vložte Email
-insert image = vložte obrázek
-insert quote = vložte citaci
-insert list = vložte seznam
-insert code = vložte kód
-hide the smiley bar = skryj lištu s emotikony
-show the smiley bar = ukaž lištu s emotikony 
 FONT = PÍSMO
 SIZE = VELIKOST
 COLOR = BARVA
@@ -401,7 +388,6 @@ Cannot send email notification to "%s" = Nelze odeslat emailové potvrzení "%s"
 Error: Command "<b>%s</b>" is not allowed for user "<b>%s</b>" = Chyba: Příkaz "<b>%s</b>" nemůže uživatel "<b>%s</b>" použít
 Shell execution not enabled via -x flag = Shell příkaz nebyl povolen přepínačem -x 
 Enter heading level (1, 2 or 3) = Zadejte úroveň záhlaví (1, 2 oder 3) 
-insert heading =  vložte záhlaví
 User name may not contain blanks = Uživatelské jméno nesmí obsahovat mezery
 Empty password not allowed = Prázdné heslo není povoleno
 Password may not contain blanks = Heslo nesmí obsahovat mezery
@@ -422,3 +408,24 @@ Last 6 Months =
 Last Year = 
 Enter %s = 
 Select %s = 
+Bold text CTRL+B = 
+Italics text CTRL+I = 
+Underlined text CTRL+U = 
+Centered text = 
+Insert hyperlink = 
+Insert email = 
+Insert image CTRL+M = 
+Insert quote = 
+Insert list CTRL+L = 
+Insert table = 
+Insert heading CTRL+H = 
+Insert code CTRL+O = 
+Hide the smiley bar = 
+Show the smiley bar = 
+Insert current time/date = 
+Entry is locked on local server and therefore skipped = 
+Keep me logged in on this computer = 
+for the next %d minutes = 
+for the next hour = 
+for the next %d hours = 
+for the next %d days = 

resources/eloglang.danish

@@ -150,7 +150,6 @@ Only user <i>%s</i> can delete this entry = Kun Bruger <i>%s</i> kan slette dett
 Search text also in attributes = Søg også text i attributerne
 Date = Dato
 ID = ID
-Remember me on this computer = Husk mig på denne Computer
 Forgot password? = Glemt kendeord?
 Email address <i>"%s"</i> not registered = Email Adresse <i>"%s"</i> ikke registreret
 ELOG password recovery = Gendan ELOG kendeord 
@@ -347,18 +346,6 @@ Quote =
 Insert current time = 
 Please enter numeric value for year of attribute '%s' = 
 Preview = 
-bold text = 
-italics text = 
-underlined text = 
-centered text = 
-insert hyperlink = 
-insert email = 
-insert image = 
-insert quote = 
-insert list = 
-insert code = 
-hide the smiley bar = 
-show the smiley bar = 
 FONT = 
 SIZE = 
 COLOR = 
@@ -406,7 +393,6 @@ Cannot send email notification to "%s" =
 Error: Command "<b>%s</b>" is not allowed for user "<b>%s</b>" = 
 Shell execution not enabled via -x flag = 
 Enter heading level (1, 2 or 3) = 
-insert heading = 
 User name may not contain blanks = 
 Empty password not allowed = 
 Password may not contain blanks = 
@@ -422,3 +408,24 @@ Last 6 Months =
 Last Year = 
 Enter %s = 
 Select %s = 
+Bold text CTRL+B = 
+Italics text CTRL+I = 
+Underlined text CTRL+U = 
+Centered text = 
+Insert hyperlink = 
+Insert email = 
+Insert image CTRL+M = 
+Insert quote = 
+Insert list CTRL+L = 
+Insert table = 
+Insert heading CTRL+H = 
+Insert code CTRL+O = 
+Hide the smiley bar = 
+Show the smiley bar = 
+Insert current time/date = 
+Entry is locked on local server and therefore skipped = 
+Keep me logged in on this computer = 
+for the next %d minutes = 
+for the next hour = 
+for the next %d hours = 
+for the next %d days = 

resources/eloglang.dutch

@@ -151,7 +151,6 @@ Only user <i>%s</i> can delete this entry = Alleen gebruiker <i>%s</i> kan dit b
 Search text also in attributes = Zoek ook in attributen
 Date = Datum
 ID = ID
-Remember me on this computer = Onthou mij op deze computer
 Forgot password? = Wachwoord vergeten?
 Email address <i>"%s"</i> not registered = E-mailadres <i>"%s"</i> is niet geregistreerd
 ELOG password recovery = ELOG Wachtwoord Herstel
@@ -343,18 +342,6 @@ Quote = Citaat
 Insert current time = Huidige tijd invoegen
 Please enter numeric value for year of attribute '%s' = Geef jaar in cijfers op voor attribuut '%s'
 Preview = Voorbeeld
-bold text = vette tekst
-italics text = schuine tekst
-underlined text = onderstreepte tekst
-centered text = gecentreerde tekst
-insert hyperlink = hyperlink invoegen
-insert email = email invoegen
-insert image = afbeelding invoegen
-insert quote = citaat invoegen
-insert list = lijst invoegen
-insert code = code invoegen
-hide the smiley bar = verberg smiley balk
-show the smiley bar = toon smiley balk
 FONT = LETTERTYPE
 SIZE = GROOTTE
 COLOR = KLEUR
@@ -404,7 +391,6 @@ From = Van
 Error: Command "<b>%s</b>" is not allowed for user "<b>%s</b>" = Fout: Commando "<b>%s</b>" is niet toegestaan voor gebruiker "<b>%s</b>"
 Shell execution not enabled via -x flag = Shell uitvoering niet aangezet met -x flag
 Enter heading level (1, 2 or 3) = Start bij kopniveau (1, 2 of 3)
-insert heading = koppen toevoegen
 User name may not contain blanks = Gebruikersnaam mag geen spaties bevatten
 Empty password not allowed = Leeg wachtwoord is niet toegestaan
 Password may not contain blanks = Wachtwoord mag geen spaties bevatten
@@ -420,3 +406,28 @@ Last 6 Months = Afgelopen 6 maanden
 Last Year = Afgelopen jaar
 Enter %s = %s invoeren
 Select %s = Selecteer %s
+
+#
+#---- please translate following items and then remove this comment ----#
+#
+Bold text CTRL+B = 
+Italics text CTRL+I = 
+Underlined text CTRL+U = 
+Centered text = 
+Insert hyperlink = 
+Insert email = 
+Insert image CTRL+M = 
+Insert quote = 
+Insert list CTRL+L = 
+Insert table = 
+Insert heading CTRL+H = 
+Insert code CTRL+O = 
+Hide the smiley bar = 
+Show the smiley bar = 
+Insert current time/date = 
+Entry is locked on local server and therefore skipped = 
+Keep me logged in on this computer = 
+for the next %d minutes = 
+for the next hour = 
+for the next %d hours = 
+for the next %d days = 

resources/eloglang.french

@@ -149,7 +149,6 @@ Only user <i>%s</i> can delete this entry = Seul l'utilisateur <i>%s</i> peut su
 Search text also in attributes = Rechercher également le texte dans les attributs
 Date = Date
 ID = ID
-Remember me on this computer = Mémoriser mon identité sur cet ordinateur
 Forgot password? = Mot de passe oublié ?
 Email address <i>"%s"</i> not registered = L'adresse mél. <i>"%s"</i> n'est pas enregistrée sur ce serveur
 ELOG password recovery = Récupération de mot de passe ELOG
@@ -343,18 +342,6 @@ Cannot connect to server = Impossible de se connecter au serveur
 Quote = Citer
 Please enter numeric value for year of attribute '%s' = Indiquez une valeur numérique pour l'année de l'attribut '%s'
 Preview = Prévisualisation
-bold text = texte gras
-italics text = texte italique
-underlined text = texte souligné
-centered text = texte centré
-insert hyperlink = insérer lien
-insert email = insérer adresse de messagerie
-insert image = insérer image
-insert quote = insérer citation
-insert list = insérer liste
-insert code = insérer code
-hide the smiley bar = cacher la barre des smileys
-show the smiley bar = afficher la barre des smileys
 FONT = POLICE
 SIZE = TAILLE
 COLOR = COULEUR
@@ -402,7 +389,6 @@ Cannot send email notification to "%s" = Impossible d'adresser la notification p
 Error: Command "<b>%s</b>" is not allowed for user "<b>%s</b>" = Erreur : la commande "<b>%s</b>" n'est pas autorisée pour l'utilisateur "<b>%s</b>"
 Shell execution not enabled via -x flag = L'exécution par le shell n'a pas été activée avec l'option -x
 Enter heading level (1, 2 or 3) = Indiquez le niveau d'en-tête (1, 2 ou 3)
-insert heading = insérer en-tête
 User name may not contain blanks = Le nom d'utilisateur ne doit pas contenir d'espace
 Empty password not allowed = Le mot de passe ne doit pas être vide
 Password may not contain blanks = Le mot de passe ne doit pas contenir d'espace
@@ -418,3 +404,28 @@ Last 6 Months = 6 derniers mois
 Last Year = Année écoulée
 Enter %s = Entrer %s
 Select %s = Sélectionner %s
+
+#
+#---- please translate following items and then remove this comment ----#
+#
+Bold text CTRL+B = 
+Italics text CTRL+I = 
+Underlined text CTRL+U = 
+Centered text = 
+Insert hyperlink = 
+Insert email = 
+Insert image CTRL+M = 
+Insert quote = 
+Insert list CTRL+L = 
+Insert table = 
+Insert heading CTRL+H = 
+Insert code CTRL+O = 
+Hide the smiley bar = 
+Show the smiley bar = 
+Insert current time/date = 
+Entry is locked on local server and therefore skipped = 
+Keep me logged in on this computer = 
+for the next %d minutes = 
+for the next hour = 
+for the next %d hours = 
+for the next %d days = 

resources/eloglang.german

@@ -150,7 +150,6 @@ Only user <i>%s</i> can delete this entry = Dieser Eintrag kann nur von <i>%s</i
 Search text also in attributes = Text auch in Attributen suchen
 Date = Datum
 ID = ID
-Remember me on this computer = Auf diesem Computer eingeloggt bleiben
 Forgot password? = Kennwort vergessen?
 Email address <i>"%s"</i> not registered = Email-Adresse <i>"%s"</i> nicht registriert
 ELOG password recovery = ELOG Kennwort-Wiederherstellung
@@ -342,18 +341,6 @@ Cannot connect to server = Kann mit Server nicht verbinden
 Quote = Zitat
 Please enter numeric value for year of attribute '%s' = Bitte numerischen Wert für Jahr eingeben von Attribut '%s'
 Preview = Vorschau
-bold text = fetter Text
-italics text = kursiver Text
-underlined text = unterstrichener Text
-centered text = zentrierter Text
-insert hyperlink = Hyperlink einfügen
-insert email = Email einfügen
-insert image = Bild einfügen
-insert quote = Zitat einfügen
-insert list = Liste einfügen
-insert code = Code einfügen
-hide the smiley bar = Smiley Liste verstecken
-show the smiley bar = Smiley Liste zeigen
 FONT = SCHRIFTART
 SIZE = GRÖSSE
 COLOR = FARBE
@@ -401,7 +388,6 @@ Cannot send email notification to "%s" = Kann Email-Benachrichtigung nicht an "%
 Error: Command "<b>%s</b>" is not allowed for user "<b>%s</b>" = Fehler: Kommando "<b>%s</b>" ist nicht erlaubt für Benutzer "<b>%s</b>"
 Shell execution not enabled via -x flag = Kommando-Ausführung ist nicht mit -x Kommandozeilenoption eingeschalten   
 Enter heading level (1, 2 or 3) = Bitte Überschrift-Stufe eingeben (1, 2 oder 3) 
-insert heading = Überschrift eingeben
 User name may not contain blanks = Benutzername darf keine Leerzeichen enthalten
 Empty password not allowed = Leeres Passwort ist nicht erlaubt
 Password may not contain blanks = Passwort darf keine Leerzeichen enthalten
@@ -417,3 +403,24 @@ Last 6 Months = Letzte 6 Monate
 Last Year = Letztes Jahr
 Enter %s = %s eingeben
 Select %s = %s auswählen
+Bold text CTRL+B = Fettschrift CTRL+B
+Italics text CTRL+I = Kursiv CTRL+I
+Underlined text CTRL+U = Unterstrichen CTRL+U
+Centered text = Zentrierter Text
+Insert hyperlink = Hypelink einfügen
+Insert email = Email einfügen
+Insert image CTRL+M = Bild einfügen CTRL+M
+Insert quote = Zitat einfügen
+Insert list CTRL+L = Liste einfügen CTRL+L
+Insert table = Tabelle einfügen
+Insert heading CTRL+H = Überschrift einfügen CTRL+H
+Insert code CTRL+O = Code einfügen
+Hide the smiley bar = Smileys Balken verstecken
+Show the smiley bar = Smileys Balken zeigen
+Insert current time/date = Aktuelle Zeit/Datum einfügen
+Entry is locked on local server and therefore skipped = Eintrag ist auf lokalem Server gesperrt und wird deshalb übersprungen 
+Keep me logged in on this computer = Auf diesem Computer eingeloggt bleiben
+for the next %d minutes = für die nächsten %d Minuten
+for the next hour = für die nächste Stunde
+for the next %d hours = für die nächsten %d Stunden
+for the next %d days =	für die nächsten %d Tage

resources/eloglang.italian

@@ -150,7 +150,6 @@ Only user <i>%s</i> can delete this entry = Solo l'utente <i>%s</i> pu
 Search text also in attributes = Ricerca il testo anche negli attributi
 Date = Data
 ID = ID
-Remember me on this computer = Ricordami su questo computer
 Forgot password? = Dimenticata la password?
 Email address <i>"%s"</i> not registered = Indirizzo e-mail <i>"%s"</i> non registrato
 ELOG password recovery = ELOG ripristino password
@@ -345,18 +344,6 @@ Quote =
 Insert current time = 
 Please enter numeric value for year of attribute '%s' = 
 Preview = 
-bold text = 
-italics text = 
-underlined text = 
-centered text = 
-insert hyperlink = 
-insert email = 
-insert image = 
-insert quote = 
-insert list = 
-insert code = 
-hide the smiley bar = 
-show the smiley bar = 
 FONT = 
 SIZE = 
 COLOR = 
@@ -404,7 +391,6 @@ Cannot send email notification to "%s" =
 Error: Command "<b>%s</b>" is not allowed for user "<b>%s</b>" = 
 Shell execution not enabled via -x flag = 
 Enter heading level (1, 2 or 3) = 
-insert heading = 
 User name may not contain blanks = 
 Empty password not allowed = 
 Password may not contain blanks = 
@@ -420,3 +406,24 @@ Last 6 Months =
 Last Year = 
 Enter %s = 
 Select %s = 
+Bold text CTRL+B = 
+Italics text CTRL+I = 
+Underlined text CTRL+U = 
+Centered text = 
+Insert hyperlink = 
+Insert email = 
+Insert image CTRL+M = 
+Insert quote = 
+Insert list CTRL+L = 
+Insert table = 
+Insert heading CTRL+H = 
+Insert code CTRL+O = 
+Hide the smiley bar = 
+Show the smiley bar = 
+Insert current time/date = 
+Entry is locked on local server and therefore skipped = 
+Keep me logged in on this computer = 
+for the next %d minutes = 
+for the next hour = 
+for the next %d hours = 
+for the next %d days = 

resources/eloglang.japanese

@@ -206,7 +206,6 @@ Please enter password to obtain administration access =
 Login = ログイン
 Please login = ログインしてください
 Username = ユーザー名
-Remember me on this computer = このコンピュータ上でユーザー名とパスワード保存する
 Forgot password? = パスワードを忘れたら
 Register as new user = 新規ユーザーとして登録
 by = 投稿者
@@ -345,18 +344,6 @@ Quote =
 Insert current time = 
 Please enter numeric value for year of attribute '%s' = 
 Preview = 
-bold text = 
-italics text = 
-underlined text = 
-centered text = 
-insert hyperlink = 
-insert email = 
-insert image = 
-insert quote = 
-insert list = 
-insert code = 
-hide the smiley bar = 
-show the smiley bar = 
 FONT = 
 SIZE = 
 COLOR = 
@@ -404,7 +391,6 @@ Cannot send email notification to "%s" =
 Error: Command "<b>%s</b>" is not allowed for user "<b>%s</b>" = 
 Shell execution not enabled via -x flag = 
 Enter heading level (1, 2 or 3) = 
-insert heading = 
 User name may not contain blanks = 
 Empty password not allowed = 
 Password may not contain blanks = 
@@ -420,3 +406,24 @@ Last 6 Months =
 Last Year = 
 Enter %s = 
 Select %s = 
+Bold text CTRL+B = 
+Italics text CTRL+I = 
+Underlined text CTRL+U = 
+Centered text = 
+Insert hyperlink = 
+Insert email = 
+Insert image CTRL+M = 
+Insert quote = 
+Insert list CTRL+L = 
+Insert table = 
+Insert heading CTRL+H = 
+Insert code CTRL+O = 
+Hide the smiley bar = 
+Show the smiley bar = 
+Insert current time/date = 
+Entry is locked on local server and therefore skipped = 
+Keep me logged in on this computer = 
+for the next %d minutes = 
+for the next hour = 
+for the next %d hours = 
+for the next %d days = 

resources/eloglang.spanish

@@ -164,7 +164,6 @@ A old entry has been updated on %s = Una entrada antigua ha sido actualizada en
 recipients = destinatarios
 Error: Value <b>%s</b> not allowed for boolean attributes = Error: El valor <b>%s</b> no esta permitido para atributos booleanos
 Error: Attribute option <b>%s</b> not existing = Error: La opcion de atributo <b>%s</b> no existe
-Remember me on this computer = Recordarme en esta computadora
 Forgot password? = Olvido su clave?
 Register as new user = Registrado como nuevo usuario
 Entries = Entradas
@@ -344,18 +343,6 @@ Please enter numeric value for year of attribute '%s' = Por favor ingrese valor
 Enter name of hyperlink = Ingrese nombre del enlace
 Enter URL of hyperlink = Ingrese URL del enlace
 Preview = Vista previa
-bold text = texto en negrita
-italics text = texto en italica
-underlined text = texto subrayado
-centered text = texto centrado
-insert hyperlink = ingrese enlace
-insert email = ingrese email
-insert image = ingrese imagen
-insert quote = ingrese cita
-insert list = ingrese lista
-insert code = ingrese codigo
-hide the smiley bar = esconder la barra de smiley
-show the smiley bar = mostrar la barra de smiley
 FONT = FONT
 SIZE = TAMAÑO
 COLOR = COLOR
@@ -402,7 +389,6 @@ Cannot send email notification to "%s" = No se puede enviar una notificacion por
 Error: Command "<b>%s</b>" is not allowed for user "<b>%s</b>" = Error: El comando "<b>%s</b>" no esta permitido para el usuario "<b>%s</b>"
 Shell execution not enabled via -x flag = La ejecución del shell no está habilitada via flag -x
 Enter heading level (1, 2 or 3) = Ingrese nivel de encabezado (1, 2 o 3)
-insert heading = inserte encabezado
 User name may not contain blanks =  El nombre de usuario no puede
 Empty password not allowed = No se permite clave vacía
 Password may not contain blanks = La clave no puede contener espacios en blancos
@@ -418,3 +404,28 @@ Last 6 Months = Ultimos 6 meses
 Last Year = Ultimo año
 Enter %s = Ingrese %s
 Select %s = Elija %s
+
+#
+#---- please translate following items and then remove this comment ----#
+#
+Bold text CTRL+B = 
+Italics text CTRL+I = 
+Underlined text CTRL+U = 
+Centered text = 
+Insert hyperlink = 
+Insert email = 
+Insert image CTRL+M = 
+Insert quote = 
+Insert list CTRL+L = 
+Insert table = 
+Insert heading CTRL+H = 
+Insert code CTRL+O = 
+Hide the smiley bar = 
+Show the smiley bar = 
+Insert current time/date = 
+Entry is locked on local server and therefore skipped = 
+Keep me logged in on this computer = 
+for the next %d minutes = 
+for the next hour = 
+for the next %d hours = 
+for the next %d days = 

resources/eloglang.swedish

@@ -137,7 +137,6 @@ A new ELOG user wants to register on "%s" = En ny anv
 Search text also in attributes = Sök text också i attributen
 Date = Datum
 ID = ID
-Remember me on this computer = Kom ihåg mig på denna dator
 Forgot password? = Glömt lösenordet?
 Email address <i>"%s"</i> not registered = E-post adress <i>"%s"</i> är inte registrerad
 ELOG password recovery = Återskapande av ELOG lösenord
@@ -300,18 +299,6 @@ Cannot connect to server = Kan inte kontakta server
 Quote = Citat
 Insert current time = Ange aktuell tid
 Preview = Förhandsgranska
-bold text = fet
-italics text = kursiverad
-underlined text = understruken
-centered text = centrerad
-insert hyperlink = länk
-insert email = e-post
-insert image = bild
-insert quote = citat
-insert list = lista
-insert code = programkod
-hide the smiley bar = göm smiley-rad 
-show the smiley bar = visa smiley-rad
 FONT = FONT
 SIZE = STORLEK
 COLOR = FÄRG
@@ -357,7 +344,6 @@ Cannot send email notification to "%s" = Kan inte s
 Error: Command "<b>%s</b>" is not allowed for user "<b>%s</b>" = Fel: kommando "<b>%s</b>" är inte tillåtet för användare "<b>%s</b>"
 Shell execution not enabled via -x flag = Shell exekvering inte aktiverad genom -x flaggan
 Enter heading level (1, 2 or 3) = Ange titel nivå
-insert heading = titel
 User name may not contain blanks = Användarnamn får inte innehålla blanktecken
 Empty password not allowed = Tomt lösenord inte tillåtet
 Password may not contain blanks = Lösenordet får inte innehålla blanktecken
@@ -421,3 +407,24 @@ Last 6 Months =
 Last Year = 
 Enter %s = 
 Select %s = 
+Bold text CTRL+B = 
+Italics text CTRL+I = 
+Underlined text CTRL+U = 
+Centered text = 
+Insert hyperlink = 
+Insert email = 
+Insert image CTRL+M = 
+Insert quote = 
+Insert list CTRL+L = 
+Insert table = 
+Insert heading CTRL+H = 
+Insert code CTRL+O = 
+Hide the smiley bar = 
+Show the smiley bar = 
+Insert current time/date = 
+Entry is locked on local server and therefore skipped = 
+Keep me logged in on this computer = 
+for the next %d minutes = 
+for the next hour = 
+for the next %d hours = 
+for the next %d days = 

resources/eloglang.turkish

@@ -153,7 +153,6 @@ Only user <i>%s</i> can delete this entry = Yaln
 Search text also in attributes = Metni özellikler içinde de ara
 Date = Tarih
 ID = ID
-Remember me on this computer = Bu bilgisayarda beni hatýrla
 Forgot password? = Parolayý unuttunuz mu?
 Email address <i>"%s"</i> not registered = <i>"%s"</i> e-posta adresi kayýtlý deðil
 ELOG password recovery = ELOG parola yenileme
@@ -341,19 +340,6 @@ Enter name of hyperlink = Ba
 Enter URL of hyperlink = Bað adresini girin
 Enter heading level (1, 2 or 3) = Baþlýk seviyesini girin (1, 2 veya 3)
 Preview = Önizleme
-bold text = koyu metin
-italics text = eðik metin
-underlined text = altý çizgili metin
-centered text = ortalanmýþ metin
-insert hyperlink = bað ekle
-insert email = e-posta ekle
-insert image = resim ekle
-insert quote = alýntý ekle
-insert list = liste ekle
-insert heading = baþlýk ekle
-insert code = kod ekle
-hide the smiley bar = gülen yüz çubuðunu gizle
-show the smiley bar = gülen yüz çubuðunu göster
 FONT = YAZITÝPÝ
 SIZE = BOYUT
 COLOR = RENK
@@ -424,3 +410,24 @@ Last 6 Months =
 Last Year = 
 Enter %s = 
 Select %s = 
+Bold text CTRL+B = 
+Italics text CTRL+I = 
+Underlined text CTRL+U = 
+Centered text = 
+Insert hyperlink = 
+Insert email = 
+Insert image CTRL+M = 
+Insert quote = 
+Insert list CTRL+L = 
+Insert table = 
+Insert heading CTRL+H = 
+Insert code CTRL+O = 
+Hide the smiley bar = 
+Show the smiley bar = 
+Insert current time/date = 
+Entry is locked on local server and therefore skipped = 
+Keep me logged in on this computer = 
+for the next %d minutes = 
+for the next hour = 
+for the next %d hours = 
+for the next %d days = 

resources/eloglang.zh_CN-GB2312

@@ -151,7 +151,6 @@ Only user <i>%s</i> can delete this entry = ֻ
 Search text also in attributes = 同时搜索属性中的文本
 Date = 日期
 ID = ID
-Remember me on this computer = 在此计算机上记录我的信息
 Forgot password? = 忘记密码了吧？
 Email address <i>"%s"</i> not registered = 电子邮件地址 <i>"%s"</i> 没有被注册
 ELOG password recovery = ELOG 密码恢复
@@ -340,17 +339,6 @@ Preview = Ԥ
 Show only new entries = 仅显示新的记录
 New entries since = 自此时间以来的新记录
 Show all entries = 显示所有记录
-bold text = 粗体文本
-italics text = 斜体文本
-underlined text = 下划线文本
-centered text = 中央对齐文本
-insert hyperlink = 插入超文本
-insert email = 插入电子邮件
-insert quote = 插入引用
-insert list = 插入列表
-insert code = 插入代码
-insert image = 插入图片
-show the smiley bar = 显示表情符列表条
 FONT = 字体
 SIZE = 大小
 COLOR = 颜色
@@ -363,7 +351,6 @@ Cannot connect to server =
 Quote = 引用
 Insert current time = 插入当前时间
 Please enter numeric value for year of attribute '%s' = 请输入属性 '%s' 的年份数值
-hide the smiley bar = 隐藏表情符号条
 smiling = 微笑
 happy = 高兴
 winking = 眨眼
@@ -402,7 +389,6 @@ Cannot send email notification to "%s" =
 Error: Command "<b>%s</b>" is not allowed for user "<b>%s</b>" = 错误：命令 "<b>%s</b>" 禁止让用户 "<b>%s</b>" 执行
 Shell execution not enabled via -x flag = Shell 的可执行权限没有打开 -x 标志
 Enter heading level (1, 2 or 3) = 输入标题层次 (1, 2 或 3)
-insert heading = 插入标题
 User name may not contain blanks = 用户名不可以包含空格
 Empty password not allowed = 不允许使用空密码
 Password may not contain blanks = 密码不允许包含空格
@@ -423,3 +409,24 @@ Last 6 Months =
 Last Year = 
 Enter %s = 
 Select %s = 
+Bold text CTRL+B = 
+Italics text CTRL+I = 
+Underlined text CTRL+U = 
+Centered text = 
+Insert hyperlink = 
+Insert email = 
+Insert image CTRL+M = 
+Insert quote = 
+Insert list CTRL+L = 
+Insert table = 
+Insert heading CTRL+H = 
+Insert code CTRL+O = 
+Hide the smiley bar = 
+Show the smiley bar = 
+Insert current time/date = 
+Entry is locked on local server and therefore skipped = 
+Keep me logged in on this computer = 
+for the next %d minutes = 
+for the next hour = 
+for the next %d hours = 
+for the next %d days = 

resources/eloglang.zh_CN-UTF8

@@ -151,7 +151,6 @@ Only user <i>%s</i> can delete this entry = 只有用户 <i>%s</i> 可以删除
 Search text also in attributes = 同时搜索属性中的文本
 Date = 日期
 ID = ID
-Remember me on this computer = 在此计算机上记录我的信息
 Forgot password? = 忘记密码了吧？
 Email address <i>"%s"</i> not registered = 电子邮件地址 <i>"%s"</i> 没有被注册
 ELOG password recovery = ELOG 密码恢复
@@ -340,17 +339,6 @@ Preview = 预览
 Show only new entries = 仅显示新的记录
 New entries since = 自此时间以来的新记录
 Show all entries = 显示所有记录
-bold text = 粗体文本
-italics text = 斜体文本
-underlined text = 下划线文本
-centered text = 中央对齐文本
-insert hyperlink = 插入超文本
-insert email = 插入电子邮件
-insert quote = 插入引用
-insert list = 插入列表
-insert code = 插入代码
-insert image = 插入图片
-show the smiley bar = 显示表情符列表条
 FONT = 字体
 SIZE = 大小
 COLOR = 颜色
@@ -363,7 +351,6 @@ Cannot connect to server = 无法连接到服务器
 Quote = 引用
 Insert current time = 插入当前时间
 Please enter numeric value for year of attribute '%s' = 请输入属性 '%s' 的年份数值
-hide the smiley bar = 隐藏表情符号条
 smiling = 微笑
 happy = 高兴
 winking = 眨眼
@@ -402,7 +389,6 @@ Cannot send email notification to "%s" = 无法向 "%s" 发送电子邮件通知
 Error: Command "<b>%s</b>" is not allowed for user "<b>%s</b>" = 错误：命令 "<b>%s</b>" 禁止让用户 "<b>%s</b>" 执行
 Shell execution not enabled via -x flag = Shell 的可执行权限没有打开 -x 标志
 Enter heading level (1, 2 or 3) = 输入标题层次 (1, 2 或 3)
-insert heading = 插入标题
 User name may not contain blanks = 用户名不可以包含空格
 Empty password not allowed = 不允许使用空密码
 Password may not contain blanks = 密码不允许包含空格
@@ -423,3 +409,24 @@ Last 6 Months =
 Last Year = 
 Enter %s = 
 Select %s = 
+Bold text CTRL+B = 
+Italics text CTRL+I = 
+Underlined text CTRL+U = 
+Centered text = 
+Insert hyperlink = 
+Insert email = 
+Insert image CTRL+M = 
+Insert quote = 
+Insert list CTRL+L = 
+Insert table = 
+Insert heading CTRL+H = 
+Insert code CTRL+O = 
+Hide the smiley bar = 
+Show the smiley bar = 
+Insert current time/date = 
+Entry is locked on local server and therefore skipped = 
+Keep me logged in on this computer = 
+for the next %d minutes = 
+for the next hour = 
+for the next %d hours = 
+for the next %d days = 

src/elogd.c

@@ -10,7 +10,7 @@
 \********************************************************************/
 
 /* Version of ELOG */
-#define VERSION "2.6.4"
+#define VERSION "2.6.5"
 char svn_revision[] = "$Id$";
 
 /* ELOG identification */
@@ -651,28 +651,28 @@ void *xmalloc(size_t bytes)
       memory_error_and_abort("xmalloc");
 
    /* put magic number around array and put array size */
-   *(unsigned int *)(temp + 0) = bytes;
+   *(unsigned int *) (temp + 0) = bytes;
-   *(unsigned int *)(temp + 4) = 0xdeadc0de;
+   *(unsigned int *) (temp + 4) = 0xdeadc0de;
-   *(unsigned int *)(temp + bytes + 8) = 0xdeadc0de;
+   *(unsigned int *) (temp + bytes + 8) = 0xdeadc0de;
 
-   return (temp+8);
+   return (temp + 8);
 }
 
 void *xcalloc(size_t count, size_t bytes)
 {
    char *temp;
 
-   temp = (char *) malloc(count*bytes + 12);
+   temp = (char *) malloc(count * bytes + 12);
    if (temp == 0)
       memory_error_and_abort("xcalloc");
-   memset(temp, 0, count*bytes + 12);
+   memset(temp, 0, count * bytes + 12);
 
    /* put magic number around array */
-   *(unsigned int *)(temp + 0) = count*bytes;
+   *(unsigned int *) (temp + 0) = count * bytes;
-   *(unsigned int *)(temp + 4) = 0xdeadc0de;
+   *(unsigned int *) (temp + 4) = 0xdeadc0de;
-   *(unsigned int *)(temp + count*bytes + 8) = 0xdeadc0de;
+   *(unsigned int *) (temp + count * bytes + 8) = 0xdeadc0de;
 
-   return (temp+8);
+   return (temp + 8);
 }
 
 void *xrealloc(void *pointer, size_t bytes)
@@ -685,21 +685,21 @@ void *xrealloc(void *pointer, size_t bytes)
 
    /* check old magic number */
    temp = pointer;
-   assert(*((unsigned int *)(temp-4)) == 0xdeadc0de);
+   assert(*((unsigned int *) (temp - 4)) == 0xdeadc0de);
-   old_size = *((unsigned int *)(temp-8));
+   old_size = *((unsigned int *) (temp - 8));
-   assert(*((unsigned int *)(temp+old_size)) == 0xdeadc0de);
+   assert(*((unsigned int *) (temp + old_size)) == 0xdeadc0de);
 
-   temp = (char *) realloc(temp-8, bytes+12);
+   temp = (char *) realloc(temp - 8, bytes + 12);
 
    if (temp == 0)
       memory_error_and_abort("xrealloc");
 
    /* put magic number around array */
-   *(unsigned int *)(temp + 0) = bytes;
+   *(unsigned int *) (temp + 0) = bytes;
-   *(unsigned int *)(temp + 4) = 0xdeadc0de;
+   *(unsigned int *) (temp + 4) = 0xdeadc0de;
-   *(unsigned int *)(temp + bytes + 8) = 0xdeadc0de;
+   *(unsigned int *) (temp + bytes + 8) = 0xdeadc0de;
 
-   return (temp+8);
+   return (temp + 8);
 }
 
 void xfree(void *pointer)
@@ -712,11 +712,11 @@ void xfree(void *pointer)
 
    /* check for magic byte */
    temp = pointer;
-   assert(*((unsigned int *)(temp-4)) == 0xdeadc0de);
+   assert(*((unsigned int *) (temp - 4)) == 0xdeadc0de);
-   old_size = *((unsigned int *)(temp-8));
+   old_size = *((unsigned int *) (temp - 8));
-   assert(*((unsigned int *)(temp+old_size)) == 0xdeadc0de);
+   assert(*((unsigned int *) (temp + old_size)) == 0xdeadc0de);
 
-   free(temp-8);
+   free(temp - 8);
 }
 
 char *xstrdup(const char *string)
@@ -2030,8 +2030,7 @@ int recv_string(int sock, char *buffer, int buffer_size, int millisec)
 
 void compose_email_header(LOGBOOK * lbs, char *subject, char *from, char *to,
                           char *url, char *mail_text, int size, int mail_encoding,
-                          int n_attachments, char *multipart_boundary, int message_id,
+                          int n_attachments, char *multipart_boundary, int message_id, int reply_id)
-                          int reply_id)
 {
    char buffer[256], charset[256], subject_enc[5000];
    char buf[80], str[256];
@@ -2116,17 +2115,17 @@ void compose_email_header(LOGBOOK * lbs, char *subject, char *from, char *to,
    snprintf(mail_text + strlen(mail_text), size - strlen(mail_text) - 1, "Subject: %s\r\n", subject_enc);
 
    if (strchr(from, '@')) {
-      strlcpy(str, strchr(from, '@')+1, sizeof(str));
+      strlcpy(str, strchr(from, '@') + 1, sizeof(str));
       if (strchr(str, '>'))
          *strchr(str, '>') = 0;
    } else
       strlcpy(str, "elog.org", sizeof(str));
 
    if (message_id)
-      snprintf(mail_text + strlen(mail_text), size - strlen(mail_text) - 1, "Message-ID: <%s-%d@%s>\r\n", 
+      snprintf(mail_text + strlen(mail_text), size - strlen(mail_text) - 1, "Message-ID: <%s-%d@%s>\r\n",
                lbs->name_enc, message_id, str);
    if (reply_id)
-      snprintf(mail_text + strlen(mail_text), size - strlen(mail_text) - 1, "In-Reply-To: <%s-%d@%s>\r\n", 
+      snprintf(mail_text + strlen(mail_text), size - strlen(mail_text) - 1, "In-Reply-To: <%s-%d@%s>\r\n",
                lbs->name_enc, reply_id, str);
 
    if (url)
@@ -5325,9 +5324,9 @@ int is_full_html(char *file_name)
    read(fh, buf, length);
    close(fh);
 
-   str = xstrdup((char *)buf);
+   str = xstrdup((char *) buf);
 
-   for (i = 0; i < (int) strlen((char *)buf); i++)
+   for (i = 0; i < (int) strlen((char *) buf); i++)
       str[i] = toupper(buf[i]);
    str[i] = 0;
 
@@ -5776,8 +5775,7 @@ char *email_quote_table =
 
 void rsputs_elcode(LOGBOOK * lbs, BOOL email_notify, const char *str)
 {
-   int i, j, k, l, m, elcode_disabled, elcode_disabled1, escape_char, ordered_list, substituted,
+   int i, j, k, l, m, elcode_disabled, elcode_disabled1, escape_char, ordered_list, substituted, inside_table;
-      inside_table;
    char *p, *pd, link[1000], link_text[1000], tmp[1000], attrib[1000], hattrib[1000],
        value[1000], subst[1000], base_url[256], param[256], *lstr;
 
@@ -9090,7 +9088,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
 
                sprintf(str, "%s_%d", ua, j);
                rsprintf("    !document.form1.%s.checked", str);
-               if (enum_user_line(lbs, j+1, login_name, sizeof(login_name)))
+               if (enum_user_line(lbs, j + 1, login_name, sizeof(login_name)))
                   rsprintf(" &&\n");
             }
             rsprintf(") {\n");
@@ -9292,7 +9290,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
    if ((isparam("inlineatt") && *getparam("inlineatt")) || bpreview)
       strcpy(script, " OnLoad=\"document.form1.Text.focus();\"");
 
-   strcat(script, " OnLoad=\"elKeyInit();\" OnFocus=\"elKeyInit();\""); 
+   strcat(script, " OnLoad=\"elKeyInit();\" OnFocus=\"elKeyInit();\"");
 
    if (getcfg(lbs->name, "Use Lock", str, sizeof(str)) && atoi(str) == 1)
       rsprintf("<body onUnload=\"unload();\"%s>\n", script);
@@ -10169,8 +10167,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
          rsprintf("<textarea rows=%d cols=%d wrap=hard %s name=\"Text\" onChange=\"mod();\">\n",
                   height, width, str);
       else
-         rsprintf("<textarea rows=%d cols=%d %s name=\"Text\" onChange=\"mod();\">\n", 
+         rsprintf("<textarea rows=%d cols=%d %s name=\"Text\" onChange=\"mod();\">\n", height, width, str);
-                  height, width, str);
 
       if (bedit) {
          if (!preset_text) {
@@ -11838,7 +11835,8 @@ int save_user_config(LOGBOOK * lbs, char *user, BOOL new_user, BOOL activate)
          mail_text[0] = 0;
          if (isparam("new_user_email") && isparam("new_user_name")) {
             compose_email_header(lbs, loc("Your ELOG account has been activated"), mail_from_name,
-                                 getparam("new_user_email"), NULL, mail_text, sizeof(mail_text), 1, 0, NULL, 0, 0);
+                                 getparam("new_user_email"), NULL, mail_text, sizeof(mail_text), 1, 0, NULL,
+                                 0, 0);
 
             strlcat(mail_text, "\r\n", sizeof(mail_text));
             strlcat(mail_text, loc("Your ELOG account has been activated on host"), sizeof(mail_text));
@@ -14678,7 +14676,8 @@ void synchronize_logbook(LOGBOOK * lbs, int mode, BOOL sync_all)
          /* check if message is locked */
          el_retrieve(lbs, message_id, NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL, locked_by);
          if (locked_by[0]) {
-            sprintf(str, "ID%d:\t%s", message_id, loc("Entry is locked on local server and therefore skipped"));
+            sprintf(str, "ID%d:\t%s", message_id,
+                    loc("Entry is locked on local server and therefore skipped"));
             mprint(lbs, mode, str);
             all_identical = FALSE;
             continue;
@@ -20241,8 +20240,8 @@ void submit_elog(LOGBOOK * lbs)
    rcpt_to = xmalloc(256);
    rcpt_to[0] = 0;
    rcpt_to_size = 256;
-   mail_list = xmalloc(200*NAME_LENGTH);
+   mail_list = xmalloc(200 * NAME_LENGTH);
-   rcpt_list = xmalloc(200*NAME_LENGTH);
+   rcpt_list = xmalloc(200 * NAME_LENGTH);
 
    if (suppress == 1 || suppress == 3) {
       if (suppress == 1)
@@ -20287,28 +20286,28 @@ void submit_elog(LOGBOOK * lbs)
             i = build_subst_list(lbs, slist, svalue, attrib, TRUE);
             strsubst_list(list, sizeof(list), slist, svalue, i);
 
-            n = strbreak(list, (char (*)[1500])mail_list, 200, ",", FALSE);
+            n = strbreak(list, (char (*)[1500]) mail_list, 200, ",", FALSE);
 
             if (verbose)
                eprintf("\n%s to %s\n\n", str, list);
 
             for (i = 0; i < n; i++) {
                /* remove possible 'mailto:' */
-               if ((p = strstr(&mail_list[i*NAME_LENGTH], "mailto:")) != NULL)
+               if ((p = strstr(&mail_list[i * NAME_LENGTH], "mailto:")) != NULL)
                   strcpy(p, p + 7);
 
-               if ((int) strlen(mail_to) + (int) strlen(&mail_list[i*NAME_LENGTH]) + 10 >= mail_to_size) {
+               if ((int) strlen(mail_to) + (int) strlen(&mail_list[i * NAME_LENGTH]) + 10 >= mail_to_size) {
                   mail_to_size += 256;
                   mail_to = xrealloc(mail_to, mail_to_size);
                }
-               strcat(mail_to, &mail_list[i*NAME_LENGTH]);
+               strcat(mail_to, &mail_list[i * NAME_LENGTH]);
                strcat(mail_to, ",");
 
-               if ((int) strlen(rcpt_to) + (int) strlen(&mail_list[i*NAME_LENGTH]) + 10 >= rcpt_to_size) {
+               if ((int) strlen(rcpt_to) + (int) strlen(&mail_list[i * NAME_LENGTH]) + 10 >= rcpt_to_size) {
                   rcpt_to_size += 256;
                   rcpt_to = xrealloc(rcpt_to, rcpt_to_size);
                }
-               strcat(rcpt_to, &mail_list[i*NAME_LENGTH]);
+               strcat(rcpt_to, &mail_list[i * NAME_LENGTH]);
                strcat(rcpt_to, ",");
             }
          }
@@ -20352,37 +20351,37 @@ void submit_elog(LOGBOOK * lbs)
 
    if (strlen(mail_to) > 0) {
       /* convert any '|' to ',', remove duplicate email to's */
-      strbreak(rcpt_to, (void *)rcpt_list, 200, ",|", TRUE);
+      strbreak(rcpt_to, (void *) rcpt_list, 200, ",|", TRUE);
-      strbreak(mail_to, (void *)mail_list, 200, ",|", TRUE);
+      strbreak(mail_to, (void *) mail_list, 200, ",|", TRUE);
-      for (i=0 ; i<200 && rcpt_list[i*NAME_LENGTH]; i++) {
+      for (i = 0; i < 200 && rcpt_list[i * NAME_LENGTH]; i++) {
-         for (j=i+1 ; j<200 && rcpt_list[j*NAME_LENGTH] ; j++) {
+         for (j = i + 1; j < 200 && rcpt_list[j * NAME_LENGTH]; j++) {
-            if (strstr(&rcpt_list[j*NAME_LENGTH], &rcpt_list[i*NAME_LENGTH])) {
+            if (strstr(&rcpt_list[j * NAME_LENGTH], &rcpt_list[i * NAME_LENGTH])) {
-               for (k=i ; k<199 && rcpt_list[k*NAME_LENGTH] ; k++) {
+               for (k = i; k < 199 && rcpt_list[k * NAME_LENGTH]; k++) {
-                  memcpy(&rcpt_list[k*NAME_LENGTH], &rcpt_list[(k+1)*NAME_LENGTH], NAME_LENGTH);
+                  memcpy(&rcpt_list[k * NAME_LENGTH], &rcpt_list[(k + 1) * NAME_LENGTH], NAME_LENGTH);
-                  memcpy(&mail_list[k*NAME_LENGTH], &mail_list[(k+1)*NAME_LENGTH], NAME_LENGTH);
+                  memcpy(&mail_list[k * NAME_LENGTH], &mail_list[(k + 1) * NAME_LENGTH], NAME_LENGTH);
                }
-               i = i-1;
+               i = i - 1;
                break;
             }
          }
       }
       rcpt_to[0] = 0;
       mail_to[0] = 0;
-      for (i=0 ; i<200 && rcpt_list[i*NAME_LENGTH]; i++) {
+      for (i = 0; i < 200 && rcpt_list[i * NAME_LENGTH]; i++) {
-         
+
-         if ((int) strlen(rcpt_to) + (int) strlen(&rcpt_list[i*NAME_LENGTH]) + 5 >= rcpt_to_size) {
+         if ((int) strlen(rcpt_to) + (int) strlen(&rcpt_list[i * NAME_LENGTH]) + 5 >= rcpt_to_size) {
             rcpt_to_size += 256;
             rcpt_to = xrealloc(rcpt_to, rcpt_to_size);
          }
-         strcat(rcpt_to, &rcpt_list[i*NAME_LENGTH]);
+         strcat(rcpt_to, &rcpt_list[i * NAME_LENGTH]);
 
-         if ((int) strlen(mail_to) + (int) strlen(&mail_list[i*NAME_LENGTH]) + 5 >= mail_to_size) {
+         if ((int) strlen(mail_to) + (int) strlen(&mail_list[i * NAME_LENGTH]) + 5 >= mail_to_size) {
             mail_to_size += 256;
             mail_to = xrealloc(mail_to, mail_to_size);
          }
-         strcat(mail_to, &mail_list[i*NAME_LENGTH]);
+         strcat(mail_to, &mail_list[i * NAME_LENGTH]);
 
-         if (i<199 && rcpt_list[(i+1)*NAME_LENGTH]) {
+         if (i < 199 && rcpt_list[(i + 1) * NAME_LENGTH]) {
             strcat(rcpt_to, ",");
             strcat(mail_to, ",\r\n\t");
          }
@@ -20390,7 +20389,7 @@ void submit_elog(LOGBOOK * lbs)
 
       if (compose_email
           (lbs, rcpt_to, mail_to, message_id, attrib, mail_param, isparam("edit_id"), att_file,
-          isparam("encoding") ? getparam("encoding") : "plain", atoi(in_reply_to)) == 0) {
+           isparam("encoding") ? getparam("encoding") : "plain", atoi(in_reply_to)) == 0) {
          xfree(mail_to);
          xfree(rcpt_to);
          xfree(mail_list);
@@ -22345,16 +22344,16 @@ BOOL check_user_password(LOGBOOK * lbs, char *user, char *password, char *redir)
          else
             rsprintf("<input type=checkbox checked name=remember value=1>\n");
          rsprintf("%s<br>\n", loc("Keep me logged in on this computer"));
-         
+
          if (atof(str) < 1)
-            rsprintf(loc("for the next %d minutes"), (int)(atof(str)*60));
+            rsprintf(loc("for the next %d minutes"), (int) (atof(str) * 60));
          else if (atof(str) == 1)
             rsprintf(loc("for the next hour"));
          else if (atof(str) <= 48)
-            rsprintf(loc("for the next %d hours"), (int)atof(str));
+            rsprintf(loc("for the next %d hours"), (int) atof(str));
          else
-            rsprintf(loc("for the next %d days"), (int)(atof(str)/24));
+            rsprintf(loc("for the next %d days"), (int) (atof(str) / 24));
-         
+
          rsprintf(" or until I log out");
          rsprintf("</td></tr>\n");
       }

src/regex.c

@@ -4642,7 +4642,7 @@ int eflags;
 /* Returns a message corresponding to an error code, ERRCODE, returned
    from either regcomp or regexec.   We don't use PREG here.  */
 
-size_t regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)
+size_t regerror(int errcode, const regex_t * preg, char *errbuf, size_t errbuf_size)
 {
    const char *msg;
    size_t msg_size;