From 3f0c6bda3b5459af02f7f0e158b538b1fbe361fd Mon Sep 17 00:00:00 2001 From: ritt Date: Tue, 7 Apr 2026 14:57:59 +0200 Subject: [PATCH 1/5] Added missing French translation --- resources/eloglang.french | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/resources/eloglang.french b/resources/eloglang.french index e0e56b00..f5f636bd 100644 --- a/resources/eloglang.french +++ b/resources/eloglang.french @@ -482,13 +482,9 @@ This is a draft message, edit and submit it to make it permanent = Ceci est un b Restrict search to last = Restreindre la recherche au dernier Do you want to restore your original text? = Voulez-vous restaurer votre texte original ? This will overwrite your current modifications. = Cela va écraser vos modifications en cours. - -# -#---- please translate following items and then remove this comment ----# -# -Are you sure to delete the attachment? = Etes-vous sûr de vouloir supprimer cette pièce jointe ? -Error sending Email via "%s" = Erreur d'envoi de mail via "%s" -Please wait = -is too long = -Email address = -A password recovery email has been sent if the user exists in the database = +Are you sure to delete the attachment? = Etes-vous sûr de vouloir supprimer cette pièce jointe ? +Error sending Email via "%s" = Erreur d'envoi de mail via "%s" +Please wait = Veuillez patienter +is too long = est trop long +Email address = adresse e-mail +A password recovery email has been sent if the user exists in the database = Un e-mail de récupération du mot de passe a été envoyé si l'utilisateur existe dans la base de données From 7778f18681ba68386d54f8f6e8a099a7b9d2345c Mon Sep 17 00:00:00 2001 From: ritt Date: Mon, 13 Apr 2026 10:50:12 +0200 Subject: [PATCH 2/5] Fixed conditional attributes on search page in non-English settings --- src/elogd.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/elogd.cxx b/src/elogd.cxx index b6beb7f2..b80d3587 100755 --- a/src/elogd.cxx +++ b/src/elogd.cxx @@ -28083,7 +28083,7 @@ void interprete(char *lbook, const char *path) return; } - if (strieq(command, loc("Find"))) { + if (strieq(command, loc("Find")) || strieq(command, "Find")) { /* stip message id */ if (dec_path[0]) { sprintf(str, "../%s/?cmd=%s", lbs->name_enc, loc("Find")); From 6a1fc80f927bc2cbd10e69d26279605e6c1ebe26 Mon Sep 17 00:00:00 2001 From: ritt Date: Mon, 13 Apr 2026 11:26:36 +0200 Subject: [PATCH 3/5] Changed README to README.md --- README => README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) rename README => README.md (61%) diff --git a/README b/README.md similarity index 61% rename from README rename to README.md index 15653b12..a1178358 100644 --- a/README +++ b/README.md @@ -5,11 +5,9 @@ This is ELOG, an electronic logbook. For the full documentation please visit: https://elog.psi.ch/elog -Please send all bug reports and comments to: - - +Please send all bug reports and comments to [stefan.ritt@psi.ch](stefan.ritt@psi.ch) Happy ELOG'ing! -Stefan Ritt -Jan. 2006 +--- +*Stefan Ritt, Jan. 2006* From a7323df03c4bd2aa36f4f0809ab5c75a5cb280b4 Mon Sep 17 00:00:00 2001 From: ritt Date: Mon, 13 Apr 2026 11:58:33 +0200 Subject: [PATCH 4/5] Changed origin repository --- mkdocs/docs/download_info.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkdocs/docs/download_info.md b/mkdocs/docs/download_info.md index 3d8916b2..d7718435 100644 --- a/mkdocs/docs/download_info.md +++ b/mkdocs/docs/download_info.md @@ -8,12 +8,12 @@ made containing bug fixes or some new and not yet completely debugged code. This is usually the case if some user asks for some new features, which are then implemented and sent to the user for testing. The minor releases are named **`x.y.z-r`** where **`r`** is the release number. A -[web access](https://bitbucket.org/ritt/elog) to the source code +[web access](https://gitea.psi.ch/ELOG/elog) to the source code contains the complete development history of ELOG, plus the newest fixes and features which might yet be in a release. To check out the GIT repository, use: -`git clone https://bitbucket.org/ritt/elog --recursive` +`git clone https://gitea.psi.ch/ELOG/elog --recursive` No tags are used, so it is recommended to always use the newest release from the "master" branch. From fc6209ebef631ae4c102b7facdaa692d186a88bc Mon Sep 17 00:00:00 2001 From: ritt Date: Mon, 13 Apr 2026 11:59:37 +0200 Subject: [PATCH 5/5] Changed origin of mxml submodule --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index bca68d4c..2cf14c53 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "mxml"] path = mxml - url = https://bitbucket.org/tmidas/mxml +url=git@gitea.psi.ch:ELOG/mxml.git