Merge remote-tracking branch 'origin/master' into tonitch/feat/notifications
This commit is contained in:
		@ -29,16 +29,76 @@ app.settings=Settings
 | 
			
		||||
app.messages=Messages
 | 
			
		||||
app.forum=Forum
 | 
			
		||||
app.schedules=Schedules
 | 
			
		||||
app.manageSchedules=Manage Schedules
 | 
			
		||||
app.inscription.requests=Inscription Requests
 | 
			
		||||
app.manage.courses=Manage Courses
 | 
			
		||||
app.language=Language
 | 
			
		||||
app.manage.profile=Manage profile
 | 
			
		||||
app.studentList=Students List
 | 
			
		||||
app.users=Users
 | 
			
		||||
app.payments = Payments
 | 
			
		||||
app.manageOwnLessons=Manage Owned Courses Schedule
 | 
			
		||||
app.lessonRequests=Schedule Requests
 | 
			
		||||
app.payments=Payments
 | 
			
		||||
request.moreInfos=More Infos
 | 
			
		||||
request.accept=Accept
 | 
			
		||||
request.refuse=Refuse
 | 
			
		||||
Pending=Pending
 | 
			
		||||
Delete=Delete
 | 
			
		||||
Modify=Modify
 | 
			
		||||
Create=Créer
 | 
			
		||||
requestType=Request Type
 | 
			
		||||
day=Day
 | 
			
		||||
start=Start
 | 
			
		||||
end=End
 | 
			
		||||
monday=Monday
 | 
			
		||||
tuesday=Tuesday
 | 
			
		||||
wednesday=Wednesday
 | 
			
		||||
thursday=Thursday
 | 
			
		||||
friday=Friday
 | 
			
		||||
saturday=Saturday
 | 
			
		||||
sunday=Sunday
 | 
			
		||||
january=January
 | 
			
		||||
february=February
 | 
			
		||||
march=March
 | 
			
		||||
april=April
 | 
			
		||||
may=May
 | 
			
		||||
june=June
 | 
			
		||||
july=July
 | 
			
		||||
august=August
 | 
			
		||||
september=September
 | 
			
		||||
october=October
 | 
			
		||||
november=November
 | 
			
		||||
december=December
 | 
			
		||||
Grid=Grid
 | 
			
		||||
Week=Week
 | 
			
		||||
Month=Month
 | 
			
		||||
List=List
 | 
			
		||||
Type=Type
 | 
			
		||||
Teacher=Teacher
 | 
			
		||||
Course=Course
 | 
			
		||||
TP=TP
 | 
			
		||||
TD=TD
 | 
			
		||||
Exam=Exam
 | 
			
		||||
OwnSchedule=Own Schedule
 | 
			
		||||
SwitchToJSON=Switch to JSON FILE
 | 
			
		||||
schedule.previous=Previous
 | 
			
		||||
schedule.next=Next
 | 
			
		||||
schedule.current=Current
 | 
			
		||||
schedule.settings=Settings
 | 
			
		||||
schedule.courses=Courses
 | 
			
		||||
schedule.teachers=Teacher(s)
 | 
			
		||||
schedule.askChanges=Ask Changes
 | 
			
		||||
schedule.askCreate=Ask to create course
 | 
			
		||||
schedule.askDeletion=Ask Deletion
 | 
			
		||||
schedule.createSchedule=Create Schedule
 | 
			
		||||
schedule.createLesson=Create course
 | 
			
		||||
schedule.deleteMod=Unable deletion
 | 
			
		||||
schedule.noDeleteMod=Disable deletion
 | 
			
		||||
schedule=Schedule
 | 
			
		||||
old_day=Precedent day
 | 
			
		||||
old_start=Precedent start
 | 
			
		||||
old_end=Precedent end
 | 
			
		||||
old_type=Precedent type
 | 
			
		||||
courses.createCourse=Create course
 | 
			
		||||
courses.deleteCourse=Delete course
 | 
			
		||||
courses.modify=Modify
 | 
			
		||||
@ -83,7 +143,7 @@ dltaxdoc=Download tax justification document
 | 
			
		||||
dlresidency=Download residency justification document
 | 
			
		||||
enteramount=Please enter the amount to provide :
 | 
			
		||||
oldcursus=Old curriculums
 | 
			
		||||
newcursus = New curriculums
 | 
			
		||||
newcursus=New curriculums
 | 
			
		||||
year=Year
 | 
			
		||||
reason=Reason :
 | 
			
		||||
selectedcursus=Selected curriculum :
 | 
			
		||||
@ -145,3 +205,6 @@ chcur=Change from a cursus to another
 | 
			
		||||
iwouldlike=I would like to :
 | 
			
		||||
newcurr=New curriculum
 | 
			
		||||
cursusprereq=The cursus you selected has some prerequisites ensure that your external curriculum data is updated in your profile
 | 
			
		||||
