crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 'master'

Browse source 
Master - Correction des tournures anglaises
This commit is contained in:
Daniel Stan 2014-09-13 22:45:42 +02:00
commit 3b2f5e134e
7 changed files with 83 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

23
gestion/mail/template/ago/body/en
View file

@ -1,14 +1,20 @@
Dear members,
The Ordinary General Meeting of the Cr@ns will take place Thursday, March 6th, 2014 at 7:15pm in Pavillon des Jardins.
The present email serve as formal notice to attend.
The main goal of this meeting is the election of a new Board of Directors.
The Ordinary General Meeting of the Cr@ns will take place :
Thursday, March 6th, 2014 at 7:15pm in the Pavillon des Jardins.
This email is the official convocation.
The main goal of this meeting is to elect new Board of Directors.
= Agenda =
== New statutes and Internal regulation ==
Both statutes and internal regulation have been modified. First drafts will soon be available on the wiki.
Final versions will be available Thursday, February 27th after the last meeting of the current members from the Board of Directors. New modifications will be submitted to the vote of all members present at the General Meeting.
Both statutes and internal regulation have been modified.
First drafts will soon be available on the wiki.
Final versions will be available Thursday, February 27th after the last meeting
of the current members from the Board of Directors. New modifications will be
submitted to the vote of all members present at the General Meeting.
== Activity and financial report ==
President Ariane Soret will present the activity report.
@ -19,7 +25,9 @@ Both reports will be submitted to the vote of all present members.
Technical Manager Valentin Samir will present the technical report.
== Elections ==
As anounced by the President, the application phase [1] lasts until Thursday, February 27th. The elections shall be held during the Ordinary General Meeting. Execution modalities will be provided later.
As anounced by the President, the application phase [1] lasts until
Thursday, February 27th. The elections will be held during the Ordinary General
Meeting. Execution modalities will be provided later.
== Counting of votes ==
@ -27,7 +35,8 @@ As anounced by the President, the application phase [1] lasts until Thursday, Fe
During the Ordinary General Meeting, internet connection may be altered.
After the Ordinary General Meeting, the new Board of Directors will eventually have a meeting.
After the Ordinary General Meeting, the new Board of Directors might have a
meeting.
Good evening,

12
gestion/mail/template/carte_etudiant/body/en
View file

@ -1,13 +1,13 @@
Dear Crans member,
It seems that your did not yet give us a school certificate for this academic
year. Because the Crans is connected to RENATER network, we have to justify the
It seems that your haven't yet given a school certificate for this academic
year. The Crans is connected to the RENATER network so we have to justify the
academic status of all our members.
Thus it is necessary for you to go to the Kfet with an original school
certificate or with your student card, before {{deadline}}. In the case you do
not come before that date, you Internet acces will be suspended until you
regularize your situation.
You must therefore go to the Kfet with an original school certificate or with
your student card, before {{deadline}}. In case you fail to come before that
date, your Internet access will be suspended until you have the document sorted
out.
Please do not send us your certificate by email, we need to see an original.

25
gestion/mail/template/demenagement/body/en
View file

@ -1,23 +1,24 @@
Hi {{prenom}} {{nom}}!
A new member of Crans has declared to live in room {{chambre}}, which is the
one you were registered in. It means we do not have a valid address of yours
A new member of Crans has declared to live in the room {{chambre}} you were
previously registered in. This means we do not have your residency information
anymore.
If you wish to keep your Crans Internet access, you need to inform us of the
number of your new room, or your new *complete* address, in the case you moved
out of campus.
If you wish to keep your Crans Internet access, you need to give us the number
of your new room, or your new *complete* address, in case you moved out of
campus.
If you do not wish to keep your Crans Internet access, a simple message from
you will be enough to suppress all your computers from our database. This
deletion will automatically take place in {{jours}} days if you do not answer.
you is enough to delete all your computers from our database. This deletion
will automatically take place in {{jours}} day(s) if you do not answer.
If you do own a Crans account, you will keep a time-unlimited acces to it, as
well as any associated service such as your email forname.lastname@crans.org.
If you wish us to suppress all data related to you, just ask.
If you do have a Crans account, you will keep an unlimited acces to it, as well
as all the associated services such as your email firstname.lastname@crans.org.
If you want us to delete all data related to you, just ask.
In the case this email is an error, please contact us as soon as possible so we
can correct the problem.
Should this email be an error, please let us know as soon as possible so that
we can correct the mistake.
--
The Crans active members

2
gestion/mail/template/demenagement/body/fr
View file

@ -10,7 +10,7 @@ si tu as quitté le campus.
Si tu ne souhaites pas conserver ton accès Internet, un simple message de
ta part et nous supprimerons les machines que tu possèdes de notre base de
données. Cette suppression aura automatiquement lieu dans {{jours}} jours en
données. Cette suppression aura automatiquement lieu dans {{jours}} jour(s) en
l'absence de réponse.
Si tu possèdes un compte Crans, tu conserves un accès à celui-ci sans limite de

