Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release 3.1.2-1

Browse Source
This commit is contained in:
Stefan Ritt 2016-09-05 10:17:13 +02:00
parent 5ac45747ac
commit bd759646d2
23 changed files with 524 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/ChangeLog
View File

@ -1,3 +1,10 @@
Version 3.1.2, released September 5th, 2015
===========================================
- Fixed two vulnerabilities
- Added "sort by email" to config page
- Updates some translations
Version 3.1.1, released August 4th, 2015
========================================

2
doc/index.html
View File

@ -29,7 +29,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 : 3.1.1</div>
<div class="version">Current version is : 3.1.2</div>
<hr>
<a name="whatis">

2
resources/eloglang.brazilian
View File

@ -486,10 +486,10 @@ If you leave this page you will lose your unsaved changes =
Edited =
All time =
Draft =
Restrict seach to last =
days =
Draft saved at =
You might however then overwrite each other's modifications =
Draft entry created on %s by %s =
Really delete this entry? =
This is a draft message, edit and submit it to make it permanent =
Restrict search to last =

2
resources/eloglang.bulgarian
View File

@ -486,10 +486,10 @@ If you leave this page you will lose your unsaved changes =
Edited =
All time =
Draft =
Restrict seach to last =
days =
Draft saved at =
You might however then overwrite each other's modifications =
Draft entry created on %s by %s =
Really delete this entry? =
This is a draft message, edit and submit it to make it permanent =
Restrict search to last =

2
resources/eloglang.czech
View File

@ -483,10 +483,10 @@ If you leave this page you will lose your unsaved changes =
Edited =
All time =
Draft =
Restrict seach to last =
days =
Draft saved at =
You might however then overwrite each other's modifications =
Draft entry created on %s by %s =
Really delete this entry? =
This is a draft message, edit and submit it to make it permanent =
Restrict search to last =

2
resources/eloglang.danish
View File

@ -486,10 +486,10 @@ If you leave this page you will lose your unsaved changes =
Edited =
All time =
Draft =
Restrict seach to last =
days =
Draft saved at =
You might however then overwrite each other's modifications =
Draft entry created on %s by %s =
Really delete this entry? =
This is a draft message, edit and submit it to make it permanent =
Restrict search to last =

2
resources/eloglang.dutch
View File

@ -485,10 +485,10 @@ If you leave this page you will lose your unsaved changes =
Edited =
All time =
Draft =
Restrict seach to last =
days =
Draft saved at =
You might however then overwrite each other's modifications =
Draft entry created on %s by %s =
Really delete this entry? =
This is a draft message, edit and submit it to make it permanent =
Restrict search to last =

6
resources/eloglang.french
View File

@ -478,10 +478,14 @@ If you leave this page you will lose your unsaved changes = Si vous quittez cett
Edited = Modifié
All time = Tous temps
Draft = Brouillon
Restrict seach to last = Restreindre la recherche aux
days = derniers jours
Draft saved at = Brouillon enregistré le
You might however then overwrite each other's modifications = Vous pourriez toutefois écraser mutuellement vos modifications
Draft entry created on %s by %s = Brouillon créé le %s par %s
Really delete this entry? = Supprimer cette entrée, vraiment ?
This is a draft message, edit and submit it to make it permanent = Ceci est un brouillon, modifiez-le et validez-le pour le rendre définitif
#
#---- please translate following items and then remove this comment ----#
#
Restrict search to last =

3
resources/eloglang.german
View File

@ -478,11 +478,10 @@ If you leave this page you will lose your unsaved changes = Wenn Sie diese Seite
Edited = Geändert
All time = Immer
Draft = Entwurf
Restrict seach to last = Suche einschränken auf letzte
days = Tage
Draft saved at = Entwurf gespeichert um
You might however then overwrite each other's modifications = Sie würde dann jedoch die Änderungen von jemand anderem überschreiben
Draft entry created on %s by %s = Entwurf erstellt am %s von %s
Really delete this entry? = Diesen Eintrag wirklich löschen?
This is a draft message, edit and submit it to make it permanent = Dies ist ein Entwurf, bitte ändern und abschicken um ihn permanent zu machen
Restrict search to last = Suche beschrŠnken auf letzte

