From 436485cb14ffe7674151f1dc8ffe012512ee46f0 Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Fri, 13 Apr 2007 18:32:51 +0000 Subject: [PATCH] Release 2.6.5-1 SVN revision: 1844 --- NT/elogd.sln | 2 +- NT/locext.vcproj | 6 +- doc/ChangeLog | 18 +++++ doc/index.html | 2 +- resources/eloglang.brazilian | 35 +++++---- resources/eloglang.bulgarian | 35 +++++---- resources/eloglang.czech | 35 +++++---- resources/eloglang.danish | 35 +++++---- resources/eloglang.dutch | 39 +++++---- resources/eloglang.french | 39 +++++---- resources/eloglang.german | 35 +++++---- resources/eloglang.italian | 35 +++++---- resources/eloglang.japanese | 35 +++++---- resources/eloglang.spanish | 39 +++++---- resources/eloglang.swedish | 35 +++++---- resources/eloglang.turkish | 35 +++++---- resources/eloglang.zh_CN-GB2312 | 35 +++++---- resources/eloglang.zh_CN-UTF8 | 35 +++++---- src/elogd.c | 135 ++++++++++++++++---------------- src/regex.c | 2 +- 20 files changed, 397 insertions(+), 270 deletions(-) diff --git a/NT/elogd.sln b/NT/elogd.sln index 2fcfe4a8..31d9e033 100755 --- a/NT/elogd.sln +++ b/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 diff --git a/NT/locext.vcproj b/NT/locext.vcproj index e9a6b00c..216bd2f6 100755 --- a/NT/locext.vcproj +++ b/NT/locext.vcproj @@ -43,7 +43,7 @@ Links]  * 

Home of the Electronic Logbook package by Stefan Ritt

-
Current version is : 2.6.4
+
Current version is : 2.6.5
  What is ELOG ?  
