Skip to content

Commit bbe6c67

Browse files
committed
Merge branch 'master' of github.com:chamilo/chamilo-lms
2 parents 8ae1a65 + 08f5149 commit bbe6c67

File tree

123 files changed

+131
-279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+131
-279
lines changed

assets/locales/ar.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,6 @@
555555
"Please read the following requirements thoroughly.": "Read thoroughly",
556556
"Recommended settings for your server configuration. These settings are set in the php.ini configuration file on your server.": "Recommended settings for your server configuration. These settings are set in the php.ini configuration file on your server.",
557557
"Chamilo is free software distributed under the GNU General Public licence (GPL).": "Chamilo is free software distributed under the GNU General Public licence (GPL).",
558-
"Dear user,<br />\n<br />You are about to start using one of the best open-source e-learning platform on the market. Like many other open-source project, this project is backed up by a large community of students, teachers, developers and content creators who would like to promote the project better.<br />\n<br />\nBy knowing a little bit more about you, one of our most important users, who will manage this e-learning system, we will be able to let people know that our software is used and let you know when we organize events that might be relevant to you.<br />\n<br />\nBy filling this form, you accept that the Chamilo association or its members might send you information by e-mail about important events or updates in the Chamilo software or community. This will help the community grow as an organized entity where information flow, with a permanent respect of your time and your privacy.<br />\n<br />\nPlease note that you are <b>not required</b> to fill this form. If you want to remain anonymous, we will loose the opportunity to offer you all the privileges of being a registered portal administrator, but we will respect your decision. Simply leave this form empty and click \"Next\".<br /><br />": "\u0639\u0632\u064a\u0632\u064a \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645",
559558
"The install script will create (or use) the Chamilo database using the database name given here. Please make sure the user you give has the right to create the database by the name given here. If a database with this name exists, it will be overwritten. Please do not use the root user as the Chamilo database user. This can lead to serious security issues.": "The install script will create the Chamilo main database(s). Please note that Chamilo will need to create several databases. If you are allowed to use only one database by your Hosting Service, Chamilo will not work, unless you chose the option \"One database\".",
560559
"The install script will erase all tables of the selected database. We heavily recommend you do a full backup of them before confirming this last install step.": "The install script will erase all tables of the selected databases. We heavily recommend you do a full backup of them before confirming this last install step.",
561560
"Continue with %s": "Continue with {0}",
@@ -624,5 +623,6 @@
624623
"Destination of test e-mail": "Destination of test e-mail",
625624
"Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface).": "Some directories and the files they include must be writeable by the web server in order for Chamilo to run (students uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface).",
626625
"A database with the same name already exists. It will be deleted.": "A database with the same name already exists. It will be deleted.",
627-
"When you enter your portal for the first time, the best way to understand it is to create a course with the 'Create course' link in the menu and play around a little.": "When you enter your campus for the first time, the best way to understand it is to register with the option 'Create course area' and then follow the way."
626+
"When you enter your portal for the first time, the best way to understand it is to create a course with the 'Create course' link in the menu and play around a little.": "When you enter your campus for the first time, the best way to understand it is to register with the option 'Create course area' and then follow the way.",
627+
"Dear user,<br><br>You are about to start using one of the best Open Source e-learning platforms on the market. Like many other Open Source projects, Chamilo is backed up by a large community of students, teachers, developers, content creators and businesses who would like to promote the project better.<br><br>By knowing a little bit more about you, a platform administrator, one of the most important user type for us, who will manage this e-learning system, we will be able to let people know, statistically, how our software is used while respecting your privacy. We will also be able to let you know when we organize events that might be relevant to you or offer additional services that might be of value to your organisation.<br><br>By filling this form, you agree that the editor of Chamilo, the BeezNest Belgium company, registered in Belgium, and/or members of its network of partners (exclusively Chamilo services providers) might occasionally send you information by e-mail about important events or updates in the Chamilo software or community. This will help the community grow as an organized entity where information flows, with a thorough respect of your time and your privacy.<br><br>Please note that you are <b>not required</b> to fill this form. If you want to remain anonymous, we will lose the opportunity to offer you all the privileges of being a registered portal administrator, but we will respect your decision. Simply leave this form empty and click <b>Next</b>.<br><br>": "Dear user,<br><br>You are about to start using one of the best Open Source e-learning platforms on the market. Like many other Open Source projects, Chamilo is backed up by a large community of students, teachers, developers, content creators and businesses who would like to promote the project better.<br><br>By knowing a little bit more about you, a platform administrator, one of the most important user type for us, who will manage this e-learning system, we will be able to let people know, statistically, how our software is used while respecting your privacy. We will also be able to let you know when we organize events that might be relevant to you or offer additional services that might be of value to your organisation.<br><br>By filling this form, you agree that the editor of Chamilo, the BeezNest Belgium company, registered in Belgium, and/or members of its network of partners (exclusively Chamilo services providers) might occasionally send you information by e-mail about important events or updates in the Chamilo software or community. This will help the community grow as an organized entity where information flows, with a thorough respect of your time and your privacy.<br><br>Please note that you are <b>not required</b> to fill this form. If you want to remain anonymous, we will lose the opportunity to offer you all the privileges of being a registered portal administrator, but we will respect your decision. Simply leave this form empty and click <b>Next</b>.<br><br>"
628628
}