6
resources/eloglang.indonesia
View File

@ -479,9 +479,7 @@ If you leave this page you will lose your unsaved changes = Jika anda meninggalk
Edited = Teredit
All time = Semua waktu
Draft = Rancangan
Restrict seach to last = Batasi pencarian di akhir
days = Hari
This is a draft message, edit and submit it to make it permament = Ini adalah rancangan pesan, ubah dan masukkan untuk membuatnya permanen
Draft saved at = Rancangan disimpan pada
You might however then overwrite each other's modifications = Anda mungkin saling menulis ulang modifikasi orang lain
@ -489,3 +487,7 @@ You might however then overwrite each other's modifications = Anda mungkin salin
#
#---- please translate following items and then remove this comment ----#
#
Draft entry created on %s by %s =
Really delete this entry? =
Restrict search to last =
This is a draft message, edit and submit it to make it permanent =

2
resources/eloglang.italian
View File

@ -482,10 +482,10 @@ If you leave this page you will lose your unsaved changes =
Edited =
All time =
Draft =
Restrict seach to last =
days =
Draft saved at =
You might however then overwrite each other's modifications =
Draft entry created on %s by %s =
Really delete this entry? =
This is a draft message, edit and submit it to make it permanent =
Restrict search to last =

2
resources/eloglang.japanese
View File

@ -482,10 +482,10 @@ If you leave this page you will lose your unsaved changes =
Edited =
All time =
Draft =
Restrict seach to last =
days =
Draft saved at =
You might however then overwrite each other's modifications =
Draft entry created on %s by %s =
Really delete this entry? =
This is a draft message, edit and submit it to make it permanent =
Restrict search to last =

11
resources/eloglang.polish
View File

@ -1,4 +1,3 @@
#
# Polish translation by Daniel Sajdyk <daniel.sajdyk at gmail dot com>
# A more recent version may be available at : http://www.sajdyk.pl/2015/06/polskie-tumaczenie-dla-aplikacji-elog.html
# Charset = UTF-8
@ -478,8 +477,14 @@ If you leave this page you will lose your unsaved changes = Jeżeli opuścisz t
Edited = Edytowany
All time = Cały czas
Draft = Projekt
Restrict seach to last = Zawęź szukanie do
days = dni
This is a draft message, edit and submit it to make it permament = To jest projekt wpisu, edytuj i wyślij aby ją zapisać
Draft saved at = Szkic zapisany o
You might however then overwrite each other's modifications = Jednakże możesz nadpisać każdą inną modyfikację
#
#---- please translate following items and then remove this comment ----#
#
Draft entry created on %s by %s =
Really delete this entry? =
Restrict search to last =
This is a draft message, edit and submit it to make it permanent =

2
resources/eloglang.ru_CP1251
View File

@ -487,10 +487,10 @@ If you leave this page you will lose your unsaved changes =
Edited =
All time =
Draft =
Restrict seach to last =
days =
Draft saved at =
You might however then overwrite each other's modifications =
Draft entry created on %s by %s =
Really delete this entry? =
This is a draft message, edit and submit it to make it permanent =
Restrict search to last =

471
resources/eloglang.slovak
View File

File diff suppressed because one or more lines are too long

4
resources/eloglang.spanish
View File

@ -487,3 +487,7 @@ You might however then overwrite each other's modifications = Sin embargo puede
Draft entry created on %s by %s = Entrada borrador creada en %s por %s
Really delete this entry? = Desea borrar realmente esta entrada?
This is a draft message, edit and submit it to make it permanent = Este es un mensaje borrador, editelo y envíelo para hacerlo permanente
#
#---- please translate following items and then remove this comment ----#
#

2
resources/eloglang.swedish
View File