diff --git a/resources/eloglang.brazilian b/resources/eloglang.brazilian index e24643fd..f113e611 100755 --- a/resources/eloglang.brazilian +++ b/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 %s not allowed for boolean attributes = Error: Valor %s<;b> no permitido para atributos booleanos Error: Attribute option %s not existing = Error: Opo de atributo %s no existe -Remember me on this computer = Lembre-me neste computador Forgot password? = Esqueceu a senha? Register as new user = Registrar como novo usurio 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 numrico 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 citao -insert list = inserir lista -insert code = inserir cdigo -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 "%s" is not allowed for user "%s" = Erro: O Comando "%s" no permitido para o usurio "%s" Shell execution not enabled via -x flag = Execuo de shell no permitida via flag -x Enter heading level (1, 2 or 3) = Entre com o nvel de ttulo (1, 2 ou 3) -insert heading = inserir ttulo User name may not contain blanks = O nome do usurio no pode conter brancos Empty password not allowed = No permitida senha vazia Password may not contain blanks = A senha no 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 = diff --git a/resources/eloglang.bulgarian b/resources/eloglang.bulgarian index 8bd5af25..0070a4df 100755 --- a/resources/eloglang.bulgarian +++ b/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 "%s" is not allowed for user "%s" = 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 = diff --git a/resources/eloglang.czech b/resources/eloglang.czech index b3c199b8..8d868d64 100644 --- a/resources/eloglang.czech +++ b/resources/eloglang.czech @@ -150,7 +150,6 @@ Only user %s can delete this entry = Pouze uživatel %s 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 "%s" not registered = Adresa Emailu "%s" 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 "%s" is not allowed for user "%s" = Chyba: Příkaz "%s" nemůže uživatel "%s" 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 = diff --git a/resources/eloglang.danish b/resources/eloglang.danish index d03f6da0..45ecc9e5 100755 --- a/resources/eloglang.danish +++ b/resources/eloglang.danish @@ -150,7 +150,6 @@ Only user %s can delete this entry = Kun Bruger %s kan slette dett Search text also in attributes = Sg ogs text i attributerne Date = Dato ID = ID -Remember me on this computer = Husk mig p denne Computer Forgot password? = Glemt kendeord? Email address "%s" not registered = Email Adresse "%s" 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 "%s" is not allowed for user "%s" = 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 = diff --git a/resources/eloglang.dutch b/resources/eloglang.dutch index 57c8d846..29e35e66 100755 --- a/resources/eloglang.dutch +++ b/resources/eloglang.dutch @@ -151,7 +151,6 @@ Only user %s can delete this entry = Alleen gebruiker %s 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 "%s" not registered = E-mailadres "%s" 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 "%s" is not allowed for user "%s" = Fout: Commando "%s" is niet toegestaan voor gebruiker "%s" 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 = diff --git a/resources/eloglang.french b/resources/eloglang.french index e25ff798..89826017 100755 --- a/resources/eloglang.french +++ b/resources/eloglang.french @@ -149,7 +149,6 @@ Only user %s can delete this entry = Seul l'utilisateur %s peut su Search text also in attributes = Rechercher galement le texte dans les attributs Date = Date ID = ID -Remember me on this computer = Mmoriser mon identit sur cet ordinateur Forgot password? = Mot de passe oubli ? Email address "%s" not registered = L'adresse ml. "%s" n'est pas enregistre sur ce serveur ELOG password recovery = Rcupration 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 numrique pour l'anne de l'attribut '%s' Preview = Prvisualisation -bold text = texte gras -italics text = texte italique -underlined text = texte soulign -centered text = texte centr -insert hyperlink = insrer lien -insert email = insrer adresse de messagerie -insert image = insrer image -insert quote = insrer citation -insert list = insrer liste -insert code = insrer 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 "%s" is not allowed for user "%s" = Erreur : la commande "%s" n'est pas autorise pour l'utilisateur "%s" Shell execution not enabled via -x flag = L'excution par le shell n'a pas t active avec l'option -x Enter heading level (1, 2 or 3) = Indiquez le niveau d'en-tte (1, 2 ou 3) -insert heading = insrer en-tte 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 = Anne coule Enter %s = Entrer %s Select %s = Slectionner %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 = diff --git a/resources/eloglang.german b/resources/eloglang.german index 9c676152..728a729e 100755 --- a/resources/eloglang.german +++ b/resources/eloglang.german @@ -150,7 +150,6 @@ Only user %s can delete this entry = Dieser Eintrag kann nur von %s"%s" not registered = Email-Adresse "%s" 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 fr 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 einfgen -insert email = Email einfgen -insert image = Bild einfgen -insert quote = Zitat einfgen -insert list = Liste einfgen -insert code = Code einfgen -hide the smiley bar = Smiley Liste verstecken -show the smiley bar = Smiley Liste zeigen FONT = SCHRIFTART SIZE = GRSSE COLOR = FARBE @@ -401,7 +388,6 @@ Cannot send email notification to "%s" = Kann Email-Benachrichtigung nicht an "% Error: Command "%s" is not allowed for user "%s" = Fehler: Kommando "%s" ist nicht erlaubt fr Benutzer "%s" Shell execution not enabled via -x flag = Kommando-Ausfhrung 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 auswhlen +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 einfgen +Insert email = Email einfgen +Insert image CTRL+M = Bild einfgen CTRL+M +Insert quote = Zitat einfgen +Insert list CTRL+L = Liste einfgen CTRL+L +Insert table = Tabelle einfgen +Insert heading CTRL+H = berschrift einfgen CTRL+H +Insert code CTRL+O = Code einfgen +Hide the smiley bar = Smileys Balken verstecken +Show the smiley bar = Smileys Balken zeigen +Insert current time/date = Aktuelle Zeit/Datum einfgen +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 = fr die nchsten %d Minuten +for the next hour = fr die nchste Stunde +for the next %d hours = fr die nchsten %d Stunden +for the next %d days = fr die nchsten %d Tage diff --git a/resources/eloglang.italian b/resources/eloglang.italian index a0bd3fc4..38c07c09 100755 --- a/resources/eloglang.italian +++ b/resources/eloglang.italian @@ -150,7 +150,6 @@ Only user %s can delete this entry = Solo l'utente %s 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 "%s" not registered = Indirizzo e-mail "%s" 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 "%s" is not allowed for user "%s" = 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 = diff --git a/resources/eloglang.japanese b/resources/eloglang.japanese index e8265282..93521864 100755 --- a/resources/eloglang.japanese +++ b/resources/eloglang.japanese @@ -206,7 +206,6 @@ Please enter password to obtain administration access = Login = OC Please login = OCĂ Username = [U[ -Remember me on this computer = ̃Rs[^Ń[U[ƃpX[hۑ Forgot password? = pX[hYꂽ Register as new user = VK[U[Ƃēo^ by = e @@ -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 "%s" is not allowed for user "%s" = 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 = diff --git a/resources/eloglang.spanish b/resources/eloglang.spanish index 1452dab7..f5d8a4d2 100755 --- a/resources/eloglang.spanish +++ b/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 %s not allowed for boolean attributes = Error: El valor %s no esta permitido para atributos booleanos Error: Attribute option %s not existing = Error: La opcion de atributo %s 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 = TAMAO COLOR = COLOR @@ -402,7 +389,6 @@ Cannot send email notification to "%s" = No se puede enviar una notificacion por Error: Command "%s" is not allowed for user "%s" = Error: El comando "%s" no esta permitido para el usuario "%s" Shell execution not enabled via -x flag = La ejecucin 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 vaca 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 ao 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 = diff --git a/resources/eloglang.swedish b/resources/eloglang.swedish index f4d5b934..c635f962 100644 --- a/resources/eloglang.swedish +++ b/resources/eloglang.swedish @@ -137,7 +137,6 @@ A new ELOG user wants to register on "%s" = En ny anv Search text also in attributes = Sk text ocks i attributen Date = Datum ID = ID -Remember me on this computer = Kom ihg mig p denna dator Forgot password? = Glmt lsenordet? Email address "%s" not registered = E-post adress "%s" r inte registrerad ELOG password recovery = terskapande av ELOG lsenord @@ -300,18 +299,6 @@ Cannot connect to server = Kan inte kontakta server Quote = Citat Insert current time = Ange aktuell tid Preview = Frhandsgranska -bold text = fet -italics text = kursiverad -underlined text = understruken -centered text = centrerad -insert hyperlink = lnk -insert email = e-post -insert image = bild -insert quote = citat -insert list = lista -insert code = programkod -hide the smiley bar = gm smiley-rad -show the smiley bar = visa smiley-rad FONT = FONT SIZE = STORLEK COLOR = FRG @@ -357,7 +344,6 @@ Cannot send email notification to "%s" = Kan inte s Error: Command "%s" is not allowed for user "%s" = Fel: kommando "%s" r inte tilltet fr anvndare "%s" 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 = Anvndarnamn fr inte innehlla blanktecken Empty password not allowed = Tomt lsenord inte tilltet Password may not contain blanks = Lsenordet fr inte innehlla 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 = diff --git a/resources/eloglang.turkish b/resources/eloglang.turkish index 2877eaaf..b4db41e8 100755 --- a/resources/eloglang.turkish +++ b/resources/eloglang.turkish @@ -153,7 +153,6 @@ Only user %s can delete this entry = Yaln Search text also in attributes = Metni zellikler iinde de ara Date = Tarih ID = ID -Remember me on this computer = Bu bilgisayarda beni hatrla Forgot password? = Parolay unuttunuz mu? Email address "%s" not registered = "%s" e-posta adresi kaytl deil 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) = Balk seviyesini girin (1, 2 veya 3) Preview = nizleme -bold text = koyu metin -italics text = eik 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 = alnt ekle -insert list = liste ekle -insert heading = balk ekle -insert code = kod ekle -hide the smiley bar = glen yz ubuunu gizle -show the smiley bar = glen yz ubuunu gster FONT = YAZITP 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 = diff --git a/resources/eloglang.zh_CN-GB2312 b/resources/eloglang.zh_CN-GB2312 index 627f404a..2d9802f6 100644 --- a/resources/eloglang.zh_CN-GB2312 +++ b/resources/eloglang.zh_CN-GB2312 @@ -151,7 +151,6 @@ Only user %s can delete this entry = ֻ Search text also in attributes = ͬʱеı Date = ID = ID -Remember me on this computer = ڴ˼ϼ¼ҵϢ Forgot password? = ˰ɣ Email address "%s" not registered = ʼַ "%s" ûбע 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 "%s" is not allowed for user "%s" = "%s" ֹû "%s" ִ 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 = diff --git a/resources/eloglang.zh_CN-UTF8 b/resources/eloglang.zh_CN-UTF8 index 21cb184c..fb13c859 100644 --- a/resources/eloglang.zh_CN-UTF8 +++ b/resources/eloglang.zh_CN-UTF8 @@ -151,7 +151,6 @@ Only user %s can delete this entry = 只有用户 %s 可以删除 Search text also in attributes = 同时搜索属性中的文本 Date = 日期 ID = ID -Remember me on this computer = 在此计算机上记录我的信息 Forgot password? = 忘记密码了吧？ Email address "%s" not registered = 电子邮件地址 "%s" 没有被注册 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 "%s" is not allowed for user "%s" = 错误：命令 "%s" 禁止让用户 "%s" 执行 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 = diff --git a/src/elogd.c b/src/elogd.c index f2a89989..3ac09d65 100755 --- a/src/elogd.c +++ b/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 + 4) = 0xdeadc0de; - *(unsigned int *)(temp + bytes + 8) = 0xdeadc0de; + *(unsigned int *) (temp + 0) = bytes; + *(unsigned int *) (temp + 4) = 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 + 4) = 0xdeadc0de; - *(unsigned int *)(temp + count*bytes + 8) = 0xdeadc0de; + *(unsigned int *) (temp + 0) = count * bytes; + *(unsigned int *) (temp + 4) = 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); - old_size = *((unsigned int *)(temp-8)); - assert(*((unsigned int *)(temp+old_size)) == 0xdeadc0de); + assert(*((unsigned int *) (temp - 4)) == 0xdeadc0de); + old_size = *((unsigned int *) (temp - 8)); + 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 + 4) = 0xdeadc0de; - *(unsigned int *)(temp + bytes + 8) = 0xdeadc0de; + *(unsigned int *) (temp + 0) = bytes; + *(unsigned int *) (temp + 4) = 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); - old_size = *((unsigned int *)(temp-8)); - assert(*((unsigned int *)(temp+old_size)) == 0xdeadc0de); + assert(*((unsigned int *) (temp - 4)) == 0xdeadc0de); + old_size = *((unsigned int *) (temp - 8)); + 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 reply_id) + int n_attachments, char *multipart_boundary, int message_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, - inside_table; + int i, j, k, l, m, elcode_disabled, elcode_disabled1, escape_char, ordered_list, substituted, 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("\n", script); @@ -10169,8 +10167,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL rsprintf("