Browse Source

Update get_lang calls using full string

Julio Montoya 5 years ago
parent
commit
823e18aa53
77 changed files with 340 additions and 345 deletions
  1. 1 1
      plugin/advanced_subscription/ajax/advanced_subscription.ajax.php
  2. 2 2
      plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
  3. 15 15
      plugin/advanced_subscription/src/scripts/insert_session_fields.php
  4. 6 6
      plugin/bbb/admin.php
  5. 1 1
      plugin/bbb/ajax.php
  6. 8 8
      plugin/bbb/lib/bbb.lib.php
  7. 5 5
      plugin/bbb/lib/bbb_plugin.class.php
  8. 3 3
      plugin/bbb/listing.php
  9. 1 1
      plugin/before_login/index.php
  10. 1 1
      plugin/buycourses/database.php
  11. 3 3
      plugin/buycourses/src/buy_course_plugin.class.php
  12. 12 12
      plugin/buycourses/src/buycourses.ajax.php
  13. 3 3
      plugin/buycourses/src/configure_course.php
  14. 2 2
      plugin/buycourses/src/course_catalog.php
  15. 1 1
      plugin/buycourses/src/course_panel.php
  16. 1 1
      plugin/buycourses/src/list.php
  17. 1 1
      plugin/buycourses/src/list_service.php
  18. 1 1
      plugin/buycourses/src/list_session.php
  19. 8 8
      plugin/buycourses/src/paymentsetup.php
  20. 1 1
      plugin/buycourses/src/payout_panel.php
  21. 1 1
      plugin/buycourses/src/process_confirm.php
  22. 1 1
      plugin/buycourses/src/sales_report.php
  23. 2 2
      plugin/buycourses/src/service_catalog.php
  24. 1 1
      plugin/buycourses/src/service_error.php
  25. 1 1
      plugin/buycourses/src/service_panel.php
  26. 4 4
      plugin/buycourses/src/service_process.php
  27. 1 1
      plugin/buycourses/src/service_process_confirm.php
  28. 3 3
      plugin/buycourses/src/service_success.php
  29. 4 4
      plugin/buycourses/src/services_add.php
  30. 5 5
      plugin/buycourses/src/services_edit.php
  31. 1 1
      plugin/buycourses/src/session_catalog.php
  32. 1 1
      plugin/buycourses/src/session_panel.php
  33. 4 4
      plugin/buycourses/src/success.php
  34. 1 1
      plugin/courselegal/start.php
  35. 2 2
      plugin/courselegal/user_list.php
  36. 23 23
      plugin/customcertificate/src/index.php
  37. 2 2
      plugin/customcertificate/src/print_certificate.php
  38. 8 8
      plugin/dashboard/block_course/block_course.class.php
  39. 13 13
      plugin/dashboard/block_daily/block_daily.class.php
  40. 9 9
      plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php
  41. 9 9
      plugin/dashboard/block_global_info/block_global_info.class.php
  42. 5 5
      plugin/dashboard/block_session/block_session.class.php
  43. 13 13
      plugin/dashboard/block_student/block_student.class.php
  44. 2 2
      plugin/dashboard/block_student_graph/block_student_graph.class.php
  45. 9 9
      plugin/dashboard/block_teacher/block_teacher.class.php
  46. 2 2
      plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php
  47. 1 1
      plugin/dictionary/terms.php
  48. 3 3
      plugin/grading_electronic/src/GradingElectronicPlugin.php
  49. 1 1
      plugin/jcapture/plugin_applet.php
  50. 7 7
      plugin/learning_calendar/LearningCalendarPlugin.php
  51. 3 3
      plugin/learning_calendar/calendar_users.php
  52. 7 7
      plugin/learning_calendar/start.php
  53. 3 3
      plugin/maintenancemode/plugin.php
  54. 24 24
      plugin/notebookteacher/src/NotebookTeacher.php
  55. 15 15
      plugin/notebookteacher/src/index.php
  56. 3 3
      plugin/questionoptionsevaluation/evaluation.php
  57. 1 1
      plugin/resubscription/src/HookResubscription.php
  58. 2 2
      plugin/resubscription/src/Resubscription.php
  59. 4 4
      plugin/search_course/lib/register_course_widget.class.php
  60. 4 4
      plugin/search_course/lib/search_course_widget.class.php
  61. 1 1
      plugin/studentfollowup/StudentFollowUpPlugin.php
  62. 4 4
      plugin/studentfollowup/my_students.php
  63. 1 1
      plugin/studentfollowup/post.php
  64. 1 1
      plugin/studentfollowup/posts.php
  65. 1 1
      plugin/surveyexportcsv/SurveyExportCsvPlugin.php
  66. 6 6
      plugin/surveyexportcsv/start.php
  67. 1 1
      plugin/surveyexporttxt/export.php
  68. 6 6
      plugin/surveyexporttxt/start.php
  69. 1 1
      plugin/vchamilo/views/editinstance.php
  70. 1 1
      plugin/vchamilo/views/editinstance_form.php
  71. 1 1
      plugin/vchamilo/views/import.php
  72. 3 3
      plugin/vchamilo/views/manage.php
  73. 2 2
      plugin/vchamilo/views/upgrade.php
  74. 4 4
      plugin/whispeakauth/ajax/record_audio.php
  75. 22 24
      src/CoreBundle/Controller/UserPortalController.php
  76. 1 3
      src/CourseBundle/Component/CourseCopy/Resources/ToolIntro.php
  77. 3 4
      src/CourseBundle/Controller/Home/HomeController.php

+ 1 - 1
plugin/advanced_subscription/ajax/advanced_subscription.ajax.php

@@ -29,7 +29,7 @@ $data['profile_completed'] = isset($_REQUEST['profile_completed']) ? floatval($_
 $data['accept_terms'] = isset($_REQUEST['accept_terms']) ? intval($_REQUEST['accept_terms']) : 0;
 $data['courseId'] = isset($_REQUEST['c']) ? intval($_REQUEST['c']) : 0;
 // Init result array
-$result = ['error' => true, 'errorMessage' => get_lang('ThereWasAnError')];
+$result = ['error' => true, 'errorMessage' => get_lang('There was an error.')];
 $showJSON = true;
 // Check if data is valid or is for start subscription
 $verified = $plugin->checkHash($data, $hash) || $data['action'] == 'subscribe';

+ 2 - 2
plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php

@@ -702,7 +702,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                     $termsAndConditions = $courseLegal->getData($data['courseId'], $data['sessionId']);
                     $termsAndConditions = $termsAndConditions['content'];
                     $termsAndConditions = $this->renderTemplateString($termsAndConditions, $data);
-                    $tpl = new Template(get_lang('TermsAndConditions'));
+                    $tpl = new Template(get_lang('Terms and Conditions'));
                     $tpl->assign('session', $data['session']);
                     $tpl->assign('student', $data['student']);
                     $tpl->assign('sessionId', $data['sessionId']);
@@ -718,7 +718,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
                         'error' => UPLOAD_ERR_OK,
                         'size' => filesize(api_get_path(SYS_ARCHIVE_PATH).$filename.'.pdf'),
                     ];