@ -485,10 +485,10 @@ If you leave this page you will lose your unsaved changes =
Edited =
All time =
Draft =
Restrict seach to last =
days =
Draft saved at =
You might however then overwrite each other's modifications =
Draft entry created on %s by %s =
Really delete this entry? =
This is a draft message, edit and submit it to make it permanent =
Restrict search to last =

2
resources/eloglang.turkish
View File

@ -485,10 +485,10 @@ If you leave this page you will lose your unsaved changes =
Edited =
All time =
Draft =
Restrict seach to last =
days =
Draft saved at =
You might however then overwrite each other's modifications =
Draft entry created on %s by %s =
Really delete this entry? =
This is a draft message, edit and submit it to make it permanent =
Restrict search to last =

2
resources/eloglang.zh_CN-GB2312
View File

@ -484,10 +484,10 @@ If you leave this page you will lose your unsaved changes =
Edited =
All time =
Draft =
Restrict seach to last =
days =
Draft saved at =
You might however then overwrite each other's modifications =
Draft entry created on %s by %s =
Really delete this entry? =
This is a draft message, edit and submit it to make it permanent =
Restrict search to last =

2
resources/eloglang.zh_CN-UTF8
View File

@ -484,10 +484,10 @@ If you leave this page you will lose your unsaved changes =
Edited =
All time =
Draft =
Restrict seach to last =
days =
Draft saved at =
You might however then overwrite each other's modifications =
Draft entry created on %s by %s =
Really delete this entry? =
This is a draft message, edit and submit it to make it permanent =
Restrict search to last =

2
src/elog-version.h
View File

@ -26,7 +26,7 @@
\********************************************************************/
/* Version of ELOG */
#define VERSION "3.1.1"
#define VERSION "3.1.2"
/* ELOG identification */
static const char ELOGID[] = "elogd " VERSION " built " __DATE__ ", " __TIME__;

11
src/elogd.c
View File

@ -13844,11 +13844,18 @@ void show_config_page(LOGBOOK * lbs)
get_user_line(lbs, user_list[i], NULL, full_name, user_email, NULL, NULL, NULL);
if (strcmp(user_list[i], user) == 0) {
strencode2(str, user_list[i], sizeof(str));
rsprintf("<option selected value=\"%s\">%s &lt;%s&gt;\n", str, str, user_email);
if (sort_email)
rsprintf("<option selected value=\"%s\">&lt;%s&gt; %s\n", str, user_email, str);
else
rsprintf("<option selected value=\"%s\">%s &lt;%s&gt;\n", str, str, user_email);
}
else {
strencode2(str, user_list[i], sizeof(str));
rsprintf("<option value=\"%s\">%s &lt;%s&gt;\n", str, str, user_email);
if (sort_email)
rsprintf("<option value=\"%s\">&lt;%s&gt; %s\n", str, user_email, str);
else
rsprintf("<option value=\"%s\">%s &lt;%s&gt;\n", str, str, user_email);
}
}

2
xcode/elogd.xcodeproj/project.pbxproj
View File

@ -51,6 +51,7 @@
D58A366615AF103300682DC0 /* elog-version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "elog-version.h"; path = "../src/elog-version.h"; sourceTree = SOURCE_ROOT; };
D5AC5BF9154AC7200018DD90 /* config.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = config.html; path = ../doc/config.html; sourceTree = SOURCE_ROOT; };
D5C8CD7A1ACC02A0008B1201 /* elogd.cfg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = elogd.cfg; path = ../../../elogdemo/elogd.cfg; sourceTree = "<group>"; };
D5F8DE001D7D60E800E4D402 /* eloglang.german */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = eloglang.german; path = ../resources/eloglang.german; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -115,6 +116,7 @@
D5F11B9013AFA146002CE8BF /* Resources */ = {
isa = PBXGroup;
children = (
D5F8DE001D7D60E800E4D402 /* eloglang.german */,
D57031C51B21CAF900A7C6EE /* elog.css */,
D5C8CD7A1ACC02A0008B1201 /* elogd.cfg */,
D5AC5BF9154AC7200018DD90 /* config.html */,