imposecurriculum=Impose a curriculum
 | 
			
		||||
impose=Impose
 | 
			
		||||
gotimposed=The selected curriculum has been imposed
 | 
			
		||||
 | 
			
		||||
@ -29,16 +29,76 @@ app.settings=Options
 | 
			
		||||
app.messages=Messages
 | 
			
		||||
app.forum=Forum
 | 
			
		||||
app.schedules=Horaires
 | 
			
		||||
app.manageSchedules=Gérer les horaires
 | 
			
		||||
app.inscription.requests=Demandes d'Inscription
 | 
			
		||||
app.manage.courses=Gérer les cours
 | 
			
		||||
app.language=Langue
 | 
			
		||||
app.manage.profile=Gérer le profil
 | 
			
		||||
app.studentList=Liste des étudiants
 | 
			
		||||
app.users=Utilisateurs
 | 
			
		||||
app.payments = Payements
 | 
			
		||||
app.manageOwnLessons=Gérer ses horaires de cours
 | 
			
		||||
app.lessonRequests=Requêtes d'horaire
 | 
			
		||||
app.payments=Payements
 | 
			
		||||
request.moreInfos=Plus d'Infos
 | 
			
		||||
request.accept=Accepter
 | 
			
		||||
request.refuse=Refuser
 | 
			
		||||
Pending=En attente
 | 
			
		||||
Delete=Supprimer
 | 
			
		||||
Modify=Modifier
 | 
			
		||||
Create=Créer
 | 
			
		||||
requestType=Type de Requête
 | 
			
		||||
day=Jour
 | 
			
		||||
start=Début
 | 
			
		||||
end=Fin
 | 
			
		||||
monday=Lundi
 | 
			
		||||
tuesday=Mardi
 | 
			
		||||
wednesday=Mercredi
 | 
			
		||||
thursday=Jeudi
 | 
			
		||||
friday=Vendredi
 | 
			
		||||
saturday=Samedi
 | 
			
		||||
sunday=Dimanche
 | 
			
		||||
january=Janvier
 | 
			
		||||
february=Février
 | 
			
		||||
march=Mars
 | 
			
		||||
april=Avril
 | 
			
		||||
may=Mai
 | 
			
		||||
june=Juin
 | 
			
		||||
july=Juillet
 | 
			
		||||
august=Août
 | 
			
		||||
september=Septembre
 | 
			
		||||
october=Octobre
 | 
			
		||||
november=Novembre
 | 
			
		||||
december=Decembre
 | 
			
		||||
Grid=Grille
 | 
			
		||||
Week=Semaine
 | 
			
		||||
Month=Mois
 | 
			
		||||
List=Liste
 | 
			
		||||
Type=Type
 | 
			
		||||
Teacher=Professeur
 | 
			
		||||
Course=Cours
 | 
			
		||||
TP=TP
 | 
			
		||||
TD=TD
 | 
			
		||||
Exam=Exam
 | 
			
		||||
OwnSchedule=Mon Horaire
 | 
			
		||||
SwitchToJSON=Afficher le JSON
 | 
			
		||||
schedule.previous=Précédent
 | 
			
		||||
schedule.next=Prochain
 | 
			
		||||
schedule.current=Actuel
 | 
			
		||||
schedule.settings=Options
 | 
			
		||||
schedule.courses=Cours
 | 
			
		||||
schedule.teachers=Professeurs(s)
 | 
			
		||||
schedule.askChanges=Demander Changement
 | 
			
		||||
schedule.askCreate=Demander de créer un cours
 | 
			
		||||
schedule.askDeletion=Demander suppression
 | 
			
		||||
schedule.createSchedule=Créer Horaire
 | 
			
		||||
schedule.createLesson=Créer cours
 | 
			
		||||
schedule.deleteMod=Activer suppression
 | 
			
		||||
schedule.noDeleteMod=Désactiver suppression
 | 
			
		||||
schedule=Horaire
 | 
			
		||||
old_day=Ancien Jour
 | 
			
		||||
old_start=Ancien Début
 | 
			
		||||
old_end=Ancienne Fin
 | 
			
		||||
old_type=Ancien Type
 | 
			
		||||
courses.createCourse=Créer un cours
 | 
			
		||||
courses.deleteCourse=Supprimer un cours
 | 
			
		||||
courses.modify=Modifier
 | 
			
		||||
@ -145,3 +205,6 @@ chcur=Changer d'un cursus vers un autre
 | 
			
		||||
iwouldlike=Je voudrais :
 | 
			
		||||
newcurr=Nouveau cursus
 | 
			
		||||
cursusprereq=Le cursus que vous avez selectionné a des prérequis assurez vous que votre dossier de parcours est a jour dans votre profil
 | 
			
		||||
imposecurriculum=Imposer un cursusgotimposed
 | 
			
		||||
impose=Imposer
 | 
			
		||||
gotimposed=Le cursus selectionné a été imposé
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user