assets/locales/ast_ES.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,5 +524,6 @@
524524
"Destination of test e-mail": "Destination of test e-mail",
525525
"Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface).": "Dellos direutorios y los ficheros que t\u00e1n dientro tienen de tener establec\u00edos permisos d'escritura nel servidor web pa que Chamilo pueda funcionar (unv\u00edu de ficheros por parte los estudiantes, ficheros html de la p\u00e1xina d'entamu, etc.) Esto igual sup\u00f3n qu'haya que facer cambios na configuraci\u00f3n del servidor que tienen de facese fuera d'esti interfaz)",
526526
"A database with the same name already exists. It will be deleted.": "A database with the same name already exists. It will be deleted.",
527-
"When you enter your portal for the first time, the best way to understand it is to create a course with the 'Create course' link in the menu and play around a little.": "Si entra na plataforma por vez primera, la meyor manera d'entender el so funcionamientu ye rexistrase cola opci\u00f3n 'Profesor (crear un cursu)' y siguir les instrucciones."
527+
"When you enter your portal for the first time, the best way to understand it is to create a course with the 'Create course' link in the menu and play around a little.": "Si entra na plataforma por vez primera, la meyor manera d'entender el so funcionamientu ye rexistrase cola opci\u00f3n 'Profesor (crear un cursu)' y siguir les instrucciones.",
528+
"Dear user,<br><br>You are about to start using one of the best Open Source e-learning platforms on the market. Like many other Open Source projects, Chamilo is backed up by a large community of students, teachers, developers, content creators and businesses who would like to promote the project better.<br><br>By knowing a little bit more about you, a platform administrator, one of the most important user type for us, who will manage this e-learning system, we will be able to let people know, statistically, how our software is used while respecting your privacy. We will also be able to let you know when we organize events that might be relevant to you or offer additional services that might be of value to your organisation.<br><br>By filling this form, you agree that the editor of Chamilo, the BeezNest Belgium company, registered in Belgium, and/or members of its network of partners (exclusively Chamilo services providers) might occasionally send you information by e-mail about important events or updates in the Chamilo software or community. This will help the community grow as an organized entity where information flows, with a thorough respect of your time and your privacy.<br><br>Please note that you are <b>not required</b> to fill this form. If you want to remain anonymous, we will lose the opportunity to offer you all the privileges of being a registered portal administrator, but we will respect your decision. Simply leave this form empty and click <b>Next</b>.<br><br>": "Dear user,<br><br>You are about to start using one of the best Open Source e-learning platforms on the market. Like many other Open Source projects, Chamilo is backed up by a large community of students, teachers, developers, content creators and businesses who would like to promote the project better.<br><br>By knowing a little bit more about you, a platform administrator, one of the most important user type for us, who will manage this e-learning system, we will be able to let people know, statistically, how our software is used while respecting your privacy. We will also be able to let you know when we organize events that might be relevant to you or offer additional services that might be of value to your organisation.<br><br>By filling this form, you agree that the editor of Chamilo, the BeezNest Belgium company, registered in Belgium, and/or members of its network of partners (exclusively Chamilo services providers) might occasionally send you information by e-mail about important events or updates in the Chamilo software or community. This will help the community grow as an organized entity where information flows, with a thorough respect of your time and your privacy.<br><br>Please note that you are <b>not required</b> to fill this form. If you want to remain anonymous, we will lose the opportunity to offer you all the privileges of being a registered portal administrator, but we will respect your decision. Simply leave this form empty and click <b>Next</b>.<br><br>"
528529
}

