Skip to content

Commit 5f3d68a

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 21282fd + c9a921a commit 5f3d68a

Some content is hidden

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

68 files changed

+453
-421
lines changed

assets/locales/ar.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
"Confirmation": "Confirmation",
211211
"Are you sure you want to delete the selected items?": "Are you sure you want to delete the selected items?",
212212
"Assignments deleted": "Assignments deleted",
213-
"We\\'re sorry, your browser does not support using a microphone": "We\\'re sorry, your browser does not support using a microphone",
213+
"We're sorry, your browser does not support using a microphone": "We're sorry, your browser does not support using a microphone",
214214
"Permission to use the microphone is not enabled, please enable it in your browser to record audio": "Permission to use the microphone is not enabled, please enable it in your browser to record audio",
215215
"Hide advanced settings": "Hide advanced settings",
216216
"Show advanced settings": "Show advanced settings",
@@ -277,7 +277,7 @@
277277
"E-mail": "\u0627\u0644\u0628\u0631\u064a\u062f",
278278
"Your company's name": "\u0627\u0633\u0645 \u0627\u0644\u0645\u0646\u0638\u0645\u0629",
279279
"Your company's activity": "\u0646\u0634\u0627\u0637\u0627\u062a \u0645\u0646\u0638\u0645\u062a\u0643",
280-
"Your job\\'s description": "Your job\\'s description",
280+
"Your job's description": "\u0648\u0635\u0641\u0643 \u0627\u0644\u0648\u0638\u064a\u0641\u064a",
281281
"Your company's home country": "\u0627\u0644\u062f\u0648\u0644\u0629 \u0627\u0644\u0627\u0645 \u0644\u0644\u0645\u0646\u0638\u0645\u0629",
282282
"Company city": "\u0627\u0644\u0645\u062f\u064a\u0646\u0629 \u0627\u0644\u062a\u064a \u062a\u0642\u0639 \u0641\u064a\u0647\u0627 \u0627\u0644\u0645\u0646\u0638\u0645\u0629",
283283
"Preferred contact language": "\u0644\u063a\u0629 \u0627\u0644\u062a\u0648\u0627\u0635\u0644 \u0627\u0644\u0645\u0641\u0636\u0644\u0629",
@@ -337,7 +337,7 @@
337337
"Link name": "\u0627\u0633\u0645 \u0627\u0644\u0631\u0627\u0628\u0637",
338338
"Show link on course homepage": "\u0623\u0638\u0647\u0631 \u0627\u0644\u0631\u0627\u0628\u0637 \u0641\u064a \u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0644\u0631\u0626\u0633\u064a\u0629",
339339
"Select a category": " \u0627\u062e\u062a\u0627\u0631 \u0627\u0644\u0641\u0626\u0629",
340-
"Link\\'s target": "Link\\'s target",
340+
"Link's target": "\u0647\u062f\u0641 \u0627\u0644\u0631\u0627\u0628\u0637",
341341
"Save link": "\u062d\u0641\u0638 \u0627\u0644\u0631\u0627\u0628\u0637",
342342
"Link saved": "Link saved",
343343
"Link is valid": "Link is valid",
@@ -516,7 +516,7 @@
516516
"New page": "New page",
517517
"Pages deleted": "Pages deleted",
518518
"Go to Explore to find a topic of interest, or wait for someone to subscribe you": "Go to Explore to find a topic of interest, or wait for someone to subscribe you",
519-
"You don\\'t have any course yet": "You don\\'t have any course yet",
519+
"You don't have any course yet": "You don't have any course yet",
520520
"Personal data: introduction": "\u0628\u064a\u0627\u0646\u0627\u062a \u0634\u062e\u0635\u064a\u0629: \u0645\u0642\u062f\u0645\u0629",
521521
"Personal data we keep about you": "\u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0627\u0644\u062a\u064a \u0646\u062d\u062a\u0641\u0638 \u0628\u0647\u0627 \u062d\u0648\u0644\u0643",
522522
"Terms and Conditions": "\u0627\u0644\u0634\u0631\u0648\u0637 \u0648\u0627\u0644\u0627\u062d\u0643\u0627\u0645",
@@ -622,5 +622,7 @@
622622
"Test email failed: ": "Test email failed: ",
623623
"Error during test email: ": "Error during test email: ",
624624
"Destination of test e-mail": "Destination of test e-mail",
625-
"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)."
626-
}
625+
"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).",
626+
"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."
628+
}

