mirror of
https://gitea.psi.ch/ELOG/elog.git
synced 2026-09-12 19:33:03 +00:00
Merge branch 'master' of gitea.psi.ch:ELOG/elog
This commit is contained in:
commit
2f1954697a
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -1,3 +1,3 @@
|
|||||||
[submodule "mxml"]
|
[submodule "mxml"]
|
||||||
path = mxml
|
path = mxml
|
||||||
url = https://bitbucket.org/tmidas/mxml
|
url=git@gitea.psi.ch:ELOG/mxml.git
|
||||||
|
|||||||
@ -5,11 +5,9 @@ This is ELOG, an electronic logbook.
|
|||||||
|
|
||||||
For the full documentation please visit: https://elog.psi.ch/elog
|
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)
|
||||||
|
|
||||||
<stefan.ritt@psi.ch>
|
|
||||||
|
|
||||||
Happy ELOG'ing!
|
Happy ELOG'ing!
|
||||||
|
|
||||||
Stefan Ritt
|
---
|
||||||
Jan. 2006
|
*Stefan Ritt, Jan. 2006*
|
||||||
@ -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,
|
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
|
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
|
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
|
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
|
and features which might yet be in a release. To check out the GIT
|
||||||
repository, use:
|
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
|
No tags are used, so it is recommended to always use the newest release
|
||||||
from the "master" branch.
|
from the "master" branch.
|
||||||
|
|||||||
@ -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
|
Restrict search to last = Restreindre la recherche au dernier
|
||||||
Do you want to restore your original text? = Voulez-vous restaurer votre texte original ?
|
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.
|
This will overwrite your current modifications. = Cela va écraser vos modifications en cours.
|
||||||
|
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 translate following items and then remove this comment ----#
|
Please wait = Veuillez patienter
|
||||||
#
|
is too long = est trop long
|
||||||
Are you sure to delete the attachment? = Etes-vous sûr de vouloir supprimer cette pièce jointe ?
|
Email address = adresse e-mail
|
||||||
Error sending Email via "%s" = Erreur d'envoi de mail via "%s"
|
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
|
||||||
Please wait =
|
|
||||||
is too long =
|
|
||||||
Email address =
|
|
||||||
A password recovery email has been sent if the user exists in the database =
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user