33
gestion/mail/template/reinscription/body/en
View file

@ -1,32 +1,31 @@
Dear Crans member,
It seems you did not yet resuscribe for the present academic year. If you wish
to maintain your connection to Crans network and to Internet, you need to
resuscribe before September 30th, otherwise your connection will be suspended.
It seems that you haven't yet resuscribed for the new academic year. If you
wish to keep your connection to the Crans network and to the Internet, you need
to resuscribe before September 30th, otherwise your connection will be
suspended.
Thus, you can meet us during one of our office hours at the Kfet. As a
reminder, they take place from Monday to Friday, from 12:30pm to 1:30pm and
from 6:30pm to 8:30pm, *except Tuesday night*. Please do not come out of those
office hours, as nobody could proceed to your resubscription.
In order to do so, you can meet us during one of our office hours at the Kfet.
Just to remind you: they take place from Monday to Friday, from 12:30pm to
1:30pm and from 6:30pm to 8:30pm, *except on Tuesday night*. Please come during
those office hours, or else nobody will be able to help for your
resubscription.
To resuscribe, you need to bring :
* your payment for this academic year, whose amount is still 50€, that you can
pay either by paycheck written to "Association Crans" or by cash
* your payment for this academic year (the amount is still 50€), that you can
pay either by cheque payable to the "Association Crans" or by cash
* your school certificate or your student card for the present academic year
(in case your do not yet own one of this papers, you have until late October
to bring it to us)
(in case your do not have one of those papers yet, you have until the end of
October to bring it to us)
You will need to fill the subscription form provided to you at the Kfet, where
no technical information is required.
You will need to fill the subscription form you can find at the Kfet. No
technical information is required.
If you do not wish to resuscribe for the present academic year, just let us
know and we will suppress your computers from our database.
know and we will delete your computers from our database.
See you soon !
--
The Crans active members

22
gestion/mail/template/upload_hard/body/en
View file

@ -1,25 +1,24 @@
Hi {{proprio}},
Your upload has been temporarily limited due to the anormaly big amount of data
you uploaded toward the outside of the Crans network.
({{upload}} Mo within the last 24h)
Your upload has been temporarily limited due to the anormal amount of data
you have sent out of the Crans network. ({{upload}} MB within the last 24h)
If this event were to take place too often, you would be totaly disconnected
for a longer period. It is thus your duty to check your computer usage so it
doesn't upload too many data in the future.
If this was to occur too often, you will be totally disconnected for a longer
period. You are therefore asked to to check your use of the conputer so that it
doesn't upload too much data in the future.
{% if reco_url %}
To remove the upload limitation, please consult :
To remove the upload limitation, please see:
{{ reco_url }}.
{% endif %}
For more informations, please consult :
For more informations, please see:
http://wiki.crans.org/VieCrans/DéconnexionPourUpload
In case you have any question, please contact disconnect@crans.org.
If you have any questions, please contact disconnect@crans.org.
N.B. : Upload consists of sending data to computers not connected to Crans
network.
N.B. : Uploading consists in sending data to computers not connected to the
Crans network.
--
Disconnect team
@ -28,3 +27,4 @@ Disconnect team

32
gestion/mail/template/upload_soft/body/en
View file

@ -1,34 +1,30 @@
Hi {{proprio}},
This email notifies you that your computer(s) send(s) a big amount of data
toward the outside of the Crans network ({{upload}} Mo within the last 24h).
This email notifies you that your computer(s) send(s) a big amount of data out
of the Crans network ({{upload}} MB within the last 24h).
*This is a simple notification, no upload limitation is attached.*
It means that you sent more than {{limite_soft}} Mo within the last 24 hours.
For example, it could be due to the fact that you tried to send heavy files
toward the outside of the Crans network, or that your overused a software
sending a big amount of small data (visio-conference software for example).
It could be something else too.
This means that you have sent more than {{limite_soft}} MB within the last
24 hours. It could be due to the fact that you have tried to send heavy files
out of the Crans network, or that you have overused a software sending a big
amount of small data (visio-conference software for example). It could be
something else too.
In the case it does not stop, and that you overgo the acceptable limitation of
{{limite_hard}} Mo during any period of 24 hours, your upload would be
automatically limited for the following 24 hours. It is thus your duty to check
that you do not overgo that limitation.
If this does not stop, and that you exceed the acceptable limitation of {{limite_hard}} MB
during any period of 24 hours, your upload will automatically be limited for
the following 24 hours. You are therefore asked to check that you do not exceed
that limitation.
For more informations, please consult :
For more informations, please see:
http://wiki.crans.org/VieCrans/DéconnexionPourUpload
http://wiki.crans.org/VieCrans/AvertissementPourUpload
In case you have any question, please contact disconnect@crans.org.
If you have any questions, please contact disconnect@crans.org.
N.B. : Upload consists of sending data to computers not connected to Crans
N.B. : Uploading consists in sending data to computers not connected to Crans
network.
--
Disconnect team