assets/locales/ast_ES.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
"Confirmation": "Confirmation",
177177
"Are you sure you want to delete the selected items?": "Are you sure you want to delete the selected items?",
178178
"Assignments deleted": "Assignments deleted",
179-
"We\\'re sorry, your browser does not support using a microphone": "We\\'re sorry, your browser does not support using a microphone",
179+
"We're sorry, your browser does not support using a microphone": "We're sorry, your browser does not support using a microphone",
180180
"Permission to use the microphone is not enabled, please enable it in your browser to record audio": "Permission to use the microphone is not enabled, please enable it in your browser to record audio",
181181
"Hide advanced settings": "Hide advanced settings",
182182
"Show advanced settings": "Show advanced settings",
@@ -230,7 +230,6 @@
230230
"I accept": "Aceuto",
231231
"CC website": "CC website",
232232
"Dear user": "Estim\u00e1u usuariu",
233-
"Your job\\'s description": "Your job\\'s description",
234233
"Check database connection": "Comprobar la conesi\u00f3n cola base de datos",
235234
"Step 4 - Database settings": "Step 4 - Database settings",
236235
"Database host": "Database host",
@@ -281,7 +280,7 @@
281280
"Save category": "Save category",
282281
"Link name": "Nome del enllaz",
283282
"Show link on course homepage": "\u00bf Amosar l'enllaz na p\u00e1xina d'entamu del cursu",
284-
"Link\\'s target": "Link\\'s target",
283+
"Link's target": "Dest\u00edn del enllaz",
285284
"Save link": "Guardar l'enllaz",
286285
"Link saved": "Link saved",
287286
"Link is valid": "Link is valid",
@@ -433,7 +432,7 @@
433432
"New page": "New page",
434433
"Pages deleted": "Pages deleted",
435434
"Go to Explore to find a topic of interest, or wait for someone to subscribe you": "Go to Explore to find a topic of interest, or wait for someone to subscribe you",
436-
"You don\\'t have any course yet": "You don\\'t have any course yet",
435+
"You don't have any course yet": "You don't have any course yet",
437436
"Date": "Fecha",
438437
"Why you want to delete your Legal Agreement": "Why you want to delete your Legal Agreement",
439438
"Please tell us why you want to withdraw the rights you previously gave us, to let us make it in the smoothest way possible": "Please tell us why you want to withdraw the rights you previously gave us, to let us make it in the smoothest way possible",
@@ -523,5 +522,7 @@
523522
"Test email failed: ": "Test email failed: ",
524523
"Error during test email: ": "Error during test email: ",
525524
"Destination of test e-mail": "Destination of test e-mail",
526-
"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)"
525+
"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)",
526+
"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."
527528
}

assets/locales/bg.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
"Confirmation": "Confirmation",
183183
"Are you sure you want to delete the selected items?": "Are you sure you want to delete the selected items?",
184184
"Assignments deleted": "Assignments deleted",
185-
"We\\'re sorry, your browser does not support using a microphone": "We\\'re sorry, your browser does not support using a microphone",
185+
"We're sorry, your browser does not support using a microphone": "We're sorry, your browser does not support using a microphone",
186186
"Permission to use the microphone is not enabled, please enable it in your browser to record audio": "Permission to use the microphone is not enabled, please enable it in your browser to record audio",
187187
"Hide advanced settings": "Hide advanced settings",
188188
"Show advanced settings": "Show advanced settings",
@@ -241,7 +241,7 @@
241241
"Dear user": "\u0423\u0432\u0430\u0436\u0430\u0435\u043c\u0438 \u0433\u043e\u0441\u043f\u043e\u0434\u0438\u043d\u0435, / \u0423\u0432\u0430\u0436\u0430\u0435\u043c\u0430 \u0433\u043e\u0441\u043f\u043e\u0436\u043e,",
242242
"Your company's name": "\u0418\u043c\u0435 \u043d\u0430 \u0444\u0438\u0440\u043c\u0430\u0442\u0430",
243243
"Your company's activity": "\u041f\u0440\u0435\u0434\u043c\u0435\u0442 \u043d\u0430 \u0434\u0435\u0439\u043d\u043e\u0441\u0442 \u043d\u0430 \u0444\u0438\u0440\u043c\u0430\u0442\u0430",
244-
"Your job\\'s description": "Your job\\'s description",
244+
"Your job's description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u043d\u0430 \u0412\u0430\u0448\u0430\u0442\u0430 \u0434\u043b\u044a\u0436\u043d\u043e\u0441\u0442",
245245
"Company city": "\u0421\u0435\u0434\u0430\u043b\u0438\u0449\u0435 \u043d\u0430 \u0444\u0438\u0440\u043c\u0430\u0442\u0430",
246246
"Check database connection": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430\u0442\u0430 \u043a\u044a\u043c \u0441\u044a\u0440\u0432\u044a\u0440\u0430 \u0437\u0430 \u0431\u0430\u0437\u0438 \u0434\u0430\u043d\u043d\u0438",
247247
"Step 4 - Database settings": "Step 4 - Database settings",
@@ -295,7 +295,7 @@
295295
"URL": "URL (\u0430\u0434\u0440\u0435\u0441)",
296296
"Link name": "\u041d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u0435 \u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430\u0442\u0430",
297297
"Show link on course homepage": "\u0414\u0430 \u0441\u0435 \u043f\u043e\u043a\u0430\u0437\u0432\u0430 \u0432\u0440\u044a\u0437\u043a\u0430\u0442\u0430 \u0432 <br/>\u043d\u0430\u0447\u0430\u043b\u043d\u0430\u0442\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u043d\u0430 \u043a\u0443\u0440\u0441\u0430",
298-
"Link\\'s target": "Link\\'s target",
298+
"Link's target": "\u041e\u0442\u0432\u0430\u0440\u044f\u043d\u0435 \u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430\u0442\u0430",
299299
"Save link": "\u0417\u0430\u043f\u0438\u0441 \u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430\u0442\u0430",
300300
"Link saved": "Link saved",
301301
"Link is valid": "Link is valid",
@@ -448,7 +448,7 @@
448448
"New page": "New page",
449449
"Pages deleted": "Pages deleted",
450450
"Go to Explore to find a topic of interest, or wait for someone to subscribe you": "Go to Explore to find a topic of interest, or wait for someone to subscribe you",
451-
"You don\\'t have any course yet": "You don\\'t have any course yet",
451+
"You don't have any course yet": "You don't have any course yet",
452452
"Terms and Conditions": "\u0423\u0441\u043b\u043e\u0432\u0438\u044f \u0437\u0430 \u043f\u043e\u043b\u0437\u0432\u0430\u043d\u0435",
453453
"Read the Terms and Conditions": "\u041f\u0440\u043e\u0447\u0435\u0442\u0435\u0442\u0435 \u0423\u0441\u043b\u043e\u0432\u0438\u044f\u0442\u0430 \u0437\u0430 \u043f\u043e\u043b\u0437\u0432\u0430\u043d\u0435",
454454
"Date": "\u0414\u0430\u0442\u0430",
@@ -540,5 +540,7 @@
540540
"Test email failed: ": "Test email failed: ",
541541
"Error during test email: ": "Error during test email: ",
542542
"Destination of test e-mail": "Destination of test e-mail",
543-
"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."
543+
"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.",
544+
"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."
544546
}