assets/locales/bg.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,5 +542,6 @@
542542
"Destination of test e-mail": "Destination of test e-mail",
543543
"Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface).": "\u0412\u044a\u0440\u0445\u0443 \u043d\u044f\u043a\u043e\u0438 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0438 \u0438 \u0444\u0430\u0439\u043b\u043e\u0432\u0435 (\u043d\u0430\u043f\u0440. \u0444\u0430\u0439\u043b\u043e\u0432\u0435\u0442\u0435, \u043a\u0430\u0447\u0435\u043d\u0438 \u043e\u0442 \u043e\u0431\u0443\u0447\u0430\u0432\u0430\u0449\u0438\u0442\u0435 \u0441\u0435, html-\u0444\u0430\u0439\u043b\u043e\u0432\u0435\u0442\u0435 \u043d\u0430 \u043d\u0430\u0447\u0430\u043b\u043d\u0430\u0442\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u0438 \u0434\u0440.) \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0437\u0430\u043f\u0438\u0441\u0432\u0430. \u041c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u043d\u0430\u043b\u043e\u0436\u0438 \u0440\u044a\u0447\u043d\u043e (\u0438\u0437\u0432\u044a\u043d \u0442\u043e\u0437\u0438 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441) \u0434\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u0442\u0435 \u0441\u044a\u0440\u0432\u044a\u0440\u0430.",
544544
"A database with the same name already exists. It will be deleted.": "A database with the same name already exists. It will be deleted.",
545-
"When you enter your portal for the first time, the best way to understand it is to create a course with the 'Create course' link in the menu and play around a little.": "\u041a\u043e\u0433\u0430\u0442\u043e \u0432\u043b\u0435\u0437\u0435\u0442\u0435 \u0437\u0430 \u043f\u0440\u044a\u0432 \u043f\u044a\u0442 \u0432 \u043f\u043e\u0440\u0442\u0430\u043b\u0430, \u043d\u0430\u0439-\u0434\u043e\u0431\u0440\u0435 \u0441\u0435 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0430\u0439\u0442\u0435 \u0441 \u043e\u043f\u0446\u0438\u044f\u0442\u0430 \"\u041f\u0440\u0435\u043f\u043e\u0434\u0430\u0432\u0430\u0442\u0435\u043b (\u0436\u0435\u043b\u0430\u044f \u0434\u0430 \u0441\u044a\u0437\u0434\u0430\u0432\u0430\u043c \u043d\u043e\u0432\u0438 \u043a\u0443\u0440\u0441\u043e\u0432\u0435)\". \u0422\u0430\u043a\u0430 \u0449\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u0430 \u0441\u044a\u0437\u0434\u0430\u0434\u0435\u0442\u0435 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d \u043a\u0443\u0440\u0441 \u0438 \u0434\u0430 \u043f\u0440\u043e\u0443\u0447\u0438\u0442\u0435 \u0440\u0430\u0431\u043e\u0442\u0430\u0442\u0430 \u043d\u0430 \u0441\u0438\u0441\u0442\u0435\u043c\u0430\u0442\u0430."
545+
"When you enter your portal for the first time, the best way to understand it is to create a course with the 'Create course' link in the menu and play around a little.": "\u041a\u043e\u0433\u0430\u0442\u043e \u0432\u043b\u0435\u0437\u0435\u0442\u0435 \u0437\u0430 \u043f\u0440\u044a\u0432 \u043f\u044a\u0442 \u0432 \u043f\u043e\u0440\u0442\u0430\u043b\u0430, \u043d\u0430\u0439-\u0434\u043e\u0431\u0440\u0435 \u0441\u0435 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0430\u0439\u0442\u0435 \u0441 \u043e\u043f\u0446\u0438\u044f\u0442\u0430 \"\u041f\u0440\u0435\u043f\u043e\u0434\u0430\u0432\u0430\u0442\u0435\u043b (\u0436\u0435\u043b\u0430\u044f \u0434\u0430 \u0441\u044a\u0437\u0434\u0430\u0432\u0430\u043c \u043d\u043e\u0432\u0438 \u043a\u0443\u0440\u0441\u043e\u0432\u0435)\". \u0422\u0430\u043a\u0430 \u0449\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u0430 \u0441\u044a\u0437\u0434\u0430\u0434\u0435\u0442\u0435 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d \u043a\u0443\u0440\u0441 \u0438 \u0434\u0430 \u043f\u0440\u043e\u0443\u0447\u0438\u0442\u0435 \u0440\u0430\u0431\u043e\u0442\u0430\u0442\u0430 \u043d\u0430 \u0441\u0438\u0441\u0442\u0435\u043c\u0430\u0442\u0430.",
546+
"Dear user,<br><br>You are about to start using one of the best Open Source e-learning platforms on the market. Like many other Open Source projects, Chamilo is backed up by a large community of students, teachers, developers, content creators and businesses who would like to promote the project better.<br><br>By knowing a little bit more about you, a platform administrator, one of the most important user type for us, who will manage this e-learning system, we will be able to let people know, statistically, how our software is used while respecting your privacy. We will also be able to let you know when we organize events that might be relevant to you or offer additional services that might be of value to your organisation.<br><br>By filling this form, you agree that the editor of Chamilo, the BeezNest Belgium company, registered in Belgium, and/or members of its network of partners (exclusively Chamilo services providers) might occasionally send you information by e-mail about important events or updates in the Chamilo software or community. This will help the community grow as an organized entity where information flows, with a thorough respect of your time and your privacy.<br><br>Please note that you are <b>not required</b> to fill this form. If you want to remain anonymous, we will lose the opportunity to offer you all the privileges of being a registered portal administrator, but we will respect your decision. Simply leave this form empty and click <b>Next</b>.<br><br>": "Dear user,<br><br>You are about to start using one of the best Open Source e-learning platforms on the market. Like many other Open Source projects, Chamilo is backed up by a large community of students, teachers, developers, content creators and businesses who would like to promote the project better.<br><br>By knowing a little bit more about you, a platform administrator, one of the most important user type for us, who will manage this e-learning system, we will be able to let people know, statistically, how our software is used while respecting your privacy. We will also be able to let you know when we organize events that might be relevant to you or offer additional services that might be of value to your organisation.<br><br>By filling this form, you agree that the editor of Chamilo, the BeezNest Belgium company, registered in Belgium, and/or members of its network of partners (exclusively Chamilo services providers) might occasionally send you information by e-mail about important events or updates in the Chamilo software or community. This will help the community grow as an organized entity where information flows, with a thorough respect of your time and your privacy.<br><br>Please note that you are <b>not required</b> to fill this form. If you want to remain anonymous, we will lose the opportunity to offer you all the privileges of being a registered portal administrator, but we will respect your decision. Simply leave this form empty and click <b>Next</b>.<br><br>"
546547
}

0 commit comments

Comments
 (0)