-                    $fileAttachments['comments'][] = get_lang('TermsAndConditions');
+                    $fileAttachments['comments'][] = get_lang('Terms and Conditions');
                 }
                 // Mail to student
                 $mailIds[] = $this->sendMailMessage(

+ 15 - 15
plugin/advanced_subscription/src/scripts/insert_session_fields.php

@@ -16,7 +16,7 @@ $teachingHours = new ExtraField('session');
 $teachingHours->save([
     'field_type' => ExtraField::FIELD_TYPE_INTEGER,
     'variable' => 'teaching_hours',
-    'display_text' => get_lang('TeachingHours'),
+    'display_text' => get_lang('Lecture hours'),
     'visible_to_self' => 1,
     'changeable' => 1,
 ]);
@@ -43,7 +43,7 @@ $recommendedNumberOfParticipants = new ExtraField('session');
 $recommendedNumberOfParticipants->save([
     'field_type' => ExtraField::FIELD_TYPE_INTEGER,
     'variable' => 'recommended_number_of_participants',
-    'display_text' => get_lang('RecommendedNumberOfParticipants'),
+    'display_text' => get_lang('Recommended number of participants'),
     'visible_to_self' => 1,
     'changeable' => 1,
 ]);
@@ -52,7 +52,7 @@ $place = new ExtraField('session');
 $place->save([
     'field_type' => ExtraField::FIELD_TYPE_TEXT,
     'variable' => 'place',
-    'display_text' => get_lang('Place'),
+    'display_text' => get_lang('Place/Location'),
     'visible_to_self' => 1,
     'changeable' => 1,
 ]);
@@ -70,7 +70,7 @@ $allowVisitors = new ExtraField('session');
 $allowVisitors->save([
     'field_type' => ExtraField::FIELD_TYPE_CHECKBOX,
     'variable' => 'allow_visitors',
-    'display_text' => get_lang('AllowVisitors'),
+    'display_text' => get_lang('Allow visitors'),
     'visible_to_self' => 1,
     'changeable' => 1,
 ]);
@@ -95,7 +95,7 @@ $isInductionSession = new ExtraField('session');
 $isInductionSession->save([
     'field_type' => ExtraField::FIELD_TYPE_CHECKBOX,
     'variable' => 'is_induction_session',
-    'display_text' => get_lang('IsInductionSession'),
+    'display_text' => get_lang('Induction-type session'),
     'visible_to_self' => 1,
     'changeable' => 1,
 ]);
@@ -104,7 +104,7 @@ $isOpenSession = new ExtraField('session');
 $isOpenSession->save([
     'field_type' => ExtraField::FIELD_TYPE_CHECKBOX,
     'variable' => 'is_open_session',
-    'display_text' => get_lang('IsOpenSession'),
+    'display_text' => get_lang('Open session'),
     'visible_to_self' => 1,
     'changeable' => 1,
 ]);
@@ -113,14 +113,14 @@ $duration = new ExtraField('session');
 $duration->save([
     'field_type' => ExtraField::FIELD_TYPE_TEXT,
     'variable' => 'human_text_duration',
-    'display_text' => get_lang('DurationInWords'),
+    'display_text' => get_lang('Duration in words'),
     'visible_to_self' => 1,
     'changeable' => 1,
 ]);
 
 $showStatusOptions = [
     get_lang('Open'),
-    get_lang('InProcess'),
+    get_lang('In process'),
     get_lang('Closed'),
 ];
 
@@ -128,7 +128,7 @@ $showStatus = new ExtraField('session');
 $showStatus->save([
     'field_type' => ExtraField::FIELD_TYPE_SELECT,
     'variable' => 'show_status',
-    'display_text' => get_lang('ShowStatus'),
+    'display_text' => get_lang('Show status'),
     'visible_to_self' => 1,
     'changeable' => 1,
     'field_options' => implode('; ', $showStatusOptions),
@@ -138,7 +138,7 @@ $publicationStartDate = new ExtraField('session');
 $publicationStartDate->save([
     'field_type' => ExtraField::FIELD_TYPE_DATE,
     'variable' => 'publication_start_date',
-    'display_text' => get_lang('PublicationStartDate'),
+    'display_text' => get_lang('Published start date'),
     'visible_to_self' => 1,
     'changeable' => 1,
 ]);
@@ -147,7 +147,7 @@ $publicationEndDate = new ExtraField('session');
 $publicationEndDate->save([
     'field_type' => ExtraField::FIELD_TYPE_DATE,
     'variable' => 'publication_end_date',
-    'display_text' => get_lang('PublicationEndDate'),
+    'display_text' => get_lang('Published end date'),
     'visible_to_self' => 1,
     'changeable' => 1,
 ]);
@@ -156,7 +156,7 @@ $banner = new ExtraField('session');
 $banner->save([
     'field_type' => ExtraField::FIELD_TYPE_FILE_IMAGE,
     'variable' => 'banner',
-    'display_text' => get_lang('SessionBanner'),
+    'display_text' => get_lang('Session banner'),
     'visible_to_self' => 1,
     'changeable' => 1,
 ]);
@@ -179,7 +179,7 @@ $target = new ExtraField('session');
 $target->save([
     'field_type' => ExtraField::FIELD_TYPE_SELECT,
     'variable' => 'target',
-    'display_text' => get_lang('TargetAudience'),
+    'display_text' => get_lang('Target audience'),
     'visible_to_self' => 1,
     'changeable' => 1,
     'field_options' => implode('; ', $targetOptions),
@@ -189,7 +189,7 @@ $shortDescription = new ExtraField('session');
 $shortDescription->save([
     'field_type' => ExtraField::FIELD_TYPE_TEXT,
     'variable' => 'short_description',
-    'display_text' => get_lang('ShortDescription'),
+    'display_text' => get_lang('Short description'),
     'visible_to_self' => 1,
     'changeable' => 1,
 ]);
@@ -198,7 +198,7 @@ $id = new ExtraField('session');
 $id->save([
     'field_type' => ExtraField::FIELD_TYPE_TEXT,
     'variable' => 'code',
-    'display_text' => get_lang('Code'),
+    'display_text' => get_lang('Course code'),
     'visible_to_self' => 1,
     'changeable' => 1,
 ]);

+ 6 - 6
plugin/bbb/admin.php

@@ -33,8 +33,8 @@ $dateRange = [
 ];
 
 $form = new FormValidator(get_lang('Search'));
-$form->addDatePicker('search_meeting_start', get_lang('DateStart'));
-$form->addDatePicker('search_meeting_end', get_lang('DateEnd'));
+$form->addDatePicker('search_meeting_start', get_lang('Start date'));
+$form->addDatePicker('search_meeting_end', get_lang('End date'));
 $form->addButtonSearch(get_lang('Search'));
 $form->setDefaults($dateRange);
 
@@ -45,7 +45,7 @@ if ($form->validate()) {
 $meetings = $bbb->getMeetings(0, 0, 0, true, $dateRange);
 
 foreach ($meetings as &$meeting) {
-    $participants = $bbb->findConnectedMeetingParticipants($meeting['id']);
+    $participants = $bbb->findConnectedMeetingMembers($meeting['id']);
 
     foreach ($participants as $meetingParticipant) {
         /** @var User $participant */
@@ -61,12 +61,12 @@ if ($action) {
                 [$tool_name, $plugin->get_lang('RecordList')],
                 [],
                 [
-                    get_lang('CreatedAt'),
+                    get_lang('Created at'),
                     get_lang('Status'),
                     $plugin->get_lang('Records'),
                     get_lang('Course'),
                     get_lang('Session'),
-                    get_lang('Participants'),
+                    get_lang('Members'),
                 ],
             ];
 
@@ -109,7 +109,7 @@ $content = $tpl->fetch('bbb/view/admin.tpl');
 
 if ($meetings) {
     $actions = Display::toolbarButton(
-        get_lang('ExportInExcel'),
+        get_lang('Export in Excel format'),
         api_get_self().'?'.http_build_query([
             'action' => 'export',
             'search_meeting_start' => $dateStart,

+ 1 - 1
plugin/bbb/ajax.php

@@ -35,7 +35,7 @@ switch ($action) {
 
             $url = $meetingInfo['video_url'].'/capture.m4v';
             $link = Display::url(
-                Display::return_icon('save.png', get_lang('DownloadFile')),
+                Display::return_icon('save.png', get_lang('Download file')),
                 $meetingInfo['video_url'].'/capture.m4v',
                 ['target' => '_blank']
             );

+ 8 - 8
plugin/bbb/lib/bbb.lib.php

@@ -1617,11 +1617,11 @@ class bbb
         $isVisible = $meetingInfo['visibility'] != 0;
         $linkVisibility = $isVisible
             ? Display::url(
-                Display::return_icon('visible.png', get_lang('MakeInvisible')),
+                Display::return_icon('visible.png', get_lang('Make invisible')),
                 $this->unPublishUrl($meetingInfo)
             )
             : Display::url(
-                Display::return_icon('invisible.png', get_lang('MakeVisible')),
+                Display::return_icon('invisible.png', get_lang('Make Visible')),
                 $this->publishUrl($meetingInfo)
             );
 
@@ -1653,7 +1653,7 @@ class bbb
                 return $links;
             } else {
                 $links[] = Display::url(
-                    Display::return_icon('course_home.png', get_lang('GoToCourse')),
+                    Display::return_icon('course_home.png', get_lang('Go to the course')),
                     $this->getListingUrl()
                 );
 
@@ -1667,7 +1667,7 @@ class bbb
                 $this->copyToRecordToLinkTool($meetingInfo)
             );
             $links[] = Display::url(
-                Display::return_icon('agenda.png', get_lang('AddToCalendar')),
+                Display::return_icon('agenda.png', get_lang('Add to calendar')),
                 $this->addToCalendarUrl($meetingInfo, $recordInfo)
             );
         }
@@ -1677,13 +1677,13 @@ class bbb
         if ($hide == false) {
             if ($meetingInfo['has_video_m4v']) {
                 $links[] = Display::url(
-                    Display::return_icon('save.png', get_lang('DownloadFile')),
+                    Display::return_icon('save.png', get_lang('Download file')),
                     $recordInfo['playbackFormatUrl'].'/capture.m4v',
                     ['target' => '_blank']
                 );
             } else {
                 $links[] = Display::url(
-                    Display::return_icon('save.png', get_lang('DownloadFile')),
+                    Display::return_icon('save.png', get_lang('Download file')),
                     '#',
                     [
                         'id' => "btn-check-meeting-video-{$meetingInfo['id']}",
@@ -1703,7 +1703,7 @@ class bbb
             $links[] = $linkVisibility;
         } else {
             $links[] = Display::url(
-                Display::return_icon('course_home.png', get_lang('GoToCourse')),
+                Display::return_icon('course_home.png', get_lang('Go to the course')),
                 $this->getListingUrl()
             );
         }
@@ -1771,7 +1771,7 @@ class bbb
         $setting = api_get_plugin_setting('bbb', 'enable_global_conference');
         $settingLink = api_get_plugin_setting('bbb', 'enable_global_conference_link');
         if ($setting === 'true' && $settingLink === 'true') {
-            //$content = Display::url(get_lang('LaunchVideoConferenceRoom'), $url);
+            //$content = Display::url(get_lang('Launch videoconference room'), $url);
             $allowedRoles = api_get_plugin_setting(
                 'bbb',
                 'global_conference_allow_roles'

+ 5 - 5
plugin/bbb/lib/bbb_plugin.class.php

@@ -62,9 +62,9 @@ class BBBPlugin extends Plugin
                     'type' => 'select',
                     'options' => [
                         PLATFORM_ADMIN => get_lang('Administrator'),
-                        COURSEMANAGER => get_lang('Teacher'),
-                        STUDENT => get_lang('Student'),
-                        STUDENT_BOSS => get_lang('StudentBoss')
+                        COURSEMANAGER => get_lang('Trainer'),
+                        STUDENT => get_lang('Learner'),
+                        STUDENT_BOSS => get_lang('LearnerBoss')
                     ],
                     'attributes' => ['multiple' => 'multiple']
                 ],
@@ -79,8 +79,8 @@ class BBBPlugin extends Plugin
                     'type' => 'select',
                     'options' => [
                         self::LAUNCH_TYPE_DEFAULT => 'SetByDefault',
-                        self::LAUNCH_TYPE_SET_BY_TEACHER => 'SetByTeacher',
-                        self::LAUNCH_TYPE_SET_BY_STUDENT => 'SetByStudent',
+                        self::LAUNCH_TYPE_SET_BY_TEACHER => 'SetByTrainer',
+                        self::LAUNCH_TYPE_SET_BY_STUDENT => 'SetByLearner',
                     ],
                     'translate_options' => true, // variables will be translated using the plugin->get_lang
                 ],

+ 3 - 3
plugin/bbb/listing.php

@@ -119,13 +119,13 @@ if ($conferenceManager) {
             break;
         case 'publish':
             $bbb->publishMeeting($_GET['id']);
-            Display::addFlash(Display::return_message(get_lang('Updated')));
+            Display::addFlash(Display::return_message(get_lang('Update successful')));
             header('Location: '.$bbb->getListingUrl());
             exit;
             break;
         case 'unpublish':
             $bbb->unpublishMeeting($_GET['id']);
-            Display::addFlash(Display::return_message(get_lang('Updated')));
+            Display::addFlash(Display::return_message(get_lang('Update successful')));
             header('Location: '.$bbb->getListingUrl());
             exit;
             break;
@@ -208,7 +208,7 @@ if ($bbb->isGlobalConference() === false &&
         foreach ($groups as &$groupData) {
             $itemGroupId = $groupData['id'];
             if (isset($meetingsGroup[$itemGroupId]) && $meetingsGroup[$itemGroupId] == 1) {
-                $groupData['name'] .= ' ('.get_lang('Active').')';
+                $groupData['name'] .= ' ('.get_lang('active').')';
             }
         }
 

+ 1 - 1
plugin/before_login/index.php

@@ -59,7 +59,7 @@ if (api_is_anonymous()) {
 
         $form2->addElement('html', $option2);
         $form2->addElement('checkbox', 'right', null, get_lang('Yes'));
-        $form2->addElement('button', 'submit', get_lang('Send'));
+        $form2->addElement('button', 'submit', get_lang('Send message'));
         $formHtml2 = $form2->returnForm();
 
         if ($form2->validate()) {

+ 1 - 1
plugin/buycourses/database.php

@@ -715,6 +715,6 @@ $field_id = UserManager::create_extra_field($fieldlabel, $fieldtype, $fieldtitle
 
 $fieldlabel = 'buycourses_address';
 $fieldtype = '1';
-$fieldtitle = BuyCoursesPlugin::get_lang('Address');
+$fieldtitle = BuyCoursesPlugin::get_lang('The address of');
 $fielddefault = '';
 $field_id = UserManager::create_extra_field($fieldlabel, $fieldtype, $fieldtitle, $fielddefault);

+ 3 - 3
plugin/buycourses/src/buy_course_plugin.class.php

@@ -273,7 +273,7 @@ class BuyCoursesPlugin extends Plugin
 
         Display::addFlash(
             Display::return_message(
-                $this->get_lang('Updated'),
+                $this->get_lang('Update successful'),
                 'info',
                 false
             )
@@ -293,7 +293,7 @@ class BuyCoursesPlugin extends Plugin
 
         $fieldlabel = 'buycourses_address';
         $fieldtype = '1';
-        $fieldtitle = $this->get_lang('Address');
+        $fieldtitle = $this->get_lang('The address of');
         $fielddefault = '';
         UserManager::create_extra_field($fieldlabel, $fieldtype, $fieldtitle, $fielddefault);
 
@@ -1330,7 +1330,7 @@ class BuyCoursesPlugin extends Plugin
             self::SERVICE_TYPE_USER => get_lang('User'),
             self::SERVICE_TYPE_COURSE => get_lang('Course'),
             self::SERVICE_TYPE_SESSION => get_lang('Session'),
-            self::SERVICE_TYPE_LP_FINAL_ITEM => get_lang('TemplateTitleCertificate'),
+            self::SERVICE_TYPE_LP_FINAL_ITEM => get_lang('Certificate of completion'),
         ];
     }
 

+ 12 - 12
plugin/buycourses/src/buycourses.ajax.php

@@ -307,8 +307,8 @@ switch ($action) {
                 "descripcion" => $sale['product_name'],
                 "pedido" => $sale['reference'],
                 "codigo_pais" => "PE",
-                "direccion" => get_lang('None'),
-                "ciudad" => get_lang('None'),
+                "direccion" => get_lang('none'),
+                "ciudad" => get_lang('none'),
                 "telefono" => 0,
                 "nombres" => $user['firstname'],
                 "apellidos" => $user['lastname'],
@@ -334,7 +334,7 @@ switch ($action) {
             if (is_array($cargo)) {
                 Display::addFlash(
                     Display::return_message(
-                        sprintf($plugin->get_lang('ErrorOccurred'), $cargo['codigo'], $cargo['mensaje']),
+                        sprintf($plugin->get_lang('An error occurred.'), $cargo['codigo'], $cargo['mensaje']),
                         'error',
                         false
                     )
@@ -342,7 +342,7 @@ switch ($action) {
             } else {
                 Display::addFlash(
                     Display::return_message(
-                        $plugin->get_lang('ErrorContactPlatformAdmin'),
+                        $plugin->get_lang('There happened an unknown error. Please contact the platform administrator.'),
                         'error',
                         false
                     )
@@ -393,8 +393,8 @@ switch ($action) {
                 "descripcion" => $serviceSale['service']['name'],
                 "pedido" => $serviceSale['reference'],
                 "codigo_pais" => "PE",
-                "direccion" => get_lang('None'),
-                "ciudad" => get_lang('None'),
+                "direccion" => get_lang('none'),
+                "ciudad" => get_lang('none'),
                 "telefono" => 0,
                 "nombres" => $user['firstname'],
                 "apellidos" => $user['lastname'],
@@ -427,7 +427,7 @@ switch ($action) {
             if (is_array($cargo)) {
                 Display::addFlash(
                     Display::return_message(
-                        sprintf($plugin->get_lang('ErrorOccurred'), $cargo['codigo'], $cargo['mensaje']),
+                        sprintf($plugin->get_lang('An error occurred.'), $cargo['codigo'], $cargo['mensaje']),
                         'error',
                         false
                     )
@@ -435,7 +435,7 @@ switch ($action) {
             } else {
                 Display::addFlash(
                     Display::return_message(
-                        $plugin->get_lang('ErrorContactPlatformAdmin'),
+                        $plugin->get_lang('There happened an unknown error. Please contact the platform administrator.'),
                         'error',
                         false
                     )
@@ -480,7 +480,7 @@ switch ($action) {
                     $nodeName = $session ? $session->getName() : null;
                 } else {
                     if ($nodeType == BuyCoursesPlugin::SERVICE_TYPE_LP_FINAL_ITEM) {
-                        $nodeType = get_lang('TemplateTitleCertificate');
+                        $nodeType = get_lang('Certificate of completion');
                         /** @var CLp $lp */
                         $lp = $em->find('ChamiloCourseBundle:CLp', $serviceSale['node_id']);
                         $nodeName = $lp ? $lp->getName() : null;
@@ -513,7 +513,7 @@ switch ($action) {
         $status = $serviceSale['status'];
         $buttons = '';
         if ($status == BuyCoursesPlugin::SERVICE_STATUS_COMPLETED) {
-            $status = $plugin->get_lang('Active');
+            $status = $plugin->get_lang('active');
         } else {
             if ($status == BuyCoursesPlugin::SERVICE_STATUS_PENDING) {
                 $status = $plugin->get_lang('Pending');
@@ -573,7 +573,7 @@ switch ($action) {
                 'success'
             );
         } else {
-            $html .= Display::return_message('Error - '.$plugin->get_lang('ErrorContactPlatformAdmin'), 'error');
+            $html .= Display::return_message('Error - '.$plugin->get_lang('There happened an unknown error. Please contact the platform administrator.'), 'error');
         }
 
         $html .= "<a id='finish-button' class='btn btn-primary'>".$plugin->get_lang('ClickHereToFinish')."</a>";
@@ -597,7 +597,7 @@ switch ($action) {
                 'warning'
             );
         } else {
-            $html .= Display::return_message('Error - '.$plugin->get_lang('ErrorContactPlatformAdmin'), 'error');
+            $html .= Display::return_message('Error - '.$plugin->get_lang('There happened an unknown error. Please contact the platform administrator.'), 'error');
         }
 
         $html .= "<a id='finish-button' class='btn btn-primary'>".$plugin->get_lang('ClickHereToFinish')."</a>";

+ 3 - 3
plugin/buycourses/src/configure_course.php

@@ -221,11 +221,11 @@ $beneficiariesSelect = $form->addSelect(
 
 if ($editingCourse) {
     $teachersOptions = api_unique_multidim_array($teachersOptions, 'value');
-    $beneficiariesSelect->addOptGroup($teachersOptions, get_lang('Teachers'));
+    $beneficiariesSelect->addOptGroup($teachersOptions, get_lang('Trainers'));
 } elseif ($editingSession) {
     $courseCoachesOptions = api_unique_multidim_array($courseCoachesOptions, 'value');
-    $beneficiariesSelect->addOptGroup([$generalCoachOption], get_lang('SessionGeneralCoach'));
-    $beneficiariesSelect->addOptGroup($courseCoachesOptions, get_lang('SessionCourseCoach'));
+    $beneficiariesSelect->addOptGroup([$generalCoachOption], get_lang('Session general coach'));
+    $beneficiariesSelect->addOptGroup($courseCoachesOptions, get_lang('Session course coach'));
 }
 
 if ($commissionsEnable === 'true') {

+ 2 - 2
plugin/buycourses/src/course_catalog.php

@@ -35,7 +35,7 @@ if ($form->validate()) {
 }
 
 $form->addHeader($plugin->get_lang('SearchFilter'));
-$form->addText('name', get_lang('CourseName'), false);
+$form->addText('name', get_lang('Course name'), false);
 $form->addElement(
     'number',
     'min',
@@ -74,7 +74,7 @@ if (api_is_platform_admin()) {
 } else {
     $interbreadcrumb[] = [
         'url' => 'course_panel.php',
-        'name' => get_lang('TabsDashboard'),
+        'name' => get_lang('Dashboard'),
     ];
 }
 

+ 1 - 1
plugin/buycourses/src/course_panel.php

@@ -47,7 +47,7 @@ $toolbar = Display::toolbarButton(
     ['title' => $plugin->get_lang('CourseListOnSale')]
 );
 
-$templateName = get_lang('TabsDashboard');
+$templateName = get_lang('Dashboard');
 $tpl = new Template($templateName);
 $tpl->assign('showing_courses', true);
 $tpl->assign('sessions_are_included', $includeSessions);

+ 1 - 1
plugin/buycourses/src/list.php

@@ -20,7 +20,7 @@ api_protect_admin_script(true);
 
 Display::addFlash(
     Display::return_message(
-        get_lang('Info').' - '.$plugin->get_lang('CoursesInSessionsDoesntDisplayHere'),
+        get_lang('Information').' - '.$plugin->get_lang('CoursesInSessionsDoesntDisplayHere'),
         'info'
     )
 );

+ 1 - 1
plugin/buycourses/src/list_service.php

@@ -22,7 +22,7 @@ api_protect_admin_script(true);
 
 Display::addFlash(
     Display::return_message(
-        get_lang('Info').' - '.$plugin->get_lang('CoursesInSessionsDoesntDisplayHere'),
+        get_lang('Information').' - '.$plugin->get_lang('CoursesInSessionsDoesntDisplayHere'),
         'info'
     )
 );

+ 1 - 1
plugin/buycourses/src/list_session.php

@@ -24,7 +24,7 @@ api_protect_admin_script(true);
 
 Display::addFlash(
     Display::return_message(
-        get_lang('Info').' - '.$plugin->get_lang('CoursesInSessionsDoesntDisplayHere'),
+        get_lang('Information').' - '.$plugin->get_lang('CoursesInSessionsDoesntDisplayHere'),
         'info'
     )
 );

+ 8 - 8
plugin/buycourses/src/paymentsetup.php

@@ -24,7 +24,7 @@ if (isset($_GET['action'], $_GET['id'])) {
         $plugin->deleteTransferAccount($_GET['id']);
 
         Display::addFlash(
-            Display::return_message(get_lang('ItemRemoved'), 'success')
+            Display::return_message(get_lang('The learning object has been removed'), 'success')
         );
 
         header('Location: '.api_get_self());
@@ -42,7 +42,7 @@ if ($globalSettingForm->validate()) {
     $plugin->saveGlobalParameters($globalSettingFormValues);
 
     Display::addFlash(
-        Display::return_message(get_lang('Saved'), 'success')
+        Display::return_message(get_lang('Saved.....'), 'success')
     );
 
     header('Location:'.api_get_self());
@@ -79,8 +79,8 @@ foreach ($currencies as $currency) {
 $globalSettingForm->addTextarea(
     'terms_and_conditions',
     [
-        get_lang('TermsAndConditions'),
-        $plugin->get_lang('WriteHereTheTermsAndConditionsOfYourECommerce'),
+        get_lang('Terms and Conditions'),
+        $plugin->get_lang('WriteHereTheTerms and ConditionsOfYourECommerce'),
     ]
 );
 
@@ -180,7 +180,7 @@ if ($paypalForm->validate()) {
     $plugin->savePaypalParams($paypalFormValues);
 
     Display::addFlash(
-        Display::return_message(get_lang('Saved'), 'success')
+        Display::return_message(get_lang('Saved.....'), 'success')
     );
 
     header('Location:'.api_get_self());
@@ -219,7 +219,7 @@ if ($commissionForm->validate()) {
     $plugin->updateCommission($commissionFormValues);
 
     Display::addFlash(
-        Display::return_message(get_lang('Saved'), 'success')
+        Display::return_message(get_lang('Saved.....'), 'success')
     );
 
     header('Location:'.api_get_self());
@@ -244,7 +244,7 @@ if ($transferForm->validate()) {
     $plugin->saveTransferAccount($transferFormValues);
 
     Display::addFlash(
-        Display::return_message(get_lang('Saved'), 'success')
+        Display::return_message(get_lang('Saved.....'), 'success')
     );
 
     header('Location:'.api_get_self());
@@ -283,7 +283,7 @@ if ($culqiForm->validate()) {
     $plugin->saveCulqiParameters($culqiFormValues);
 
     Display::addFlash(
-        Display::return_message(get_lang('Saved'), 'success')
+        Display::return_message(get_lang('Saved.....'), 'success')
     );
 
     header('Location:'.api_get_self());

+ 1 - 1
plugin/buycourses/src/payout_panel.php

@@ -45,7 +45,7 @@ $toolbar = Display::toolbarButton(
     ['title' => $plugin->get_lang('CourseListOnSale')]
 );
 
-$templateName = get_lang('TabsDashboard');
+$templateName = get_lang('Dashboard');
 $tpl = new Template($templateName);
 $tpl->assign('showing_courses', true);
 $tpl->assign('sessions_are_included', $includeSessions);

+ 1 - 1
plugin/buycourses/src/process_confirm.php

@@ -54,7 +54,7 @@ switch ($sale['payment_type']) {
 
         if ($expressCheckout["ACK"] !== 'Success') {
             $erroMessage = vsprintf(
-                $plugin->get_lang('ErrorOccurred'),
+                $plugin->get_lang('An error occurred.'),
                 [$expressCheckout['L_ERRORCODE0'], $expressCheckout['L_LONGMESSAGE0']]
             );
             Display::addFlash(

+ 1 - 1
plugin/buycourses/src/sales_report.php

@@ -96,7 +96,7 @@ $form->addHtml('<div id="report-by-status" '.($selectedFilterType !== '0' ? 'sty
 $form->addSelect('status', $plugin->get_lang('OrderStatus'), $saleStatuses);
 $form->addHtml('</div>');
 $form->addHtml('<div id="report-by-user" '.($selectedFilterType !== '1' ? 'style="display:none"' : '').'>');
-$form->addText('user', get_lang('UserName'), false);
+$form->addText('user', get_lang('Username'), false);
 $form->addHtml('</div>');
 $form->addButtonFilter(get_lang('Search'));
 $form->setDefaults([

+ 2 - 2
plugin/buycourses/src/service_catalog.php

@@ -50,11 +50,11 @@ $form->addElement(
 );
 $appliesToOptions = [
     '' => get_lang('Any'),
-    0 => get_lang('None'),
+    0 => get_lang('none'),
     1 => get_lang('User'),
     2 => get_lang('Course'),
     3 => get_lang('Session'),
-    4 => get_lang('TemplateTitleCertificate'),
+    4 => get_lang('Certificate of completion'),
 ];
 $form->addSelect('applies_to', $plugin->get_lang('AppliesTo'), $appliesToOptions);
 $form->addHtml('<hr>');

+ 1 - 1
plugin/buycourses/src/service_error.php

@@ -27,7 +27,7 @@ if (isset($_SESSION['bc_service_sale_id'])) {
 }
 
 Display::addFlash(
-    Display::return_message($plugin->get_lang('ErrorOccurred'), 'error', false)
+    Display::return_message($plugin->get_lang('An error occurred.'), 'error', false)
 );
 
 header('Location: '.api_get_path(WEB_PLUGIN_PATH).'buycourses/src/service_catalog.php');

+ 1 - 1
plugin/buycourses/src/service_panel.php

@@ -48,7 +48,7 @@ $toolbar = Display::toolbarButton(
     ['title' => $plugin->get_lang('CourseListOnSale')]
 );
 
-$templateName = $plugin->get_lang('TabsDashboard');
+$templateName = $plugin->get_lang('Dashboard');
 $tpl = new Template($templateName);
 $tpl->assign('showing_courses', true);
 $tpl->assign('services_are_included', $includeServices);

+ 4 - 4
plugin/buycourses/src/service_process.php

@@ -84,7 +84,7 @@ if ($typeUser || $typeCourse || $typeSession || $typeFinalLp) {
 }
 
 $selectOptions = [
-    0 => get_lang('None'),
+    0 => get_lang('none'),
 ];
 
 if ($typeUser) {
@@ -92,7 +92,7 @@ if ($typeUser) {
     $selectOptions[$userInfo['user_id']] = api_get_person_name(
         $userInfo['firstname'],
         $userInfo['lastname']
-    ).' ('.get_lang('Myself').')';
+    ).' ('.get_lang('myself').')';
 
     if (!empty($users)) {
         /** @var User $user */
@@ -199,12 +199,12 @@ if ($typeUser) {
     if (!$checker) {
         $form->addHtml(
             Display::return_message(
-                $plugin->get_lang('YourCoursesNeedAtLeastOneLearningPath'),
+                $plugin->get_lang('YourCoursesNeedAtLeastOneLearning paths'),
                 'error'
             )
         );
     }
-    $form->addSelect('info_select', get_lang('LearningPath'), $selectOptions);
+    $form->addSelect('info_select', get_lang('Learning paths'), $selectOptions);
 }
 
 $form->addHidden('t', intval($_GET['t']));

+ 1 - 1
plugin/buycourses/src/service_process_confirm.php

@@ -64,7 +64,7 @@ switch ($serviceSale['payment_type']) {
 
         if ($expressCheckout['ACK'] !== 'Success') {
             $erroMessage = vsprintf(
-                $plugin->get_lang('ErrorOccurred'),
+                $plugin->get_lang('An error occurred.'),
                 [$expressCheckout['L_ERRORCODE0'], $expressCheckout['L_LONGMESSAGE0']]
             );
             Display::addFlash(

+ 3 - 3
plugin/buycourses/src/service_success.php

@@ -68,7 +68,7 @@ if ($form->validate()) {
     $confirmPayments = ConfirmPayment($itemPrice);
     if ($confirmPayments['ACK'] !== 'Success') {
         $erroMessage = vsprintf(
-            $plugin->get_lang('ErrorOccurred'),
+            $plugin->get_lang('An error occurred.'),
             [$expressCheckout['L_ERRORCODE0'], $confirmPayments['L_LONGMESSAGE0']]
         );
         Display::addFlash(
@@ -95,7 +95,7 @@ if ($form->validate()) {
             }
 
             Display::addFlash(
-                Display::return_message($plugin->get_lang('ErrorContactPlatformAdmin'), 'error')
+                Display::return_message($plugin->get_lang('There happened an unknown error. Please contact the platform administrator.'), 'error')
             );
             break;
         case 'Pending':
@@ -151,7 +151,7 @@ if ($form->validate()) {
             $plugin->cancelServiceSale(intval($serviceSale['id']));
 
             Display::addFlash(
-                Display::return_message($plugin->get_lang('ErrorContactPlatformAdmin'), 'error')
+                Display::return_message($plugin->get_lang('There happened an unknown error. Please contact the platform administrator.'), 'error')
             );
             break;
     }

+ 4 - 4
plugin/buycourses/src/services_add.php

@@ -60,14 +60,14 @@ $form->addElement(
 $form->addElement(
     'number',
     'duration_days',
-    [$plugin->get_lang('Duration'), null, get_lang('Days')],
+    [$plugin->get_lang('Duration'), null, get_lang('days')],
     ['step' => 1]
 );
 $form->addElement(
     'radio',
     'applies_to',
     $plugin->get_lang('AppliesTo'),
-    get_lang('None'),
+    get_lang('none'),
     0
 );
 $form->addElement(
@@ -95,7 +95,7 @@ $form->addElement(
     'radio',
     'applies_to',
     null,
-    get_lang('TemplateTitleCertificate'),
+    get_lang('Certificate of completion'),
     4
 );
 $form->addSelect(
@@ -111,7 +111,7 @@ $form->addFile(
     )),
     ['id' => 'picture', 'class' => 'picture-form', 'crop_image' => true, 'crop_ratio' => '16 / 9']
 );
-$form->addText('video_url', get_lang('VideoUrl'), false);
+$form->addText('video_url', get_lang('Video URL'), false);
 $form->addHtmlEditor('service_information', $plugin->get_lang('ServiceInformation'), false);
 $form->addButtonSave(get_lang('Add'));
 $form->setDefaults($formDefaultValues);

+ 5 - 5
plugin/buycourses/src/services_edit.php

@@ -74,14 +74,14 @@ $form->addElement(
 $form->addElement(
     'number',
     'duration_days',
-    [$plugin->get_lang('Duration'), null, get_lang('Days')],
+    [$plugin->get_lang('Duration'), null, get_lang('days')],
     ['step' => 1]
 );
 $form->addElement(
     'radio',
     'applies_to',
     $plugin->get_lang('AppliesTo'),
-    get_lang('None'),
+    get_lang('none'),
     0
 );
 $form->addElement(
@@ -109,7 +109,7 @@ $form->addElement(
     'radio',
     'applies_to',
     null,
-    get_lang('TemplateTitleCertificate'),
+    get_lang('Certificate of completion'),
     4
 );
 $form->addSelect(
@@ -120,10 +120,10 @@ $form->addSelect(
 $form->addCheckBox('visibility', $plugin->get_lang('VisibleInCatalog'));
 $form->addFile(
     'picture',
-    $formDefaultValues['image'] != '' ? get_lang('UpdateImage') : get_lang('AddImage'),
+    $formDefaultValues['image'] != '' ? get_lang('Update Image') : get_lang('Add image'),
     ['id' => 'picture', 'class' => 'picture-form', 'crop_image' => true, 'crop_ratio' => '16 / 9']
 );
-$form->addText('video_url', get_lang('VideoUrl'), false);
+$form->addText('video_url', get_lang('Video URL'), false);
 $form->addHtmlEditor('service_information', $plugin->get_lang('ServiceInformation'), false);
 $form->addHidden('id', $serviceId);
 $form->addButtonSave(get_lang('Edit'));

+ 1 - 1
plugin/buycourses/src/session_catalog.php

@@ -39,7 +39,7 @@ if ($form->validate()) {
 }
 
 $form->addHeader($plugin->get_lang('SearchFilter'));
-$form->addText('name', get_lang('SessionName'), false);
+$form->addText('name', get_lang('Session name'), false);
 $form->addElement(
     'number',
     'min',

+ 1 - 1
plugin/buycourses/src/session_panel.php

@@ -47,7 +47,7 @@ $toolbar = Display::toolbarButton(
     ['title' => $plugin->get_lang('CourseListOnSale')]
 );
 
-$templateName = get_lang('TabsDashboard');
+$templateName = get_lang('Dashboard');
 $tpl = new Template($templateName);
 $tpl->assign('showing_courses', true);
 $tpl->assign('sessions_are_included', $includeSessions);

+ 4 - 4
plugin/buycourses/src/success.php

@@ -67,7 +67,7 @@ if ($form->validate()) {
 
     if ($confirmPayments['ACK'] !== 'Success') {
         $erroMessage = vsprintf(
-            $plugin->get_lang('ErrorOccurred'),
+            $plugin->get_lang('An error occurred.'),
             [$expressCheckout['L_ERRORCODE0'], $confirmPayments['L_LONGMESSAGE0']]
         );
         Display::addFlash(
@@ -92,7 +92,7 @@ if ($form->validate()) {
             }
 
             Display::addFlash(
-                Display::return_message($plugin->get_lang('ErrorContactPlatformAdmin'), 'error')
+                Display::return_message($plugin->get_lang('There happened an unknown error. Please contact the platform administrator.'), 'error')
             );
             break;
         case 'Pending':
@@ -146,7 +146,7 @@ if ($form->validate()) {
             break;
         default:
             Display::addFlash(
-                Display::return_message($plugin->get_lang('ErrorContactPlatformAdmin'), 'error')
+                Display::return_message($plugin->get_lang('There happened an unknown error. Please contact the platform administrator.'), 'error')
             );
             break;
     }
@@ -166,7 +166,7 @@ $shippingDetails = GetShippingDetails($token);
 
 if ($shippingDetails['ACK'] !== 'Success') {
     $erroMessage = vsprintf(
-        $plugin->get_lang('ErrorOccurred'),
+        $plugin->get_lang('An error occurred.'),
         [$expressCheckout['L_ERRORCODE0'], $shippingDetails['L_LONGMESSAGE0']]
     );
     Display::addFlash(

+ 1 - 1
plugin/courselegal/start.php

@@ -57,7 +57,7 @@ if ($form->validate()) {
 }
 Display::display_header($legal->get_lang('CourseLegal'));
 $url = api_get_path(WEB_PLUGIN_PATH).'courselegal/user_list.php?'.api_get_cidreq();
-$link = Display::url(Display::return_icon('user.png', get_lang('UserList')), $url);
+$link = Display::url(Display::return_icon('user.png', get_lang('User list')), $url);
 echo '<div class="actions">'.$link.'</div>';
 $form->display();
 

+ 2 - 2
plugin/courselegal/user_list.php

@@ -43,7 +43,7 @@ $table = new HTML_Table(['class' => 'data_table']);
 $table->setHeaderContents(0, 0, get_lang('User'));
 $table->setHeaderContents(0, 1, $legal->get_lang('WebAgreement'));
 $table->setHeaderContents(0, 2, $legal->get_lang('MailAgreement'));
-$table->setHeaderContents(0, 3, $legal->get_lang('Actions'));
+$table->setHeaderContents(0, 3, $legal->get_lang('Detail'));
 $row = 1;
 
 $pluginPath = api_get_path(WEB_PLUGIN_PATH).'courselegal/';
@@ -74,7 +74,7 @@ if (!empty($userList)) {
 $url = $pluginPath.'start.php?'.api_get_cidreq();
 
 $interbreadcrumb[] = ["url" => $url, "name" => $legal->get_lang('CourseLegal')];
-Display::display_header($legal->get_lang('UserList'));
+Display::display_header($legal->get_lang('User list'));
 
 $table->display();
 

+ 23 - 23
plugin/customcertificate/src/index.php

@@ -204,7 +204,7 @@ if ($form->validate()) {
             }
         }
 
-        Display::addFlash(Display::return_message(get_lang('Saved')));
+        Display::addFlash(Display::return_message(get_lang('Saved.')));
 
         Security::clear_token();
         header('Location: '.api_get_self().$urlParams);
@@ -294,7 +294,7 @@ $strInfo .= '((start_date))<br />';
 $strInfo .= '((end_date))<br />';
 $strInfo .= '((date_expediction))';
 
-$createCertificate = get_lang('CreateCertificateWithTags');
+$createCertificate = get_lang('Create your certificate copy-pasting the following tags. They will be replaced in the document by their student-specific value:');
 $form->addElement(
     'html',
     Display::return_message($createCertificate.': <br />'.$strInfo, 'normal', false)
@@ -403,7 +403,7 @@ $option2 = &$form->createElement(
     'radio',
     'date_change',
     '',
-    get_lang('None'),
+    get_lang('none'),
     2,
     ['id' => 'date_change_2', 'onclick' => 'javascript: dateCertificateSwitchRadioButton2();']
 );
@@ -511,7 +511,7 @@ $option = &$form->createElement(
     'radio',
     'type_date_expediction',
     '',
-    get_lang('None'),
+    get_lang('none'),
     3,
     [
         'id' => 'type_date_expediction_3',
@@ -603,7 +603,7 @@ $form->addFile(
 );
 $form->addProgress();
 if (!empty($infoCertificate['logo_left'])) {
-    $form->addElement('checkbox', 'remove_logo_left', null, get_lang('DelImage'));
+    $form->addElement('checkbox', 'remove_logo_left', null, get_lang('Remove picture'));
     $form->addElement(
         'html',
         '<label class="col-sm-2">&nbsp;</label>
@@ -614,7 +614,7 @@ if (!empty($infoCertificate['logo_left'])) {
 $allowedPictureTypes = api_get_supported_image_extensions(false);
 $form->addRule(
     'logo_left',
-    get_lang('OnlyImagesAllowed').' ('.implode(', ', $allowedPictureTypes).')',
+    get_lang('Only PNG, JPG or GIF images allowed').' ('.implode(', ', $allowedPictureTypes).')',
     'filetype',
     $allowedPictureTypes
 );
@@ -633,7 +633,7 @@ $form->addFile(
 );
 $form->addProgress();
 if (!empty($infoCertificate['logo_center'])) {
-    $form->addElement('checkbox', 'remove_logo_center', null, get_lang('DelImage'));
+    $form->addElement('checkbox', 'remove_logo_center', null, get_lang('Remove picture'));
     $form->addElement(
         'html',
         '<label class="col-sm-2">&nbsp;</label>
@@ -644,7 +644,7 @@ if (!empty($infoCertificate['logo_center'])) {
 $allowedPictureTypes = api_get_supported_image_extensions(false);
 $form->addRule(
     'logo_center',
-    get_lang('OnlyImagesAllowed').' ('.implode(', ', $allowedPictureTypes).')',
+    get_lang('Only PNG, JPG or GIF images allowed').' ('.implode(', ', $allowedPictureTypes).')',
     'filetype',
     $allowedPictureTypes
 );
@@ -663,7 +663,7 @@ $form->addFile(
 );
 $form->addProgress();
 if (!empty($infoCertificate['logo_right'])) {
-    $form->addElement('checkbox', 'remove_logo_right', null, get_lang('DelImage'));
+    $form->addElement('checkbox', 'remove_logo_right', null, get_lang('Remove picture'));
     $form->addElement(
         'html',
         '<label class="col-sm-2">&nbsp;</label>
@@ -674,7 +674,7 @@ if (!empty($infoCertificate['logo_right'])) {
 $tblProperty = api_get_supported_image_extensions(false);
 $form->addRule(
     'logo_right',
-    get_lang('OnlyImagesAllowed').' ('.implode(', ', $allowedPictureTypes).')',
+    get_lang('Only PNG, JPG or GIF images allowed').' ('.implode(', ', $allowedPictureTypes).')',
     'filetype',
     $allowedPictureTypes
 );
@@ -692,7 +692,7 @@ $form->addFile(
 );
 $form->addProgress();
 if (!empty($infoCertificate['seal'])) {
-    $form->addElement('checkbox', 'remove_seal', null, get_lang('DelImage'));
+    $form->addElement('checkbox', 'remove_seal', null, get_lang('Remove picture'));
     $form->addElement(
         'html',
         '<label class="col-sm-2">&nbsp;</label>
@@ -703,7 +703,7 @@ if (!empty($infoCertificate['seal'])) {
 $allowedPictureTypes = api_get_supported_image_extensions(false);
 $form->addRule(
     'seal',
-    get_lang('OnlyImagesAllowed').' ('.implode(', ', $allowedPictureTypes).')',
+    get_lang('Only PNG, JPG or GIF images allowed').' ('.implode(', ', $allowedPictureTypes).')',
     'filetype',
     $allowedPictureTypes
 );
@@ -730,7 +730,7 @@ $form->addFile(
 );
 $form->addProgress();
 if (!empty($infoCertificate['signature1'])) {
-    $form->addElement('checkbox', 'remove_signature1', null, get_lang('DelImage'));
+    $form->addElement('checkbox', 'remove_signature1', null, get_lang('Remove picture'));
     $form->addElement(
         'html',
         '<label class="col-sm-2">&nbsp;</label>
@@ -741,7 +741,7 @@ if (!empty($infoCertificate['signature1'])) {
 $allowedPictureTypes = api_get_supported_image_extensions(false);
 $form->addRule(
     'signature1',
-    get_lang('OnlyImagesAllowed').' ('.implode(', ', $allowedPictureTypes).')',
+    get_lang('Only PNG, JPG or GIF images allowed').' ('.implode(', ', $allowedPictureTypes).')',
     'filetype',
     $allowedPictureTypes
 );
@@ -766,7 +766,7 @@ $form->addFile(
 );
 $form->addProgress();
 if (!empty($infoCertificate['signature2'])) {
-    $form->addElement('checkbox', 'remove_signature2', null, get_lang('DelImage'));
+    $form->addElement('checkbox', 'remove_signature2', null, get_lang('Remove picture'));
     $form->addElement(
         'html',
         '<label class="col-sm-2">&nbsp;</label>
@@ -777,7 +777,7 @@ if (!empty($infoCertificate['signature2'])) {
 $allowedPictureTypes = api_get_supported_image_extensions(false);
 $form->addRule(
     'signature2',
-    get_lang('OnlyImagesAllowed').' ('.implode(', ', $allowedPictureTypes).')',
+    get_lang('Only PNG, JPG or GIF images allowed').' ('.implode(', ', $allowedPictureTypes).')',
     'filetype',
     $allowedPictureTypes
 );
@@ -802,7 +802,7 @@ $form->addFile(
 );
 $form->addProgress();
 if (!empty($infoCertificate['signature3'])) {
-    $form->addElement('checkbox', 'remove_signature3', null, get_lang('DelImage'));
+    $form->addElement('checkbox', 'remove_signature3', null, get_lang('Remove picture'));
     $form->addElement(
         'html',
         '<label class="col-sm-2">&nbsp;</label>
@@ -813,7 +813,7 @@ if (!empty($infoCertificate['signature3'])) {
 $allowedPictureTypes = api_get_supported_image_extensions(false);
 $form->addRule(
     'signature3',
-    get_lang('OnlyImagesAllowed').' ('.implode(', ', $allowedPictureTypes).')',
+    get_lang('Only PNG, JPG or GIF images allowed').' ('.implode(', ', $allowedPictureTypes).')',
     'filetype',
     $allowedPictureTypes
 );
@@ -838,7 +838,7 @@ $form->addFile(
 );
 $form->addProgress();
 if (!empty($infoCertificate['signature4'])) {
-    $form->addElement('checkbox', 'remove_signature4', null, get_lang('DelImage'));
+    $form->addElement('checkbox', 'remove_signature4', null, get_lang('Remove picture'));
     $form->addElement(
         'html',
         '<label class="col-sm-2">&nbsp;</label>
@@ -849,7 +849,7 @@ if (!empty($infoCertificate['signature4'])) {
 $allowedPictureTypes = api_get_supported_image_extensions(false);
 $form->addRule(
     'signature4',
-    get_lang('OnlyImagesAllowed').' ('.implode(', ', $allowedPictureTypes).')',
+    get_lang('Only PNG, JPG or GIF images allowed').' ('.implode(', ', $allowedPictureTypes).')',
     'filetype',
     $allowedPictureTypes
 );
@@ -870,7 +870,7 @@ $form->addFile(
 );
 $form->addProgress();
 if (!empty($infoCertificate['background'])) {
-    $form->addElement('checkbox', 'remove_background', null, get_lang('DelImage'));
+    $form->addElement('checkbox', 'remove_background', null, get_lang('Remove picture'));
     $form->addElement(
         'html',
         '<label class="col-sm-2">&nbsp;</label>
@@ -881,7 +881,7 @@ if (!empty($infoCertificate['background'])) {
 $allowedPictureTypes = api_get_supported_image_extensions(false);
 $form->addRule(
     'background',
-    get_lang('OnlyImagesAllowed').' ('.implode(', ', $allowedPictureTypes).')',
+    get_lang('Only PNG, JPG or GIF images allowed').' ('.implode(', ', $allowedPictureTypes).')',
     'filetype',
     $allowedPictureTypes
 );
@@ -915,7 +915,7 @@ $form->addHtml('<div class="clearfix"></div>');
 
 $form->addButton(
     'submit',
-    get_lang('SaveCertificate'),
+    get_lang('Save certificate'),
     'check',
     'primary',
     null,

+ 2 - 2
plugin/customcertificate/src/print_certificate.php

@@ -362,7 +362,7 @@ foreach ($userList as $userInfo) {
             $categoriesTempList = learnpath::getCategories($courseId);
             $categoryTest = new CLpCategory();
             $categoryTest->setId(0);
-            $categoryTest->setName($plugin->get_lang('WithOutCategory'));
+            $categoryTest->setName($plugin->get_lang('Without category'));
             $categoryTest->setPosition(0);
             $categories = [$categoryTest];
 
@@ -404,7 +404,7 @@ foreach ($userList as $userInfo) {
                 }
 
                 if (count($categories) > 1 && count($flat_list) > 0) {
-                    if ($item->getName() != $plugin->get_lang('WithOutCategory')) {
+                    if ($item->getName() != $plugin->get_lang('Without category')) {
                         $items[] = '<h4 style="margin:0">'.$item->getName().'</h4>';
                     }
                 }

+ 8 - 8
plugin/dashboard/block_course/block_course.class.php

@@ -67,7 +67,7 @@ class BlockCourse extends Block
         $column = 2;
         $data = [];
         $html = $this->getBlockCard(
-            get_lang('YourCourseList'),
+            get_lang('Your courses'),
             $this->getContent()
         );
         $data['column'] = $column;
@@ -89,10 +89,10 @@ class BlockCourse extends Block
         if (!empty($course_data)) {
             $data_table .= '<table class="data_table" width:"95%">';
             $data_table .= '<tr>
-	    						<th>'.get_lang('CourseTitle').'</th>
-	    						<th width="20%">'.get_lang('NbStudents').'</th>
-	    						<th width="20%">'.get_lang('AvgTimeSpentInTheCourse').'</th>
-	    						<th width="20%">'.get_lang('ThematicAdvance').'</th>
+	    						<th>'.get_lang('Course title').'</th>
+	    						<th width="20%">'.get_lang('Learners').'</th>
+	    						<th width="20%">'.get_lang('Time').'</th>
+	    						<th width="20%">'.get_lang('Thematic advance').'</th>
 	    					</tr>';
             $i = 1;
             foreach ($course_data as $course) {
@@ -113,12 +113,12 @@ class BlockCourse extends Block
             }
             $data_table .= '</table>';
         } else {
-            $data_table .= get_lang('ThereIsNoInformationAboutYourCourses');
+            $data_table .= get_lang('There is no available information about your courses');
         }
         $content .= $data_table;
         if (!empty($course_data)) {
             $content .= '<div style="text-align:right;margin-top:10px;">
-            <a href="'.api_get_path(WEB_CODE_PATH).'mySpace/course.php?follow">'.get_lang('SeeMore').'</a></div>';
+            <a href="'.api_get_path(WEB_CODE_PATH).'mySpace/course.php?follow">'.get_lang('See more').'</a></div>';
         }
 
         return $content;
@@ -174,7 +174,7 @@ class BlockCourse extends Block
             );
 
             if (!empty($tematic_advance)) {
-                $tematic_advance_progress = '<a title="'.get_lang('GoToThematicAdvance').'" href="'.api_get_path(WEB_CODE_PATH).'course_progress/index.php?cidReq='.$course_code.'&action=thematic_details">'.$tematic_advance.'%</a>';
+                $tematic_advance_progress = '<a title="'.get_lang('GoToThematic advance').'" href="'.api_get_path(WEB_CODE_PATH).'course_progress/index.php?cidReq='.$course_code.'&action=thematic_details">'.$tematic_advance.'%</a>';
             } else {
                 $tematic_advance_progress = '0%';
             }

+ 13 - 13
plugin/dashboard/block_daily/block_daily.class.php

@@ -75,7 +75,7 @@ class BlockDaily extends Block
         $data = [];
 
         $html = $this->getBlockCard(
-            get_lang('GradebookAndAttendances'),
+            get_lang('Assessments and attendances'),
             $this->getContent()
         );
 
@@ -93,15 +93,15 @@ class BlockDaily extends Block
     public function getContent()
     {
         $course_data = $this->get_course_information_data();
-        $content = '<h4>'.get_lang('YourCourseList').'</h4>';
+        $content = '<h4>'.get_lang('Your courses').'</h4>';
         $data_table = null;
         if (!empty($course_data)) {
             $data_table .= '<table class="data_table" width:"95%">';
             $data_table .= '<tr>
-	    						<th>'.get_lang('CourseTitle').'</th>
-	    						<th width="20%">'.get_lang('NbStudents').'</th>
-	    						<th width="20%">'.get_lang('Evaluation').'</th>
-	    						<th width="20%">'.get_lang('ToolAttendance').'</th>
+	    						<th>'.get_lang('Course title').'</th>
+	    						<th width="20%">'.get_lang('Learners').'</th>
+	    						<th width="20%">'.get_lang('Score').'</th>
+	    						<th width="20%">'.get_lang('Attendances').'</th>
 	    					</tr>';
             $i = 1;
             foreach ($course_data as $course) {
@@ -112,7 +112,7 @@ class BlockDaily extends Block
                 }
                 $data_table .= '<tr class="'.$class_tr.'">';
                 if (!isset($course[3])) {
-                    $course[3] = get_lang('NotAvailable');
+                    $course[3] = get_lang('Not available');
                 }
                 foreach ($course as $cell) {
                     $data_table .= '<td align="right">'.$cell.'</td>';
@@ -122,12 +122,12 @@ class BlockDaily extends Block
             }
             $data_table .= '</table>';
         } else {
-            $data_table .= get_lang('ThereIsNoInformationAboutYourCourses');
+            $data_table .= get_lang('There is no available information about your courses');
         }
         $content .= $data_table;
         if (!empty($course_data)) {
             $content .= '<div style="text-align:right;margin-top:10px;">
-            <a href="'.api_get_path(WEB_CODE_PATH).'mySpace/course.php">'.get_lang('SeeMore').'</a></div>';
+            <a href="'.api_get_path(WEB_CODE_PATH).'mySpace/course.php">'.get_lang('See more').'</a></div>';
         }
         //$content .= '</div>';
         return $content;
@@ -181,11 +181,11 @@ class BlockDaily extends Block
                 if ($attendance['done'] != '0') {
                     $attendances[] = '<a href="'.api_get_path(WEB_PATH).'main/attendance/index.php?cidReq='.$attendance['course_code'].'&action=attendance_sheet_print&attendance_id='.$attendance['id'].'">'.Display::return_icon('printmgr.gif', get_lang('Print')).'</a>';
                 } else {
-                    $attendances[] = get_lang("NotAvailable");
+                    $attendances[] = get_lang("Not available");
                 }
             }
             if (count($attendances) == 0) {
-                $attendances[] = get_lang("NotAvailable");
+                $attendances[] = get_lang("Not available");
             }
 
             // Number of students
@@ -236,10 +236,10 @@ class BlockDaily extends Block
                         $i++;
                     }
                 } else {
-                    $score = get_lang("NotAvailable");
+                    $score = get_lang("Not available");
                 }
             } else {
-                $score = get_lang("NotAvailable");
+                $score = get_lang("Not available");
             }
 
             $table_row = [];

+ 9 - 9
plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php

@@ -79,7 +79,7 @@ class BlockEvaluationGraph extends Block
 
         $html = '';
         if (empty($evaluations_base_courses_graph) && empty($evaluations_courses_in_sessions_graph)) {
-            $html .= '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'), 'UTF-8').'</p>';
+            $html .= '<p>'.api_convert_encoding(get_lang('Graphic not available'), 'UTF-8').'</p>';
         } else {
             // display evaluations base courses graph
             if (!empty($evaluations_base_courses_graph)) {
@@ -102,7 +102,7 @@ class BlockEvaluationGraph extends Block
         }
 
         $html = $this->getBlockCard(
-            get_lang('EvaluationsGraph'),
+            get_lang('Graph of evaluations'),
             $html
         );
 
@@ -156,12 +156,12 @@ class BlockEvaluationGraph extends Block
                         $dataSet->addPoints($max, 'Serie1');
                         $dataSet->addPoints($items, 'Labels');
 
-                        $dataSet->setSerieDescription('Serie1', get_lang('Max'));
-                        $dataSet->setSerieDescription('Serie2', get_lang('Avg'));
-                        $dataSet->setSerieDescription('Serie3', get_lang('Min'));
+                        $dataSet->setSerieDescription('Serie1', get_lang('Maximum'));
+                        $dataSet->setSerieDescription('Serie2', get_lang('Average'));
+                        $dataSet->setSerieDescription('Serie3', get_lang('Minimum'));
                         $dataSet->setAbscissa('Labels');
 
-                        $dataSet->setAbscissaName(get_lang('EvaluationName'));
+                        $dataSet->setAbscissaName(get_lang('Assessment'));
 
                         $dataSet->normalize(100, '%');
 
@@ -336,11 +336,11 @@ class BlockEvaluationGraph extends Block
                             $dataSet->addPoints($max, 'Serie1');
                             $dataSet->addPoints($items, 'Labels');
 
-                            $dataSet->setSerieDescription('Serie1', get_lang('Max'));
+                            $dataSet->setSerieDescription('Serie1', get_lang('Maximum'));
                             $dataSet->setSerieDescription('Serie2', get_lang('Avg'));
-                            $dataSet->setSerieDescription('Serie3', get_lang('Min'));
+                            $dataSet->setSerieDescription('Serie3', get_lang('Minimum'));
                             $dataSet->setAbscissa('Labels');
-                            $dataSet->setAbscissaName(get_lang('EvaluationName'));
+                            $dataSet->setAbscissaName(get_lang('Assessment'));
                             $dataSet->normalize(100, '%');
                             $dataSet->loadPalette(api_get_path(SYS_CODE_PATH).'palettes/pchart/default.color', true);
 

+ 9 - 9
plugin/dashboard/block_global_info/block_global_info.class.php

@@ -67,7 +67,7 @@ class BlockGlobalInfo extends Block
         $column = 2;
         $data = [];
         $html = $this->getBlockCard(
-            get_lang('GlobalPlatformInformation'),
+            get_lang('Global platform information'),
             $this->getContent()
         );
         $data['column'] = $column;
@@ -120,16 +120,16 @@ class BlockGlobalInfo extends Block
         $path = api_get_path(WEB_CODE_PATH);
         // Check total number of users
         $global_info = [
-            [get_lang('CountUsers'), '<a href="'.$path.'admin/user_list.php">'.Statistics::countUsers().'</a>'],
+            [get_lang('Number of users'), '<a href="'.$path.'admin/user_list.php">'.Statistics::countUsers().'</a>'],
             // Check only active users
-            [get_lang('NumberOfUsersActive'), '<a href="'.$path.'admin/user_list.php?keyword_firstname=&amp;keyword_lastname=&amp;keyword_username=&amp;keyword_email=&amp;keyword_officialcode=&amp;keyword_status=%25&amp;keyword_active=1&amp;submit=&amp;_qf__advanced_search=">'.Statistics::countUsers(null, null, null, true).'</a>'],
+            [get_lang('Number of active users'), '<a href="'.$path.'admin/user_list.php?keyword_firstname=&amp;keyword_lastname=&amp;keyword_username=&amp;keyword_email=&amp;keyword_officialcode=&amp;keyword_status=%25&amp;keyword_active=1&amp;submit=&amp;_qf__advanced_search=">'.Statistics::countUsers(null, null, null, true).'</a>'],
             // Check number of courses
-            [get_lang('NumberOfCoursesTotal'), '<a href="'.$path.'admin/course_list.php">'.Statistics::countCourses().'</a>'],
-            [get_lang('NumberOfCoursesPublic'), '<a href="'.$path.'admin/course_list.php?keyword_code=&amp;keyword_title=&amp;keyword_language=%25&amp;keyword_category=&amp;keyword_visibility='.COURSE_VISIBILITY_OPEN_WORLD.'&amp;keyword_subscribe=%25&amp;keyword_unsubscribe=%25&amp;submit=&amp;_qf__advanced_course_search=">'.Statistics::countCoursesByVisibility(COURSE_VISIBILITY_OPEN_WORLD).'</a>'],
-            [get_lang('NumberOfCoursesOpen'), '<a href="'.$path.'admin/course_list.php?keyword_code=&amp;keyword_title=&amp;keyword_language=%25&amp;keyword_category=&amp;keyword_visibility='.COURSE_VISIBILITY_OPEN_PLATFORM.'&amp;keyword_subscribe=%25&amp;keyword_unsubscribe=%25&amp;submit=&amp;_qf__advanced_course_search=">'.Statistics::countCoursesByVisibility(COURSE_VISIBILITY_OPEN_PLATFORM).'</a>'],
-            [get_lang('NumberOfCoursesPrivate'), '<a href="'.$path.'admin/course_list.php?keyword_code=&amp;keyword_title=&amp;keyword_language=%25&amp;keyword_category=&amp;keyword_visibility='.COURSE_VISIBILITY_REGISTERED.'&amp;keyword_subscribe=%25&amp;keyword_unsubscribe=%25&amp;submit=&amp;_qf__advanced_course_search=">'.Statistics::countCoursesByVisibility(COURSE_VISIBILITY_REGISTERED).'</a>'],
-            [get_lang('NumberOfCoursesClosed'), '<a href="'.$path.'admin/course_list.php?keyword_code=&amp;keyword_title=&amp;keyword_language=%25&amp;keyword_category=&amp;keyword_visibility='.COURSE_VISIBILITY_CLOSED.'&amp;keyword_subscribe=%25&amp;keyword_unsubscribe=%25&amp;submit=&amp;_qf__advanced_course_search=">'.Statistics::countCoursesByVisibility(COURSE_VISIBILITY_CLOSED).'</a>'],
-            [get_lang('NumberOfCoursesHidden'), '<a href="'.$path.'admin/course_list.php?keyword_code=&amp;keyword_title=&amp;keyword_language=%25&amp;keyword_category=&amp;keyword_visibility='.COURSE_VISIBILITY_HIDDEN.'&amp;keyword_subscribe=%25&amp;keyword_unsubscribe=%25&amp;submit=&amp;_qf__advanced_course_search=">'.Statistics::countCoursesByVisibility(COURSE_VISIBILITY_HIDDEN).'</a>'],
+            [get_lang('Total number of courses'), '<a href="'.$path.'admin/course_list.php">'.Statistics::countCourses().'</a>'],
+            [get_lang('Number of public courses'), '<a href="'.$path.'admin/course_list.php?keyword_code=&amp;keyword_title=&amp;keyword_language=%25&amp;keyword_category=&amp;keyword_visibility='.COURSE_VISIBILITY_OPEN_WORLD.'&amp;keyword_subscribe=%25&amp;keyword_unsubscribe=%25&amp;submit=&amp;_qf__advanced_course_search=">'.Statistics::countCoursesByVisibility(COURSE_VISIBILITY_OPEN_WORLD).'</a>'],
+            [get_lang('Number of open courses'), '<a href="'.$path.'admin/course_list.php?keyword_code=&amp;keyword_title=&amp;keyword_language=%25&amp;keyword_category=&amp;keyword_visibility='.COURSE_VISIBILITY_OPEN_PLATFORM.'&amp;keyword_subscribe=%25&amp;keyword_unsubscribe=%25&amp;submit=&amp;_qf__advanced_course_search=">'.Statistics::countCoursesByVisibility(COURSE_VISIBILITY_OPEN_PLATFORM).'</a>'],
+            [get_lang('Number of private courses'), '<a href="'.$path.'admin/course_list.php?keyword_code=&amp;keyword_title=&amp;keyword_language=%25&amp;keyword_category=&amp;keyword_visibility='.COURSE_VISIBILITY_REGISTERED.'&amp;keyword_subscribe=%25&amp;keyword_unsubscribe=%25&amp;submit=&amp;_qf__advanced_course_search=">'.Statistics::countCoursesByVisibility(COURSE_VISIBILITY_REGISTERED).'</a>'],
+            [get_lang('Number of closed courses'), '<a href="'.$path.'admin/course_list.php?keyword_code=&amp;keyword_title=&amp;keyword_language=%25&amp;keyword_category=&amp;keyword_visibility='.COURSE_VISIBILITY_CLOSED.'&amp;keyword_subscribe=%25&amp;keyword_unsubscribe=%25&amp;submit=&amp;_qf__advanced_course_search=">'.Statistics::countCoursesByVisibility(COURSE_VISIBILITY_CLOSED).'</a>'],
+            [get_lang('Number of hidden courses'), '<a href="'.$path.'admin/course_list.php?keyword_code=&amp;keyword_title=&amp;keyword_language=%25&amp;keyword_category=&amp;keyword_visibility='.COURSE_VISIBILITY_HIDDEN.'&amp;keyword_subscribe=%25&amp;keyword_unsubscribe=%25&amp;submit=&amp;_qf__advanced_course_search=">'.Statistics::countCoursesByVisibility(COURSE_VISIBILITY_HIDDEN).'</a>'],
         ];
 
         return $global_info;

+ 5 - 5
plugin/dashboard/block_session/block_session.class.php

@@ -64,7 +64,7 @@ class BlockSession extends Block
         $column = 2;
         $data = [];
         $html = $this->getBlockCard(
-            get_lang('YourSessionsList'),
+            get_lang('Your sessions'),
             $this->getContent()
         );
 
@@ -88,7 +88,7 @@ class BlockSession extends Block
             $sessions_table .= '<tr>
                                     <th >'.get_lang('Title').'</th>
                                     <th >'.get_lang('Date').'</th>
-                                    <th width="100px">'.get_lang('NbCoursesPerSession').'</th>
+                                    <th width="100px">'.get_lang('Number of courses per session').'</th>
                                 </tr>';
             $i = 1;
             foreach ($sessions as $session) {
@@ -107,7 +107,7 @@ class BlockSession extends Block
                         date_default_timezone_get()
                     );
 
-                    $date = vsprintf(get_lang('FromDateXToDateY'), [$dateFrom, $dateUntil]);
+                    $date = vsprintf(get_lang('From %s to %s'), [$dateFrom, $dateUntil]);
                 } else {
                     $date = ' - ';
                 }
@@ -130,11 +130,11 @@ class BlockSession extends Block
             $sessions_table .= '</table>';
             $content .= $sessions_table;
         } else {
-            $content .= get_lang('ThereIsNoInformationAboutYourSessions');
+            $content .= get_lang('There is no available information about your sessions');
         }
 
         if (count($sessions) > 0) {
-            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/session.php">'.get_lang('SeeMore').'</a></div>';
+            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/session.php">'.get_lang('See more').'</a></div>';
         }
 
         return $content;

+ 13 - 13
plugin/dashboard/block_student/block_student.class.php

@@ -64,7 +64,7 @@ class BlockStudent extends Block
         $column = 1;
         $data = [];
         $html = $this->getBlockCard(
-            get_lang('YourStudents'),
+            get_lang('Your learners'),
             $this->getContent()
         );
         $data['column'] = $column;
@@ -85,9 +85,9 @@ class BlockStudent extends Block
         if (count($students) > 0) {
             $students_table .= '<table class="data_table">';
             $students_table .= '<tr>
-                                    <th width="10%" rowspan="2">'.get_lang('FirstName').'</th>
-                                    <th width="10%" rowspan="2">'.get_lang('LastName').'</th>
-                                    <th width="30%" colspan="2">'.get_lang('CourseInformation').'</th>
+                                    <th width="10%" rowspan="2">'.get_lang('First name').'</th>
+                                    <th width="10%" rowspan="2">'.get_lang('Last name').'</th>
+                                    <th width="30%" colspan="2">'.get_lang('Course Information').'</th>
                                 </tr>
                                 <tr>
                                     <th width="10%">'.get_lang('Courses').'</th>
@@ -126,20 +126,20 @@ class BlockStudent extends Block
                     }
                 } else {
                     $students_table .= '<tr '.$style.'>
-                                            <td align="center" colspan="2"><i>'.get_lang('Empty').'</i></td>
+                                            <td align="center" colspan="2"><i>'.get_lang('You left some fields empty.<br>Use the <b>Back</b> button on your browser and try again.<br>If you ignore your training code, see the Training Program').'</i></td>
                                         </tr>';
                 }
                 $i++;
             }
             $students_table .= '</table>';
         } else {
-            $students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
+            $students_table .= get_lang('ThereIsNoInformationAboutYour learners');
         }
 
         $content = $students_table;
 
         if (count($students) > 0) {
-            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=useroverview">'.get_lang('SeeMore').'</a></div>';
+            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=useroverview">'.get_lang('See more').'</a></div>';
         }
 
         return $content;
@@ -152,13 +152,13 @@ class BlockStudent extends Block
     {
         $attendance = new Attendance();
         $students = $this->students;
-        $content = '<h4>'.get_lang('YourStudents').'</h4>';
+        $content = '<h4>'.get_lang('Your learners').'</h4>';
         $students_table = null;
         if (count($students) > 0) {
             $students_table .= '<table class="data_table">';
             $students_table .= '<tr>
                                     <th>'.get_lang('User').'</th>
-                                    <th>'.get_lang('AttendancesFaults').'</th>
+                                    <th>'.get_lang('Not attended').'</th>
                                     <th>'.get_lang('Evaluations').'</th>
                                 </tr>';
             $i = 1;
@@ -170,7 +170,7 @@ class BlockStudent extends Block
                 // get average of faults in attendances by student
                 $results_faults_avg = $attendance->get_faults_average_inside_courses($student_id);
                 if (!empty($results_faults_avg)) {
-                    $attendances_faults_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.$results_faults_avg['faults'].'/'.$results_faults_avg['total'].' ('.$results_faults_avg['porcent'].'%)</a>';
+                    $attendances_faults_avg = '<a title="'.get_lang('Go to learner details').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.$results_faults_avg['faults'].'/'.$results_faults_avg['total'].' ('.$results_faults_avg['porcent'].'%)</a>';
                 } else {
                     $attendances_faults_avg = '0%';
                 }
@@ -201,7 +201,7 @@ class BlockStudent extends Block
                 }
 
                 if (!empty($weight)) {
-                    $evaluations_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.round($score, 2).'/'.round($weight, 2).'('.round(($score / $weight) * 100, 2).' %)</a>';
+                    $evaluations_avg = '<a title="'.get_lang('Go to learner details').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.round($score, 2).'/'.round($weight, 2).'('.round(($score / $weight) * 100, 2).' %)</a>';
                 }
 
                 if ($i % 2 == 0) {
@@ -219,14 +219,14 @@ class BlockStudent extends Block
             }
             $students_table .= '</table>';
         } else {
-            $students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
+            $students_table .= get_lang('ThereIsNoInformationAboutYour learners');
         }
 
         $content .= $students_table;
 
         if (count($students) > 0) {
             $content .= '<div style="text-align:right;margin-top:10px;">
-                            <a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=yourstudents">'.get_lang('SeeMore').'</a>
+                            <a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=yourstudents">'.get_lang('See more').'</a>
                          </div>';
         }
         //$content .= '</div>';

+ 2 - 2
plugin/dashboard/block_student_graph/block_student_graph.class.php

@@ -74,7 +74,7 @@ class BlockStudentGraph extends Block
         $column = 1;
         $data = [];
         $html = $this->getBlockCard(
-            get_lang('StudentsInformationsGraph'),
+            get_lang('Learners report chart'),
             $this->getContent()
         );
 
@@ -234,7 +234,7 @@ class BlockStudentGraph extends Block
             }
             $graph = '<img src="'.$imgPath.'" >';
         } else {
-            $graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'), 'UTF-8').'</p>';
+            $graph = '<p>'.api_convert_encoding(get_lang('Graphic not available'), 'UTF-8').'</p>';
         }
 
         return $graph;

+ 9 - 9
plugin/dashboard/block_teacher/block_teacher.class.php

@@ -67,7 +67,7 @@ class BlockTeacher extends Block
         $column = 1;
         $data = [];
         $html = $this->getBlockCard(
-            get_lang('TeachersInformationsList'),
+            get_lang('Teachers report'),
             $this->getContent()
         );
         $data['column'] = $column;
@@ -91,8 +91,8 @@ class BlockTeacher extends Block
             $teachers_table .= '
                                 <tr>
                                     <th>'.get_lang('User').'</th>
-                                    <th>'.get_lang('TimeSpentOnThePlatform').'</th>
-                                    <th>'.get_lang('LastConnexion').'</th>
+                                    <th>'.get_lang('Time spent in portal').'</th>
+                                    <th>'.get_lang('Latest login').'</th>
                                 </tr>
                             ';
             $i = 1;
@@ -121,14 +121,14 @@ class BlockTeacher extends Block
             }
             $teachers_table .= '</table>';
         } else {
-            $teachers_table .= get_lang('ThereIsNoInformationAboutYourTeachers');
+            $teachers_table .= get_lang('There is no available information about your teachers');
         }
 
         $content = $teachers_table;
 
         if (count($teachers) > 0) {
             $content .= '<div style="text-align:right;margin-top:10px;">
-            <a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin">'.get_lang('SeeMore').'</a></div>';
+            <a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin">'.get_lang('See more').'</a></div>';
         }
 
         return $content;
@@ -140,7 +140,7 @@ class BlockTeacher extends Block
     public function get_teachers_content_html_for_drh()
     {
         $teachers = $this->teachers;
-        $content = '<h4>'.get_lang('YourTeachers').'</h4>';
+        $content = '<h4>'.get_lang('Your teachers').'</h4>';
         $teachers_table = null;
         if (count($teachers) > 0) {
             $a_last_week = get_last_week();
@@ -150,7 +150,7 @@ class BlockTeacher extends Block
             $teachers_table .= '
                                 <tr>
                                     <th>'.get_lang('User').'</th>
-                                    <th>'.get_lang('TimeSpentLastWeek').'<br />'.$last_week.'</th>
+                                    <th>'.get_lang('Time spent last week').'<br />'.$last_week.'</th>
                                 </tr>
                             ';
 
@@ -178,11 +178,11 @@ class BlockTeacher extends Block
             }
             $teachers_table .= '</table>';
         } else {
-            $teachers_table .= get_lang('ThereIsNoInformationAboutYourTeachers');
+            $teachers_table .= get_lang('There is no available information about your teachers');
         }
         $content .= $teachers_table;
         if (count($teachers) > 0) {
-            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/teachers.php">'.get_lang('SeeMore').'</a></div>';
+            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/teachers.php">'.get_lang('See more').'</a></div>';
         }
 
         return $content;

+ 2 - 2
plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php

@@ -72,7 +72,7 @@ class BlockTeacherGraph extends Block
         $column = 1;
         $data = [];
         $html = $this->getBlockCard(
-            get_lang('TeachersInformationsGraph'),
+            get_lang('Teachers report chart'),
             $this->getContent()
         );
 
@@ -194,7 +194,7 @@ class BlockTeacherGraph extends Block
             }
             $graph = '<img src="'.$imgPath.'" >';
         } else {
-            $graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'), 'UTF-8').'</p>';
+            $graph = '<p>'.api_convert_encoding(get_lang('Graphic not available'), 'UTF-8').'</p>';
         }
 
         return $graph;

+ 1 - 1
plugin/dictionary/terms.php

@@ -56,7 +56,7 @@ switch ($action) {
                 'definition' => $values['definition'],
             ];
             Database::update($table, $params, ['id = ?' => $id]);
-            Display::addFlash(Display::return_message(get_lang('Updated')));
+            Display::addFlash(Display::return_message(get_lang('Update successful')));
 
             header('Location: '.api_get_self());
             exit;

+ 3 - 3
plugin/grading_electronic/src/GradingElectronicPlugin.php

@@ -82,7 +82,7 @@ class GradingElectronicPlugin extends Plugin
         $form = new FormValidator('frm_grading_electronic');
         $form->addDateRangePicker(
             'range',
-            get_lang('DateRange'),
+            get_lang('Date range'),
             true,
             [
                 'id' => 'range',
@@ -91,9 +91,9 @@ class GradingElectronicPlugin extends Plugin
                 'validate_format' => 'Y-m-d',
             ]
         );
-        $form->addText('course', $this->get_lang('CourseId'));
+        $form->addText('course', $this->get_lang('Course ID'));
         $form->addButtonDownload(get_lang('Generate'));
-        $form->addRule('course', get_lang('ThisFieldIsRequired'), 'required');
+        $form->addRule('course', get_lang('Required field'), 'required');
         $form->setDefaults([
             'course' => $courseIdValue ? $courseIdValue['value'] : null,
         ]);

+ 1 - 1
plugin/jcapture/plugin_applet.php

@@ -76,7 +76,7 @@ function insertAtCarret() {
            scriptable = "false"
            pluginspage="http://java.sun.com/products/plugin/index.html#download">
     </embed>
-    <?php echo get_lang('NoJava'); ?>
+    <?php echo get_lang('Your browser does not support Java'); ?>
 
 </object>
 

+ 7 - 7
plugin/learning_calendar/LearningCalendarPlugin.php

@@ -122,7 +122,7 @@ class LearningCalendarPlugin extends Plugin
 
         $extraField = new ExtraField('lp_item');
         $params = [
-            'display_text' => $this->get_lang('LearningCalendarOneDayMarker'),
+            'display_text' => $this->get_lang('Learning calendarOneDayMarker'),
             'variable' => 'calendar',
             'visible_to_self' => 1,
             'changeable' => 1,
@@ -134,7 +134,7 @@ class LearningCalendarPlugin extends Plugin
 
         $extraField = new ExtraField('course');
         $params = [
-            'display_text' => $this->get_lang('CourseHoursDuration'),
+            'display_text' => $this->get_lang('Course duration (h)'),
             'variable' => 'course_hours_duration',
             'visible_to_self' => 1,
             'changeable' => 1,
@@ -583,8 +583,8 @@ class LearningCalendarPlugin extends Plugin
     public function getForm(FormValidator &$form)
     {
         $form->addText('title', get_lang('Title'));
-        $form->addText('total_hours', get_lang('TotalHours'));
-        $form->addText('minutes_per_day', get_lang('MinutesPerDay'));
+        $form->addText('total_hours', get_lang('Total hours'));
+        $form->addText('minutes_per_day', get_lang('Minutes per day'));
         $form->addHtmlEditor('description', get_lang('Description'), false);
     }
 
@@ -825,7 +825,7 @@ class LearningCalendarPlugin extends Plugin
         // @todo use translation
         // get events from this year to today
         $stats = $this->getUserStats($userId, $courseAndSessionList);
-        $html = $this->get_lang('NumberDaysAccumulatedInCalendar').$stats['user_event_count'];
+        $html = $this->get_lang('Number of days accumulated in calendar').$stats['user_event_count'];
         if (!empty($courseAndSessionList)) {
             $html .= '<br />';
             $html .= $this->get_lang('NumberDaysAccumulatedInLp').$stats['completed'];
@@ -880,7 +880,7 @@ class LearningCalendarPlugin extends Plugin
             </script>';
         }
 
-        $html = Display::panel($html, $this->get_lang('LearningCalendar'));
+        $html = Display::panel($html, $this->get_lang('Learning calendar'));
 
         return $html;
     }
@@ -1150,7 +1150,7 @@ class LearningCalendarPlugin extends Plugin
         $calendars = $this->getCalendars(0, 1000, '');
 
         if (empty($calendars)) {
-            echo Display::return_message(get_lang('NoData'), 'warning');
+            echo Display::return_message(get_lang('No data available'), 'warning');
             exit;
         }
         $calendars = array_column($calendars, 'title', 'id');

+ 3 - 3
plugin/learning_calendar/calendar_users.php

@@ -32,8 +32,8 @@ $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_calendar_users&id='.$ca
 
 // The order is important you need to check the the $column variable in the model.ajax.php file
 $columns = [
-    get_lang('FirstName'),
-    get_lang('LastName'),
+    get_lang('First name'),
+    get_lang('Last name'),
     get_lang('Exam'),
 ];
 
@@ -100,7 +100,7 @@ Display::display_header();
 // action links
 echo '<div class="actions">';
 echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/usergroup_users.php?id='.$calendarId.'">'.
-    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'), '', '32').
+    Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Administration'), '', '32').
     '</a>';
 echo '</div>';
 echo Display::grid_html('usergroups');

+ 7 - 7
plugin/learning_calendar/start.php

@@ -31,7 +31,7 @@ switch ($action) {
                 'author_id' => api_get_user_id(),
             ];
             Database::insert('learning_calendar', $params);
-            Display::addFlash(Display::return_message(get_lang('Saved')));
+            Display::addFlash(Display::return_message(get_lang('Saved..')));
             header('Location: start.php');
             exit;
         }
@@ -59,7 +59,7 @@ switch ($action) {
                 'description' => $values['description'],
             ];
             Database::update('learning_calendar', $params, ['id = ?' => $calendarId]);
-            Display::addFlash(Display::return_message(get_lang('Updated')));
+            Display::addFlash(Display::return_message(get_lang('Update successful')));
             header('Location: start.php');
             exit;
         }
@@ -67,7 +67,7 @@ switch ($action) {
     case 'copy':
         $result = $plugin->copyCalendar($calendarId);
         if ($result) {
-            Display::addFlash(Display::return_message(get_lang('Saved')));
+            Display::addFlash(Display::return_message(get_lang('Saved..')));
         }
         header('Location: start.php');
         exit;
@@ -85,7 +85,7 @@ switch ($action) {
         $itemId = isset($_REQUEST['lp_item_id']) ? $_REQUEST['lp_item_id'] : 0;
         $lpId = isset($_REQUEST['lp_id']) ? $_REQUEST['lp_id'] : 0;
         $plugin->toggleVisibility($itemId);
-        Display::addFlash(Display::return_message(get_lang('Updated')));
+        Display::addFlash(Display::return_message(get_lang('Update successful')));
         $url = api_get_path(WEB_CODE_PATH).
             'lp/lp_controller.php?action=add_item&type=step&lp_id='.$lpId.'&'.api_get_cidreq();
         header("Location: $url");
@@ -98,9 +98,9 @@ $htmlHeadXtra[] = api_get_jqgrid_js();
 $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_learning_path_calendars';
 $columns = [
     get_lang('Title'),
-    get_lang('TotalHours'),
-    get_lang('MinutesPerDay'),
-    get_lang('Actions'),
+    get_lang('Total hours'),
+    get_lang('Minutes per day'),
+    get_lang('Detail'),
 ];
 
 $columnModel = [

+ 3 - 3
plugin/maintenancemode/plugin.php

@@ -101,7 +101,7 @@ if ($editFile && $isPlatformAdmin) {
         $config
     );
 
-    $form->addCheckBox('active', null, get_lang('Active'));
+    $form->addCheckBox('active', null, get_lang('active'));
 
     $form->addButtonSave(get_lang('Save'));
     $content = '';
@@ -112,7 +112,7 @@ if ($editFile && $isPlatformAdmin) {
         $content = '<html><head><title></title></head><body></body></html>';
     }
 
-    $isActive = api_get_plugin_setting('maintenancemode', 'active');
+    $isactive = api_get_plugin_setting('maintenancemode', 'active');
 
     $ip = api_get_real_ip();
     if ($ip == '::1') {
@@ -135,7 +135,7 @@ RewriteRule \.*$ '.$append.'/maintenance.html [R=302,L]
         'text' => $block,
         'maintenance' => $content,
         'ip' => $ip,
-        'active' => $isActive,
+        'active' => $isactive,
     ]);
 
     if ($form->validate()) {

+ 24 - 24
plugin/notebookteacher/src/NotebookTeacher.php

@@ -36,7 +36,7 @@ class NotebookTeacher
         return "<script>
 				function confirmation (name)
 				{
-					if (confirm(\" ".get_lang("NoteConfirmDelete")." \"+ name + \" ?\"))
+					if (confirm(\" ".get_lang("Are you sure you want to delete this note")." \"+ name + \" ?\"))
 						{return true;}
 					else
 						{return false;}
@@ -236,7 +236,7 @@ class NotebookTeacher
 
         // Status
         $students = [];
-        $students[] = $plugin->get_lang('AllStudent');
+        $students[] = $plugin->get_lang('AllLearner');
         foreach ($userList as $key => $userItem) {
             $students[$key] = api_get_person_name($userItem['firstname'], $userItem['lastname']);
         }
@@ -244,7 +244,7 @@ class NotebookTeacher
         $form->addElement(
             'select',
             'student_filter',
-            $plugin->get_lang('StudentFilter'),
+            $plugin->get_lang('LearnerFilter'),
             $students,
             [
                 'id' => 'student_filter',
@@ -264,29 +264,29 @@ class NotebookTeacher
                     echo '<a href="'.$currentUrl.'&action=addnote">'.
                         Display::return_icon(
                             'new_note.png',
-                            get_lang('NoteAddNew'),
+                            get_lang('Add new note in my personal notebook'),
                             '',
                             '32'
                         ).'</a>';
                 } elseif (api_is_allowed_to_session_edit(false, true)) {
                     echo '<a href="'.$currentUrl.'&action=addnote">'.
-                        Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
+                        Display::return_icon('new_note.png', get_lang('Add new note in my personal notebook'), '', '32').'</a>';
                 }
             } else {
                 echo '<a href="javascript:void(0)">'.
-                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
+                    Display::return_icon('new_note.png', get_lang('Add new note in my personal notebook'), '', '32').'</a>';
             }
         }
 
         echo '<a href="'.$currentUrl.
                 '&action=changeview&view=creation_date&direction='.$linkSortDirection.'">'.
-            Display::return_icon('notes_order_by_date_new.png', get_lang('OrderByCreationDate'), '', '32').'</a>';
+            Display::return_icon('notes_order_by_date_new.png', get_lang('Sort by date created'), '', '32').'</a>';
         echo '<a href="'.$currentUrl.
                 '&action=changeview&view=update_date&direction='.$linkSortDirection.'">'.
-            Display::return_icon('notes_order_by_date_mod.png', get_lang('OrderByModificationDate'), '', '32').'</a>';
+            Display::return_icon('notes_order_by_date_mod.png', get_lang('Sort by date last modified'), '', '32').'</a>';
         echo '<a href="'.$currentUrl.
                 '&action=changeview&view=title&direction='.$linkSortDirection.'">'.
-            Display::return_icon('notes_order_by_title.png', get_lang('OrderByTitle'), '', '32').'</a>';
+            Display::return_icon('notes_order_by_title.png', get_lang('Sort by title'), '', '32').'</a>';
 
         echo '</div>';
         echo '<div class="row">'.$selectStudent.'</div>';
@@ -339,11 +339,11 @@ class NotebookTeacher
                     $sessionImg = api_get_session_image($row['session_id'], $userInfo['status']);
                     $updateValue = '';
                     if ($row['update_date'] != $row['creation_date']) {
-                        $updateValue = ', '.get_lang('UpdateDate').': '.
+                        $updateValue = ', '.get_lang('Updated').': '.
                                         Display::dateToStringAgoAndLongDate($row['update_date']);
                     }
                     $userInfo = api_get_user_info($row['user_id']);
-                    $author = ', '.get_lang('Teacher').': '.$userInfo['complete_name'];
+                    $author = ', '.get_lang('Trainer').': '.$userInfo['complete_name'];
                     $actions = '';
                     if (intval($row['user_id']) == api_get_user_id()) {
                         $actions = '<a href="'.
@@ -359,7 +359,7 @@ class NotebookTeacher
                     echo Display::panel(
                         $row['description'],
                         $row['title'].$sessionImg.' <div class="pull-right">'.$actions.'</div>',
-                        get_lang('CreationDate').': '.
+                        get_lang('Creation date').': '.
                         Display::dateToStringAgoAndLongDate($row['creation_date']).$updateValue.$author
                     );
                 }
@@ -390,12 +390,12 @@ class NotebookTeacher
                         $updateValue = '';
 
                         if ($row['update_date'] != $row['creation_date']) {
-                            $updateValue = ', '.get_lang('UpdateDate').': '.
+                            $updateValue = ', '.get_lang('Updated').': '.
                             Display::dateToStringAgoAndLongDate($row['update_date']);
                         }
 
                         $userInfo = api_get_user_info($row['user_id']);
-                        $author = ', '.get_lang('Teacher').': '.$userInfo['complete_name'];
+                        $author = ', '.get_lang('Trainer').': '.$userInfo['complete_name'];
 
                         $actions = '';
                         if (intval($row['user_id']) == api_get_user_id()) {
@@ -416,7 +416,7 @@ class NotebookTeacher
                         echo Display::panel(
                             $row['description'],
                             $row['title'].$sessionImg.' <div class="pull-right">'.$actions.'</div>',
-                            get_lang('CreationDate').': '.
+                            get_lang('Creation date').': '.
                             Display::dateToStringAgoAndLongDate($row['creation_date']).$updateValue.$author
                         );
                     }
@@ -435,19 +435,19 @@ class NotebookTeacher
 
             $result = Database::query($sql);
             if (Database::num_rows($result) > 0) {
-                echo Display::page_subheader($plugin->get_lang('NotebookNoStudentAssigned'));
+                echo Display::page_subheader($plugin->get_lang('NotebookNoLearnerAssigned'));
                 while ($row = Database::fetch_array($result)) {
                     // Validation when belongs to a session
                     $sessionImg = api_get_session_image($row['session_id'], $userInfo['status']);
                     $updateValue = '';
 
                     if ($row['update_date'] != $row['creation_date']) {
-                        $updateValue = ', '.get_lang('UpdateDate').': '.
+                        $updateValue = ', '.get_lang('Updated').': '.
                         Display::dateToStringAgoAndLongDate($row['update_date']);
                     }
 
                     $userInfo = api_get_user_info($row['user_id']);
-                    $author = ', '.get_lang('Teacher').': '.$userInfo['complete_name'];
+                    $author = ', '.get_lang('Trainer').': '.$userInfo['complete_name'];
                     $actions = '';
                     if (intval($row['user_id']) == api_get_user_id()) {
                         $actions = '<a href="'.api_get_self().
@@ -462,7 +462,7 @@ class NotebookTeacher
                     echo Display::panel(
                         $row['description'],
                         $row['title'].$sessionImg.' <div class="pull-right">'.$actions.'</div>',
-                        get_lang('CreationDate').': '.
+                        get_lang('Creation date').': '.
                         Display::dateToStringAgoAndLongDate($row['creation_date']).$updateValue.$author
                     );
                 }
@@ -506,25 +506,25 @@ class NotebookTeacher
         $form->addElement(
             'select',
             'student_id',
-            get_lang('Student'),
+            get_lang('Learner'),
             $students
         );
 
-        $form->addElement('text', 'note_title', get_lang('NoteTitle'), ['id' => 'note_title']);
+        $form->addElement('text', 'note_title', get_lang('Note title'), ['id' => 'note_title']);
         $form->addElement(
             'html_editor',
             'note_comment',
-            get_lang('NoteComment'),
+            get_lang('Note details'),
             null,
             api_is_allowed_to_edit()
                 ? ['ToolbarSet' => 'Notebook', 'Width' => '100%', 'Height' => '300']
-                : ['ToolbarSet' => 'NotebookStudent', 'Width' => '100%', 'Height' => '300', 'UserStatus' => 'student']
+                : ['ToolbarSet' => 'NotebookLearner', 'Width' => '100%', 'Height' => '300', 'UserStatus' => 'student']
         );
 
         $form->addButtonCreate(get_lang('Save'), 'SubmitNote');
 
         // Setting the rules
-        $form->addRule('note_title', get_lang('ThisFieldIsRequired'), 'required');
+        $form->addRule('note_title', get_lang('Required field'), 'required');
 
         return $form;
     }

+ 15 - 15
plugin/notebookteacher/src/index.php

@@ -56,7 +56,7 @@ $noteBookTeacher = $tool = $plugin->get_lang('NotebookTeacher');
 
 switch ($action) {
     case 'addnote':
-        $tool = 'NoteAddNew';
+        $tool = 'Add new note in my personal notebook';
         $interbreadcrumb[] = [
             'url' => 'index.php?'.api_get_cidreq(),
             'name' => $noteBookTeacher,
@@ -73,7 +73,7 @@ switch ($action) {
             'post',
             $currentUrl.'&action=addnote'
         );
-        $form->addHeader(get_lang('NoteAddNew'));
+        $form->addHeader(get_lang('Add new note in my personal notebook'));
         $form = NotebookTeacher::getForm($form, $studentId);
 
         $form->setDefaults(['student_id' => $studentId]);
@@ -84,7 +84,7 @@ switch ($action) {
                 $values = $form->exportValues();
                 $res = NotebookTeacher::saveNote($values);
                 if ($res) {
-                    Display::addFlash(Display::return_message(get_lang('NoteAdded'), 'confirmation'));
+                    Display::addFlash(Display::return_message(get_lang('Note added'), 'confirmation'));
                 }
             }
 
@@ -99,7 +99,7 @@ switch ($action) {
 
             echo '<div class="actions">';
             echo '<a href="index.php">'.
-                Display::return_icon('back.png', get_lang('BackToNotesList'), '', ICON_SIZE_MEDIUM).
+                Display::return_icon('back.png', get_lang('Back to the notes list'), '', ICON_SIZE_MEDIUM).
                 '</a>';
             echo '</div>';
             $token = Security::get_token();
@@ -109,7 +109,7 @@ switch ($action) {
         }
         break;
     case 'editnote':
-        $tool = 'ModifyNote';
+        $tool = 'Edit my personal note';
         $interbreadcrumb[] = [
             'url' => 'index.php?'.api_get_cidreq(),
             'name' => $noteBookTeacher,
@@ -131,7 +131,7 @@ switch ($action) {
             $currentUrl.'&action='.$action.'&notebook_id='.$notebookId
         );
         // Setting the form elements
-        $form->addHeader(get_lang('ModifyNote'));
+        $form->addHeader(get_lang('Edit my personal note'));
         $form->addHidden('notebook_id', $notebookId);
         $form = NotebookTeacher::getForm($form, $defaults['student_id']);
 
@@ -145,7 +145,7 @@ switch ($action) {
                 $values = $form->exportValues();
                 $res = NotebookTeacher::updateNote($values);
                 if ($res) {
-                    Display::addFlash(Display::return_message(get_lang('NoteUpdated'), 'confirmation'));
+                    Display::addFlash(Display::return_message(get_lang('Note updated'), 'confirmation'));
                 }
             }
             header('Location: '.$currentUrl);
@@ -158,7 +158,7 @@ switch ($action) {
             Display::display_introduction_section($noteBookTeacher);
             echo '<div class="actions">';
             echo '<a href="index.php">'.
-                Display::return_icon('back.png', get_lang('BackToNotesList'), '', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('back.png', get_lang('Back to the notes list'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '</div>';
             $token = Security::get_token();
             $form->addElement('hidden', 'sec_token');
@@ -169,7 +169,7 @@ switch ($action) {
     case 'deletenote':
         $res = NotebookTeacher::deleteNote($notebookId);
         if ($res) {
-            Display::addFlash(Display::return_message(get_lang('NoteDeleted'), 'confirmation'));
+            Display::addFlash(Display::return_message(get_lang('Note deleted'), 'confirmation'));
         }
         header('Location: '.$currentUrl);
         exit;
@@ -180,30 +180,30 @@ switch ($action) {
                 case 'creation_date':
                     if (!$_GET['direction'] || $_GET['direction'] == 'ASC') {
                         Display::addFlash(
-                            Display::return_message(get_lang('NotesSortedByCreationDateAsc'), 'confirmation')
+                            Display::return_message(get_lang('Notes sorted by creation date ascendant'), 'confirmation')
                         );
                     } else {
                         Display::addFlash(
-                            Display::return_message(get_lang('NotesSortedByCreationDateDESC'), 'confirmation')
+                            Display::return_message(get_lang('Notes sorted by creation date downward'), 'confirmation')
                         );
                     }
                     break;
                 case 'update_date':
                     if (!$_GET['direction'] || $_GET['direction'] == 'ASC') {
                         Display::addFlash(
-                            Display::return_message(get_lang('NotesSortedByUpdateDateAsc'), 'confirmation')
+                            Display::return_message(get_lang('Notes sorted by update date ascendant'), 'confirmation')
                         );
                     } else {
                         Display::addFlash(
-                            Display::return_message(get_lang('NotesSortedByUpdateDateDESC'), 'confirmation')
+                            Display::return_message(get_lang('Notes sorted by update date downward'), 'confirmation')
                         );
                     }
                     break;
                 case 'title':
                     if (!$_GET['direction'] || $_GET['direction'] == 'ASC') {
-                        Display::addFlash(Display::return_message(get_lang('NotesSortedByTitleAsc'), 'confirmation'));
+                        Display::addFlash(Display::return_message(get_lang('Notes sorted by title ascendant'), 'confirmation'));
                     } else {
-                        Display::addFlash(Display::return_message(get_lang('NotesSortedByTitleDESC'), 'confirmation'));
+                        Display::addFlash(Display::return_message(get_lang('Notes sorted by title downward'), 'confirmation'));
                     }
                     break;
             }

+ 3 - 3
plugin/questionoptionsevaluation/evaluation.php

@@ -9,7 +9,7 @@ api_protect_course_script();
 $exerciseId = isset($_REQUEST['exercise']) ? (int) $_REQUEST['exercise'] : 0;
 
 if (empty($exerciseId)) {
-    echo Display::return_message(get_lang('NotAllowed'), 'error');
+    echo Display::return_message(get_lang('You are not allowed to see this page. Either your connection has expired or you are trying to access a page for which you do not have the sufficient privileges.'), 'error');
 
     exit;
 }
@@ -17,7 +17,7 @@ if (empty($exerciseId)) {
 $exercise = new Exercise();
 
 if (!$exercise->read($exerciseId, false)) {
-    echo Display::return_message(get_lang('ExerciseNotFound'), 'error');
+    echo Display::return_message(get_lang('Test not found or not visible'), 'error');
 
     exit;
 }
@@ -25,7 +25,7 @@ if (!$exercise->read($exerciseId, false)) {
 $plugin = QuestionOptionsEvaluationPlugin::create();
 
 if ($plugin->get('enable') !== 'true') {
-    echo Display::return_message(get_lang('NotAllowed'), 'error');
+    echo Display::return_message(get_lang('You are not allowed to see this page. Either your connection has expired or you are trying to access a page for which you do not have the sufficient privileges.'), 'error');
 
     exit;
 }

+ 1 - 1
plugin/resubscription/src/HookResubscription.php

@@ -105,7 +105,7 @@ class HookResubscription extends HookObserver implements HookResubscribeObserver
                 if (isset($userSessionCourses[$currentSessionCourse['c_id']])) {
                     $endDate = $userSessionCourses[$currentSessionCourse['c_id']];
                     $resubscriptionDate = gmdate($limitDateFormat, strtotime($endDate." +$resubscriptionOffset"));
-                    $icon = Display::return_icon('students.gif', get_lang('Student'));
+                    $icon = Display::return_icon('students.gif', get_lang('Learner'));
                     $canResubscribeFrom = sprintf(
                         get_plugin_lang('CanResubscribeFromX', 'resubscription'),
                         $resubscriptionDate

+ 2 - 2
plugin/resubscription/src/Resubscription.php

@@ -20,8 +20,8 @@ class Resubscription extends Plugin implements HookPluginInterface
     protected function __construct()
     {
         $options = [
-            'calendar_year' => get_lang('CalendarYear'),
-            'natural_year' => get_lang('NaturalYear'),
+            'calendar_year' => get_lang('Calendar year'),
+            'natural_year' => get_lang('Natural year'),
         ];
         $parameters = [
             'resubscription_limit' => [

+ 4 - 4
plugin/search_course/lib/register_course_widget.class.php

@@ -74,12 +74,12 @@ class RegisterCourseWidget
         $registration_code = self::post(self::PARAM_PASSCODE);
 
         if ($this->subscribe_user($course_code, $registration_code)) {
-            echo Display::return_message(get_lang('EnrollToCourseSuccessful'), 'confirmation');
+            echo Display::return_message(get_lang('You have been registered to the course'), 'confirmation');
 
             return;
         }
         if (!empty($registration_code)) {
-            echo Display::return_message(get_lang('CourseRegistrationCodeIncorrect'), 'error');
+            echo Display::return_message(get_lang('The course password is incorrect'), 'error');
         }
         $this->display_form($course_code);
 
@@ -127,8 +127,8 @@ class RegisterCourseWidget
         $course_code = $course['code'];
         $course_visual_code = $course['visual_code'];
         $course_title = $course['title'];
-        $submit_registration_code_label = get_lang("SubmitRegistrationCode");
-        $course_requires_password_label = get_lang('CourseRequiresPassword');
+        $submit_registration_code_label = get_lang("Submit registration code");
+        $course_requires_password_label = get_lang('This course requires a password');
 
         $result = <<<EOT
             $course_requires_password_label<br/>

+ 4 - 4
plugin/search_course/lib/search_course_widget.class.php

@@ -153,7 +153,7 @@ class SearchCourseWidget
 
         $search_term = self::post('search_term');
         if ($search_term) {
-            $search_result_for_label = self::get_lang('SearchResultsFor');
+            $search_result_for_label = self::get_lang('Search results for:');
             $search_term_html = htmlentities($search_term, ENT_QUOTES, $charset);
             echo "<h5>$search_result_for_label $search_term_html</h5>";
 
@@ -166,7 +166,7 @@ class SearchCourseWidget
 
     public function display_header()
     {
-        $search_course_label = self::get_lang('SearchCourse');
+        $search_course_label = self::get_lang('Search courses');
         echo <<<EOT
         <div class="well course_search">
         <div class="menusection">
@@ -263,14 +263,14 @@ EOT;
         //Already subscribed
         $code = $current_course['code'];
         if (isset($user_courses[$code])) {
-            echo self::get_lang('AlreadySubscribed');
+            echo self::get_lang('Already subscribed');
 
             return false;
         }
 
         //Not authorized to subscribe
         if ($current_course['subscribe'] != SUBSCRIBE_ALLOWED) {
-            echo self::get_lang('SubscribingNotAllowed');
+            echo self::get_lang('Subscribing not allowed');
 
             return false;
         }

+ 1 - 1
plugin/studentfollowup/StudentFollowUpPlugin.php

@@ -40,7 +40,7 @@ class StudentFollowUpPlugin extends Plugin
         $pluginEntityPath = $this->getEntityPath();
         if (!is_dir($pluginEntityPath)) {
             if (!is_writable(dirname($pluginEntityPath))) {
-                $message = get_lang('ErrorCreatingDir').': '.$pluginEntityPath;
+                $message = get_lang('Can\'t create the directory. Please contact your system administrator.').': '.$pluginEntityPath;
                 Display::addFlash(Display::return_message($message, 'error'));
 
                 return false;

+ 4 - 4
plugin/studentfollowup/my_students.php

@@ -159,13 +159,13 @@ $form->addText(
     get_lang('Search'),
     false,
     [
-        'aria-label' => get_lang('SearchUsers'),
+        'aria-label' => get_lang('Search users'),
     ]
 );
 
 if (!empty($fullSessionList)) {
     $options = array_column($fullSessionList, 'name', 'id');
-    $options[0] = get_lang('SelectAnOption');
+    $options[0] = get_lang('Please select an option');
     ksort($options);
     $form->addSelect('session_id', get_lang('Session'), $options);
 }
@@ -176,7 +176,7 @@ if (!empty($tagList)) {
     foreach ($tagList as $tag => $counter) {
         $tagOptions[$tag] = $tag.' ('.$counter.')';
     }
-    $form->addSelect('tag', get_lang('Tags'), $tagOptions, ['placeholder' => get_lang('SelectAnOption')]);
+    $form->addSelect('tag', get_lang('Tags'), $tagOptions, ['placeholder' => get_lang('Please select an option')]);
 }
 
 $form->addButtonSearch(get_lang('Search'));
@@ -197,7 +197,7 @@ $tpl->assign('post_url', $url);
 $url = api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?';
 $tpl->assign('my_students_url', $url);
 $tpl->assign('pagination', $pagination);
-$tpl->assign('care_title', $plugin->get_lang('CareDetailView'));
+$tpl->assign('care_title', $plugin->get_lang('Student care detail view'));
 $content = $tpl->fetch('/'.$plugin->get_name().'/view/my_students.html.twig');
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();

+ 1 - 1
plugin/studentfollowup/post.php

@@ -130,7 +130,7 @@ $tpl->assign(
 );
 $tpl->assign('information_icon', Display::return_icon('info.png'));
 $tpl->assign('student_info', api_get_user_info($studentId));
-$tpl->assign('care_title', $plugin->get_lang('CareDetailView'));
+$tpl->assign('care_title', $plugin->get_lang('Student care detail view'));
 
 $content = $tpl->fetch('/'.$plugin->get_name().'/view/post.html.twig');
 // Assign into content

+ 1 - 1
plugin/studentfollowup/posts.php

@@ -74,7 +74,7 @@ $tpl->assign('post_url', $url);
 $tpl->assign('information_icon', Display::return_icon('info.png'));
 $tpl->assign('student_info', api_get_user_info($studentId));
 $tpl->assign('pagination', $pagination);
-$tpl->assign('care_title', $plugin->get_lang('CareDetailView'));
+$tpl->assign('care_title', $plugin->get_lang('Student care detail view'));
 $content = $tpl->fetch('/'.$plugin->get_name().'/view/posts.html.twig');
 // Assign into content
 $tpl->assign('content', $content);

+ 1 - 1
plugin/surveyexportcsv/SurveyExportCsvPlugin.php

@@ -64,7 +64,7 @@ class SurveyExportCsvPlugin extends Plugin
         }
 
         return Display::url(
-            Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), [], $iconSize),
+            Display::return_icon('export_csv.png', get_lang('CSV export'), [], $iconSize),
             api_get_path(WEB_PLUGIN_PATH).'surveyexportcsv/export.php?survey='.$surveyId.'&'.api_get_cidreq()
         );
     }

+ 6 - 6
plugin/surveyexportcsv/start.php

@@ -20,18 +20,18 @@ $table = new SortableTable(
 $table->set_additional_parameters(['cidReq' => $courseCode]);
 $table->set_header(0, '', false);
 $table->setHideColumn(0);
-$table->set_header(1, get_lang('SurveyName'));
-$table->set_header(2, get_lang('SurveyCode'), true, ['class' => 'text-center'], ['class' => 'text-center']);
-$table->set_header(3, get_lang('NumberOfQuestions'), true, ['class' => 'text-right'], ['class' => 'text-right']);
+$table->set_header(1, get_lang('Survey name'));
+$table->set_header(2, get_lang('Code'), true, ['class' => 'text-center'], ['class' => 'text-center']);
+$table->set_header(3, get_lang('Questions'), true, ['class' => 'text-right'], ['class' => 'text-right']);
 $table->set_header(4, get_lang('Author'));
-$table->set_header(5, get_lang('AvailableFrom'), true, ['class' => 'text-center'], ['class' => 'text-center']);
-$table->set_header(6, get_lang('AvailableUntil'), true, ['class' => 'text-center'], ['class' => 'text-center']);
+$table->set_header(5, get_lang('Available from'), true, ['class' => 'text-center'], ['class' => 'text-center']);
+$table->set_header(6, get_lang('Until'), true, ['class' => 'text-center'], ['class' => 'text-center']);
 $table->set_header(7, get_lang('Invite'), true, ['class' => 'text-right'], ['class' => 'text-right']);
 $table->set_header(8, get_lang('Anonymous'), true, ['class' => 'text-center'], ['class' => 'text-center']);
 $table->set_column_filter(8, ['SurveyUtil', 'anonymous_filter']);
 
 if (api_get_configuration_value('allow_mandatory_survey')) {
-    $table->set_header(9, get_lang('IsMandatory'), true, ['class' => 'text-center'], ['class' => 'text-center']);
+    $table->set_header(9, get_lang('Mandatory?'), true, ['class' => 'text-center'], ['class' => 'text-center']);
     $table->set_header(10, get_lang('Export'), false, ['class' => 'text-center'], ['class' => 'text-center']);
     $table->set_column_filter(10, ['SurveyExportCsvPlugin', 'filterModify']);
 } else {

+ 1 - 1
plugin/surveyexporttxt/export.php

@@ -70,7 +70,7 @@ foreach ($questionsData as $questionData) {
 if (count($parts) < 2) {
     api_not_allowed(
         true,
-        Display::return_message(get_lang('NoData'), 'warning')
+        Display::return_message(get_lang('No data available'), 'warning')
     );
 }
 

+ 6 - 6
plugin/surveyexporttxt/start.php

@@ -20,18 +20,18 @@ $table = new SortableTable(
 $table->set_additional_parameters(['cidReq' => $courseCode]);
 $table->set_header(0, '', false);
 $table->setHideColumn(0);
-$table->set_header(1, get_lang('SurveyName'));
-$table->set_header(2, get_lang('SurveyCode'), true, ['class' => 'text-center'], ['class' => 'text-center']);
-$table->set_header(3, get_lang('NumberOfQuestions'), true, ['class' => 'text-right'], ['class' => 'text-right']);
+$table->set_header(1, get_lang('Survey name'));
+$table->set_header(2, get_lang('Code'), true, ['class' => 'text-center'], ['class' => 'text-center']);
+$table->set_header(3, get_lang('Questions'), true, ['class' => 'text-right'], ['class' => 'text-right']);
 $table->set_header(4, get_lang('Author'));
-$table->set_header(5, get_lang('AvailableFrom'), true, ['class' => 'text-center'], ['class' => 'text-center']);
-$table->set_header(6, get_lang('AvailableUntil'), true, ['class' => 'text-center'], ['class' => 'text-center']);
+$table->set_header(5, get_lang('Available from'), true, ['class' => 'text-center'], ['class' => 'text-center']);
+$table->set_header(6, get_lang('Until'), true, ['class' => 'text-center'], ['class' => 'text-center']);
 $table->set_header(7, get_lang('Invite'), true, ['class' => 'text-right'], ['class' => 'text-right']);
 $table->set_header(8, get_lang('Anonymous'), true, ['class' => 'text-center'], ['class' => 'text-center']);
 $table->set_column_filter(8, ['SurveyUtil', 'anonymous_filter']);
 
 if (api_get_configuration_value('allow_mandatory_survey')) {
-    $table->set_header(9, get_lang('IsMandatory'), true, ['class' => 'text-center'], ['class' => 'text-center']);
+    $table->set_header(9, get_lang('Mandatory?'), true, ['class' => 'text-center'], ['class' => 'text-center']);
     $table->set_header(10, get_lang('Export'), false, ['class' => 'text-center'], ['class' => 'text-center']);
     $table->set_column_filter(10, ['SurveyExportTxtPlugin', 'filterModify']);
 } else {

+ 1 - 1
plugin/vchamilo/views/editinstance.php

@@ -53,7 +53,7 @@ if ($data = $form->get_data()) {
             unset($data->vid);
 
             Database::update('vchamilo', (array) $data, ['id = ?' => $id], false);
-            Display::addFlash(Display::return_message(get_lang('Updated')));
+            Display::addFlash(Display::return_message(get_lang('Update successful')));
             Virtual::redirect(api_get_path(WEB_PLUGIN_PATH).'vchamilo/views/manage.php');
             break;
     }

+ 1 - 1
plugin/vchamilo/views/editinstance_form.php

@@ -390,7 +390,7 @@ class InstanceForm extends ChamiloForm
             $encryptMethod = $form->addElement(
                 'select',
                 'password_encryption',
-                get_lang('EncryptMethodUserPass'),
+                get_lang('Encryption method'),
                 $encryptList
             );
             $encryptMethod->freeze();

+ 1 - 1
plugin/vchamilo/views/import.php

@@ -49,7 +49,7 @@ $encryptList = Virtual::getEncryptList();
 
 $form->addSelect(
     'password_encryption',
-    get_lang('EncryptMethodUserPass'),
+    get_lang('Encryption method'),
     $encryptList
 );
 

+ 3 - 3
plugin/vchamilo/views/manage.php

@@ -72,14 +72,14 @@ foreach ($instances as $instance) {
     $cmd .= '&nbsp;<a href="'.$thisurl.'?what=snapshotinstance&vid='.$instance->id.'" title="'.$plugin->get_lang('snapshotinstance').'">
         '.Display::returnFontAwesomeIcon('camera', 2).'</a>';
 
-    $cmd .= '<a href="'.$thisurl.'?what=upgrade&vids[]='.$instance->id.'" title="'.$plugin->get_lang('Upgrade').'">
+    $cmd .= '<a href="'.$thisurl.'?what=upgrade&vids[]='.$instance->id.'" title="'.$plugin->get_lang('Upgrade Chamilo').'">
          &nbsp;'.Display::returnFontAwesomeIcon('wrench', 2).' </a>';
 
     if (!$instance->visible) {
-        $cmd .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="'.$thisurl.'?what=fulldeleteinstances&vids[]='.$instance->id.'" title="'.$plugin->get_lang('destroyinstances').'">
+        $cmd .= '<a onclick="javascript:if(!confirm(\''.get_lang('Are you sure you want to delete').'\')) return false;" href="'.$thisurl.'?what=fulldeleteinstances&vids[]='.$instance->id.'" title="'.$plugin->get_lang('destroyinstances').'">
         &nbsp;'.Display::returnFontAwesomeIcon('remove', 2).' </a>';
     } else {
-        $cmd .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="'.$thisurl.'?what=deleteinstances&vids[]='.$instance->id.'" title="'.$plugin->get_lang('deleteinstances').'">
+        $cmd .= '<a onclick="javascript:if(!confirm(\''.get_lang('Are you sure you want to delete').'\')) return false;" href="'.$thisurl.'?what=deleteinstances&vids[]='.$instance->id.'" title="'.$plugin->get_lang('deleteinstances').'">
          &nbsp;'.Display::returnFontAwesomeIcon('remove', 2).' </a>';
     }
 

+ 2 - 2
plugin/vchamilo/views/upgrade.php

@@ -20,7 +20,7 @@ $canBeUpgraded = Virtual::canBeUpgraded($instance);
 
 $form = new FormValidator('upgrade', 'post', api_get_self().'?vid='.$id);
 // Database host.
-$form->addHeader(get_lang('Upgrade'));
+$form->addHeader(get_lang('Upgrade Chamilo Chamilo Chamilo'));
 
 $form->addText('root_web', $plugin->get_lang('rootweb'));
 $form->addText('db_host', $plugin->get_lang('dbhost'));
@@ -33,7 +33,7 @@ if ($canBeUpgraded) {
     $form->addLabel(get_lang('To'), api_get_setting('chamilo_database_version'));
     $form->addButtonSave(get_lang('Upgrade'));
 } else {
-    Display::addFlash(Display::return_message(get_lang('NothingToUpgrade')));
+    Display::addFlash(Display::return_message(get_lang('Nothing to upgrade')));
 }
 
 $form->freeze();

+ 4 - 4
plugin/whispeakauth/ajax/record_audio.php

@@ -24,7 +24,7 @@ if ($isEnrollment) {
 }
 
 if (!$isAllowed) {
-    echo Display::return_message(get_lang('NotAllowed'), 'error');
+    echo Display::return_message(get_lang('You are not allowed to see this page. Either your connection has expired or you are trying to access a page for which you do not have the sufficient privileges.'), 'error');
 
     exit;
 }
@@ -43,7 +43,7 @@ if ($isAuthentify) {
 }
 
 if (empty($user)) {
-    echo Display::return_message(get_lang('NoUser'), 'error');
+    echo Display::return_message(get_lang('No user'), 'error');
 
     exit;
 }
@@ -51,7 +51,7 @@ if (empty($user)) {
 $path = api_upload_file('whispeakauth', $_FILES['audio'], $user->getId());
 
 if (false === $path) {
-    echo Display::return_message(get_lang('UploadError'), 'error');
+    echo Display::return_message(get_lang('Upload failed, please check maximum file size limits and folder rights.'), 'error');
 
     exit;
 }
@@ -115,7 +115,7 @@ if ($isAuthentify) {
     $success = (bool) $result['audio'][0]['result'];
 
     if (!$success) {
-        echo Display::return_message($plugin->get_lang('TryAgain'), 'warning');
+        echo Display::return_message($plugin->get_lang('Try again'), 'warning');
 
         exit;
     }

+ 22 - 24
src/CoreBundle/Controller/UserPortalController.php

@@ -14,8 +14,6 @@ use Symfony\Component\Routing\Annotation\Route;
  * author Julio Montoya <gugli100@gmail.com>.
  *
  * @Route("/userportal")
- *
- * @package Chamilo\CoreBundle\Controller
  */
 class UserPortalController extends BaseController
 {
@@ -39,7 +37,7 @@ class UserPortalController extends BaseController
         }
 
         // Displaying the header.
-        $tool_name = $courseValidation ? get_lang('CreateCourseRequest') : get_lang('CreateSite');
+        $tool_name = $courseValidation ? get_lang('Create a course request') : get_lang('Add a new course');
 
         if (api_get_setting('course.allow_users_to_create_courses') === 'false' &&
             !api_is_platform_admin()
@@ -65,15 +63,15 @@ class UserPortalController extends BaseController
             'text',
             'title',
             [
-                get_lang('CourseName'),
-                get_lang('Ex'),
+                get_lang('Course name'),
+                get_lang('e.g. <i>Innovation management</i>'),
             ],
             [
                 'id' => 'title',
             ]
         );
         $form->applyFilter('title', 'html_filter');
-        $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
+        $form->addRule('title', get_lang('Required field'), 'required');
 
         $form->addButtonAdvancedSettings('advanced_params');
         $form->addElement(
@@ -87,7 +85,7 @@ class UserPortalController extends BaseController
         $form->addElement(
             'select_ajax',
             'category_code',
-            get_lang('CourseFaculty'),
+            get_lang('Category'),
             null,
             ['url' => $url]
         );
@@ -96,20 +94,20 @@ class UserPortalController extends BaseController
         $form->addText(
             'wanted_code',
             [
-                get_lang('Code'),
-                get_lang('OnlyLettersAndNumbers'),
+                get_lang('Course code'),
+                get_lang('Only letters (a-z) and numbers (0-9)'),
             ],
             '',
             [
                 'maxlength' => \CourseManager::MAX_COURSE_LENGTH_CODE,
                 'pattern' => '[a-zA-Z0-9]+',
-                'title' => get_lang('OnlyLettersAndNumbers'),
+                'title' => get_lang('Only letters (a-z) and numbers (0-9)'),
             ]
         );
         $form->applyFilter('wanted_code', 'html_filter');
         $form->addRule(
             'wanted_code',
-            get_lang('Max'),
+            get_lang('Maximum'),
             'maxlength',
             \CourseManager::MAX_COURSE_LENGTH_CODE
         );
@@ -136,7 +134,7 @@ class UserPortalController extends BaseController
             $form->addElement(
                 'textarea',
                 'target_audience',
-                get_lang('TargetAudience'),
+                get_lang('Target audience'),
                 ['rows' => '3']
             );
         }
@@ -145,7 +143,7 @@ class UserPortalController extends BaseController
         $form->addElement(
             'select_language',
             'course_language',
-            get_lang('Ln'),
+            get_lang('Language'),
             [],
             ['style' => 'width:150px']
         );
@@ -156,7 +154,7 @@ class UserPortalController extends BaseController
             'checkbox',
             'exemplary_content',
             null,
-            get_lang('FillWithExemplaryContent')
+            get_lang('FillWithe.g. <i>Innovation management</i>emplaryContent')
         );
 
         if ($courseValidation) {
@@ -182,12 +180,12 @@ class UserPortalController extends BaseController
                     'checkbox',
                     'legal',
                     null,
-                    get_lang('IAcceptTermsAndConditions'),
+                    get_lang('I have read and I accept the Terms and Conditions'),
                     1
                 );
                 $form->addRule(
                     'legal',
-                    get_lang('YouHaveToAcceptTermsAndConditions'),
+                    get_lang('You have to accept our Terms and Conditions to proceed.'),
                     'required'
                 );
                 // Link to terms and conditions.
@@ -199,7 +197,7 @@ class UserPortalController extends BaseController
                     </script>
                 ';
                 $link_terms_and_conditions .= \Display::url(
-                    get_lang('ReadTermsAndConditions'),
+                    get_lang('Read the Terms and Conditions'),
                     '#',
                     ['onclick' => "javascript:MM_openBrWindow('$terms_and_conditions_url', 'Conditions', 'scrollbars=yes, width=800');"]
                 );
@@ -215,8 +213,8 @@ class UserPortalController extends BaseController
                 'select_ajax',
                 'course_template',
                 [
-                    get_lang('CourseTemplate'),
-                    get_lang('PickACourseAsATemplateForThisNewCourse'),
+                    get_lang('Course template'),
+                    get_lang('Pick a course as template for this new course'),
                 ],
                 null,
                 ['url' => api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=search_course']
@@ -229,7 +227,7 @@ class UserPortalController extends BaseController
         $form->addButtonCreate(
             $courseValidation ? get_lang(
                 'CreateThisCourseRequest'
-            ) : get_lang('CreateCourseArea')
+            ) : get_lang('Create this course')
         );
 
         // Set default values.
@@ -338,7 +336,7 @@ class UserPortalController extends BaseController
                         \Display::return_message(
                             'div',
                             \Display::url(
-                                get_lang('Enter'),
+                                get_lang('Back to courses list'),
                                 api_get_path(WEB_PATH).'user_portal.php',
                                 ['class' => 'btn btn-default']
                             ),
@@ -346,7 +344,7 @@ class UserPortalController extends BaseController
                         );
                     } else {
                         \Display::return_message(
-                            get_lang('CourseRequestCreationFailed'),
+                            get_lang('The course request has not been created due to an internal error.'),
                             'error',
                             false
                         );
@@ -356,7 +354,7 @@ class UserPortalController extends BaseController
                 }
             } else {
                 \Display::return_message(
-                    get_lang('CourseCodeAlreadyExists'),
+                    get_lang('CourseCourse codeAlreadye.g. <i>Innovation management</i>ists'),
                     'error',
                     false
                 );
@@ -365,7 +363,7 @@ class UserPortalController extends BaseController
             }
         } else {
             if (!$courseValidation) {
-                $this->addFlash('warning', get_lang('Explanation'));
+                $this->addFlash('warning', get_lang('e.g. <i>Innovation management</i>planation'));
             }
             // Display the form.
             $content = $form->returnForm();

+ 1 - 3
src/CourseBundle/Component/CourseCopy/Resources/ToolIntro.php

@@ -7,8 +7,6 @@ namespace Chamilo\CourseBundle\Component\CourseCopy\Resources;
  * A WWW-link from the Links-module in a Chamilo-course.
  *
  * @author Bart Mollet <bart.mollet@hogent.be>
- *
- * @package chamilo.backup
  */
 class ToolIntro extends Resource
 {
@@ -87,7 +85,7 @@ class ToolIntro extends Resource
             default:
                 $lang_id = ucfirst($this->id); // This is a wild guess.
         }
-        echo '<strong>'.get_lang($lang_id, '').':</strong><br />';
+        echo '<strong>'.get_lang($lang_id).':</strong><br />';
         echo $this->intro_text;
     }
 }

+ 3 - 4
src/CourseBundle/Controller/Home/HomeController.php

@@ -14,9 +14,8 @@ use Symfony\Component\Routing\Annotation\Route;
 /**
  * Class HomeController.
  *
- * @package Chamilo\CourseBundle\Controller\Home
- *
  * @author Julio Montoya <gugli100@gmail.com>
+ *
  * @Route("/")
  */
 class HomeController extends ToolBaseController
@@ -73,7 +72,7 @@ class HomeController extends ToolBaseController
                 $userId = $this->getUser()->getId();
                 $autoreg = $request->get('autoreg');
                 if ($autoreg == 1) {
-                    \CourseManager::subscribe_user(
+                    \CourseManager::subscribeUser(
                         $userId,
                         $courseCode,
                         STUDENT
@@ -140,7 +139,7 @@ class HomeController extends ToolBaseController
             $isVisible = \DocumentManager::is_visible_by_id($docId, $courseInfo, $sessionId, api_get_user_id());
             $documentData = \DocumentManager::get_document_data_by_id($docId, $courseCode);
             $filePath = $documentData['absolute_path'];
-            event_download($filePath);
+            \Event::event_download($filePath);
         }
 
         if (!api_is_allowed_to_edit() && !$isVisible) {