assets/locales/bn_BD.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"Confirmation": "Confirmation",
7575
"Are you sure you want to delete the selected items?": "Are you sure you want to delete the selected items?",
7676
"Assignments deleted": "Assignments deleted",
77-
"We\\'re sorry, your browser does not support using a microphone": "We\\'re sorry, your browser does not support using a microphone",
77+
"We're sorry, your browser does not support using a microphone": "We're sorry, your browser does not support using a microphone",
7878
"Permission to use the microphone is not enabled, please enable it in your browser to record audio": "Permission to use the microphone is not enabled, please enable it in your browser to record audio",
7979
"Hide advanced settings": "Hide advanced settings",
8080
"Show advanced settings": "Show advanced settings",
@@ -102,7 +102,6 @@
102102
"Warning!": "Warning!",
103103
"Step 3 - License": "Step 3 - License",
104104
"CC website": "CC website",
105-
"Your job\\'s description": "Your job\\'s description",
106105
"Step 4 - Database settings": "Step 4 - Database settings",
107106
"Database host": "Database host",
108107
"Database name": "Database name",
@@ -125,7 +124,6 @@
125124
"FAQ": "FAQ",
126125
"Demo": "Demo",
127126
"Save category": "Save category",
128-
"Link\\'s target": "Link\\'s target",
129127
"Link saved": "Link saved",
130128
"Link is valid": "Link is valid",
131129
"Link is not valid": "Link is not valid",
@@ -233,7 +231,7 @@
233231
"New page": "New page",
234232
"Pages deleted": "Pages deleted",
235233
"Go to Explore to find a topic of interest, or wait for someone to subscribe you": "Go to Explore to find a topic of interest, or wait for someone to subscribe you",
236-
"You don\\'t have any course yet": "You don\\'t have any course yet",
234+
"You don't have any course yet": "You don't have any course yet",
237235
"Why you want to delete your Legal Agreement": "Why you want to delete your Legal Agreement",
238236
"Please tell us why you want to withdraw the rights you previously gave us, to let us make it in the smoothest way possible": "Please tell us why you want to withdraw the rights you previously gave us, to let us make it in the smoothest way possible",
239237
"Delete Account": "Delete Account",
@@ -308,5 +306,6 @@
308306
"Test email sent successfully": "Test email sent successfully",
309307
"Test email failed: ": "Test email failed: ",
310308
"Error during test email: ": "Error during test email: ",
311-
"Destination of test e-mail": "Destination of test e-mail"
309+
"Destination of test e-mail": "Destination of test e-mail",
310+
"A database with the same name already exists. It will be deleted.": "A database with the same name already exists. It will be deleted."
312311
}

0 commit comments

Comments
 (0)