Merge branch 'master' of gitea.psi.ch:ELOG/elog

This commit is contained in:
2026-04-13 17:49:32 +02:00
4 changed files with 12 additions and 18 deletions
+1 -1
View File
@@ -1,3 +1,3 @@
[submodule "mxml"]
path = mxml
url = https://bitbucket.org/tmidas/mxml
url=git@gitea.psi.ch:ELOG/mxml.git
+3 -5
View File
@@ -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:
<stefan.ritt@psi.ch>
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*
+2 -2
View File
@@ -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.
+6 -10
View File
@@ -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