소스 검색

Translation: Use full variable string

Julio Montoya 5 년 전
부모
커밋
e47df0e7ce

+ 1 - 1
src/CoreBundle/Component/Editor/CkEditor/CkEditor.php

@@ -155,7 +155,7 @@ class CkEditor extends Editor
     {
         return [
             [
-                'title' => get_lang('EmptyTemplate'),
+                'title' => get_lang('Blank template'),
                 'description' => null,
                 'image' => api_get_path(WEB_PUBLIC_PATH).'img/template_thumb/empty.gif',
                 'html' => '

+ 1 - 1
src/CoreBundle/Component/Editor/Driver/CourseDriver.php

@@ -36,7 +36,7 @@ class CourseDriver extends Driver implements DriverInterface
 
             // Creates shared folder
             if (!file_exists($baseDir.'/shared_folder')) {
-                $title = get_lang('UserFolders');
+                $title = get_lang('Folders of users');
                 $folderName = '/shared_folder';
                 $visibility = 0;
                 create_unexisting_directory(

+ 1 - 1
src/CoreBundle/Component/Editor/Driver/CourseUserDriver.php

@@ -20,7 +20,7 @@ class CourseUserDriver extends CourseDriver
         if (!empty($this->connector->course)) {
             $userId = api_get_user_id();
             $path = 'shared_folder/sf_user_'.$userId;
-            $alias = $this->connector->course['code'].' '.get_lang('CourseUserDocument');
+            $alias = $this->connector->course['code'].' '.get_lang('Course user document');
 
             if (!empty($userId)) {
                 return [

+ 1 - 1
src/CoreBundle/Component/Editor/Driver/PersonalDriver.php

@@ -49,7 +49,7 @@ class PersonalDriver extends Driver implements DriverInterface
 
                 $driver = [
                     'driver' => 'PersonalDriver',
-                    'alias' => get_lang('MyFiles'),
+                    'alias' => get_lang('My files'),
                     'path' => $dir.'my_files',
                     'URL' => $dirWeb.'my_files',
                     'accessControl' => [$this, 'access'],

+ 67 - 67
src/CoreBundle/Controller/Admin/AdminController.php

@@ -82,19 +82,19 @@ class AdminController extends BaseController
             $items = [
                 [
                     'url' => $adminUrl.'user_list.php',
-                    'label' => get_lang('UserList'),
+                    'label' => get_lang('User list'),
                 ],
                 [
                     'url' => $adminUrl.'user_add.php',
-                    'label' => get_lang('AddUsers'),
+                    'label' => get_lang('Add a user'),
                 ],
                 [
                     'url' => $adminUrl.'user_export.php',
-                    'label' => get_lang('ExportUserListXMLCSV'),
+                    'label' => get_lang('ExportUser listXMLCSV'),
                 ],
                 [
                     'url' => $adminUrl.'user_import.php',
-                    'label' => get_lang('ImportUserListXMLCSV'),
+                    'label' => get_lang('ImportUser listXMLCSV'),
                 ],
             ];
             if (isset($extAuthSource) && isset($extAuthSource['ldap']) && count(
@@ -103,26 +103,26 @@ class AdminController extends BaseController
             ) {
                 $items[] = [
                     'url' => $adminUrl.'ldap_users_list.php',
-                    'label' => get_lang('ImportLDAPUsersIntoPlatform'),
+                    'label' => get_lang('Import LDAP users into the platform'),
                 ];
             }
             $items[] = [
                 'url' => $adminUrl.'extra_fields.php?type=user',
-                'label' => get_lang('ManageUserFields'),
+                'label' => get_lang('Profiling'),
             ];
         } else {
             $items = [
                 [
                     'url' => $adminUrl.'user_list.php',
-                    'label' => get_lang('UserList'),
+                    'label' => get_lang('User list'),
                 ],
                 [
                     'url' => $adminUrl.'user_add.php',
-                    'label' => get_lang('AddUsers'),
+                    'label' => get_lang('Add a user'),
                 ],
                 [
                     'url' => $adminUrl.'user_import.php',
-                    'label' => get_lang('ImportUserListXMLCSV'),
+                    'label' => get_lang('ImportUser listXMLCSV'),
                 ],
             ];
         }
@@ -154,62 +154,62 @@ class AdminController extends BaseController
             $items = [];
             $items[] = [
                 'url' => $adminUrl.'course_list.php',
-                'label' => get_lang('CourseList'),
+                'label' => get_lang('Course list'),
             ];
 
             if (api_get_setting('course.course_validation') != 'true') {
                 $items[] = [
                     'url' => $adminUrl.'course_add.php',
-                    'label' => get_lang('AddCourse'),
+                    'label' => get_lang('Create a course'),
                 ];
             } else {
                 $items[] = [
                     'url' => $adminUrl.'course_request_review.php',
-                    'label' => get_lang('ReviewCourseRequests'),
+                    'label' => get_lang('Review incoming course requests'),
                 ];
                 $items[] = [
                     'url' => $adminUrl.'course_request_accepted.php',
-                    'label' => get_lang('AcceptedCourseRequests'),
+                    'label' => get_lang('Accepted course requests'),
                 ];
                 $items[] = [
                     'url' => $adminUrl.'course_request_rejected.php',
-                    'label' => get_lang('RejectedCourseRequests'),
+                    'label' => get_lang('Rejected course requests'),
                 ];
             }
 
             $items[] = [
                 'url' => $adminUrl.'course_export.php',
-                'label' => get_lang('ExportCourses'),
+                'label' => get_lang('Export courses'),
             ];
             $items[] = [
                 'url' => $adminUrl.'course_import.php',
-                'label' => get_lang('ImportCourses'),
+                'label' => get_lang('Import courses list'),
             ];
             $items[] = [
                 'url' => $adminUrl.'course_category.php',
-                'label' => get_lang('AdminCategories'),
+                'label' => get_lang('Courses categories'),
             ];
             $items[] = [
                 'url' => $adminUrl.'subscribe_user2course.php',
-                'label' => get_lang('AddUsersToACourse'),
+                'label' => get_lang('Add a userToACourse'),
             ];
             $items[] = [
                 'url' => $adminUrl.'course_user_import.php',
-                'label' => get_lang('ImportUsersToACourse'),
+                'label' => get_lang('Import users list'),
             ];
             $items[] = [
                 'url' => $adminUrl.'extra_fields.php?type=course',
-                'label' => get_lang('ManageCourseFields'),
+                'label' => get_lang('Manage extra fields for courses'),
             ];
             $items[] = [
                 'url' => $adminUrl.'extra_fields.php?type=question',
-                'label' => get_lang('ManageQuestionFields'),
+                'label' => get_lang('Manage extra fields for questions'),
             ];
 
             /*if (api_get_setting('gradebook.gradebook_enable_grade_model') == 'true') {
                 $items[] = array(
                     'url' => $adminUrl.'grade_models.php',
-                    'label' => get_lang('GradeModel'),
+                    'label' => get_lang('Grading model'),
                 );
             }*/
 
@@ -219,21 +219,21 @@ class AdminController extends BaseController
             ) {
                 $items[] = [
                     'url' => $adminUrl.'ldap_import_students.php',
-                    'label' => get_lang('ImportLDAPUsersIntoCourse'),
+                    'label' => get_lang('Import LDAP users into a course'),
                 ];
             }
             $blocks['courses']['items'] = $items;
             $blocks['courses']['extra'] = null;
 
-            /* Platform */
+            /* Portal */
             $blocks['platform']['icon'] = \Display::return_icon(
                 'platform.png',
-                get_lang('Platform'),
+                get_lang('Portal'),
                 [],
                 ICON_SIZE_MEDIUM,
                 false
             );
-            $blocks['platform']['label'] = api_ucfirst(get_lang('Platform'));
+            $blocks['platform']['label'] = api_ucfirst(get_lang('Portal'));
 
             $form = $this->getSearchForm($adminUrl.'settings.php');
             $form->addElement('hidden', 'category', 'search_setting');
@@ -245,7 +245,7 @@ class AdminController extends BaseController
                 'url' => $this->generateUrl(
                     'admin_settings'
                 ),
-                'label' => get_lang('PlatformConfigSettings'),
+                'label' => get_lang('PortalConfigSettings'),
             ];
             $items[] = [
                 'url' => $adminUrl.'settings.php?category=Plugins',
@@ -257,21 +257,21 @@ class AdminController extends BaseController
             ];
             $items[] = [
                 'url' => $adminUrl.'system_announcements.php',
-                'label' => get_lang('SystemAnnouncements'),
+                'label' => get_lang('Portal news'),
             ];
             $items[] = [
                 'url' => api_get_path(
                         WEB_CODE_PATH
                     ).'calendar/agenda_js.php?type=admin',
-                'label' => get_lang('GlobalAgenda'),
+                'label' => get_lang('Global agenda'),
             ];
             $items[] = [
                 'url' => $adminUrl.'configure_homepage.php',
-                'label' => get_lang('ConfigureHomePage'),
+                'label' => get_lang('Edit portal homepage'),
             ];
             $items[] = [
                 'url' => $adminUrl.'configure_inscription.php',
-                'label' => get_lang('ConfigureInscription'),
+                'label' => get_lang('Setting the registration page'),
             ];
             $items[] = [
                 'url' => $adminUrl.'statistics/index.php',
@@ -288,7 +288,7 @@ class AdminController extends BaseController
                 if (api_is_global_platform_admin()) {
                     $items[] = [
                         'url' => $adminUrl.'access_urls.php',
-                        'label' => get_lang('ConfigureMultipleAccessURLs'),
+                        'label' => get_lang('Configure multiple access URL'),
                     ];
                 }
             }
@@ -298,22 +298,22 @@ class AdminController extends BaseController
             ) {
                 $items[] = [
                     'url' => $adminUrl.'legal_add.php',
-                    'label' => get_lang('TermsAndConditions'),
+                    'label' => get_lang('Terms and Conditions'),
                 ];
             }
             $blocks['platform']['items'] = $items;
             $blocks['platform']['extra'] = null;
         }
 
-        /* Sessions */
+        /* Course sessions */
         $blocks['sessions']['icon'] = \Display::return_icon(
             'session.png',
-            get_lang('Sessions'),
+            get_lang('Course sessions'),
             [],
             ICON_SIZE_MEDIUM,
             false
         );
-        $blocks['sessions']['label'] = api_ucfirst(get_lang('Sessions'));
+        $blocks['sessions']['label'] = api_ucfirst(get_lang('Course sessions'));
         $search_form = $this->getSearchForm(
             api_get_path(WEB_CODE_PATH).'session/session_list.php'
         )->return_form();
@@ -323,21 +323,21 @@ class AdminController extends BaseController
             'url' => api_get_path(
                     WEB_CODE_PATH
                 ).'session/session_list.php',
-            'label' => get_lang('ListSession'),
+            'label' => get_lang('Training sessions list'),
         ];
         $items[] = [
             'url' => api_get_path(
                     WEB_CODE_PATH
                 ).'session/session_add.php',
-            'label' => get_lang('AddSession'),
+            'label' => get_lang('Add a training session'),
         ];
         $items[] = [
             'url' => api_get_path(WEB_CODE_PATH).'session/session_category_list.php',
-            'label' => get_lang('ListSessionCategory'),
+            'label' => get_lang('Training sessions listCategory'),
         ];
         $items[] = [
             'url' => api_get_path(WEB_CODE_PATH).'session/session_import.php',
-            'label' => get_lang('ImportSessionListXMLCSV'),
+            'label' => get_lang('Import sessions list'),
         ];
         if (isset($extAuthSource) && isset($extAuthSource['ldap']) && count(
                 $extAuthSource['ldap']
@@ -345,16 +345,16 @@ class AdminController extends BaseController
         ) {
             $items[] = [
                 'url' => $adminUrl.'ldap_import_students_to_session.php',
-                'label' => get_lang('ImportLDAPUsersIntoSession'),
+                'label' => get_lang('Import LDAP users into a session'),
             ];
         }
         $items[] = [
             'url' => api_get_path(WEB_CODE_PATH).'session/session_export.php',
-            'label' => get_lang('ExportSessionListXMLCSV'),
+            'label' => get_lang('Export sessions list'),
         ];
         $items[] = [
             'url' => $adminUrl.'../coursecopy/copy_course_session.php',
-            'label' => get_lang('CopyFromCourseInSessionToAnotherSession'),
+            'label' => get_lang('Copy from course in session to another session'),
         ];
 
         if (api_is_platform_admin()) {
@@ -363,12 +363,12 @@ class AdminController extends BaseController
             )) { // option only visible in development mode. Enable through code if required
                 $items[] = [
                     'url' => $adminUrl.'user_move_stats.php',
-                    'label' => get_lang('MoveUserStats'),
+                    'label' => get_lang('Move users results from/to a session'),
                 ];
             }
             $items[] = [
                 'url' => $adminUrl.'career_dashboard.php',
-                'label' => get_lang('CareersAndPromotions'),
+                'label' => get_lang('Careers and promotions'),
             ];
         }
 
@@ -378,7 +378,7 @@ class AdminController extends BaseController
         ];
         $items[] = [
             'url' => $adminUrl.'extra_fields.php?type=session',
-            'label' => get_lang('ManageSessionFields'),
+            'label' => get_lang('Manage session fields'),
         ];
 
         $blocks['sessions']['items'] = $items;
@@ -398,30 +398,30 @@ class AdminController extends BaseController
             $items = [];
             $items[] = [
                 'url' => $adminUrl.'special_exports.php',
-                'label' => get_lang('SpecialExports'),
+                'label' => get_lang('Special exports'),
             ];
             $dbPath = api_get_configuration_value('db_admin_path');
             if (!empty($dbPath)) {
                 $items[] = [
                     'url' => $dbPath,
-                    'label' => get_lang('AdminDatabases').' ('.get_lang('DBManagementOnlyForServerAdmin').') ',
+                    'label' => get_lang('Databases (phpMyAdmin)').' ('.get_lang('Database management is only available for the server administrator').') ',
                 ];
             }
             $items[] = [
                 'url' => $adminUrl.'system_status.php',
-                'label' => get_lang('SystemStatus'),
+                'label' => get_lang('System status'),
             ];
             if (is_dir(api_get_path(SYS_TEST_PATH).'datafiller/')) {
                 $items[] = [
                     'url' => $adminUrl.'filler.php',
-                    'label' => get_lang('DataFiller'),
+                    'label' => get_lang('Data filler'),
                 ];
             }
             $items[] = [
                 'url' => $adminUrl.'archive_cleanup.php',
-                'label' => get_lang('ArchiveDirCleanup'),
+                'label' => get_lang('Cleanup of cache and temporary files'),
             ];
-            //$items[] = array('url' => $adminUrl.'system_management.php', 'label' => get_lang('SystemManagement'));
+            //$items[] = array('url' => $adminUrl.'system_management.php', 'label' => get_lang('System Management'));
 
             $blocks['settings']['items'] = $items;
             $blocks['settings']['extra'] = null;
@@ -440,25 +440,25 @@ class AdminController extends BaseController
                 $blocks['skills']['label'] = get_lang('Skills');
 
                 $items = [];
-                //$items[] = array('url' => $adminUrl.'skills.php',           'label' => get_lang('SkillsTree'));
+                //$items[] = array('url' => $adminUrl.'skills.php',           'label' => get_lang('Skills Tree'));
                 $items[] = [
                     'url' => $adminUrl.'skills_wheel.php',
-                    'label' => get_lang('SkillsWheel'),
+                    'label' => get_lang('Skills wheel'),
                 ];
                 $items[] = [
                     'url' => $adminUrl.'skills_import.php',
-                    'label' => get_lang('SkillsImport'),
+                    'label' => get_lang('Skills import'),
                 ];
-                //$items[] = array('url' => $adminUrl.'skills_profile.php',   'label' => get_lang('SkillsProfile'));
+                //$items[] = array('url' => $adminUrl.'skills_profile.php',   'label' => get_lang('Skills Profile'));
                 $items[] = [
                     'url' => api_get_path(
                             WEB_CODE_PATH
                         ).'social/skills_ranking.php',
-                    'label' => get_lang('SkillsRanking'),
+                    'label' => get_lang('Skills ranking'),
                 ];
                 $items[] = [
                     'url' => $adminUrl.'skills_gradebook.php',
-                    'label' => get_lang('SkillsAndGradebooks'),
+                    'label' => get_lang('Skills and assessments'),
                 ];
                 $blocks['skills']['items'] = $items;
                 $blocks['skills']['extra'] = null;
@@ -478,39 +478,39 @@ class AdminController extends BaseController
             $items = [];
             $items[] = [
                 'url' => 'http://www.chamilo.org/',
-                'label' => get_lang('ChamiloHomepage'),
+                'label' => get_lang('Chamilo homepage'),
             ];
             $items[] = [
                 'url' => 'http://www.chamilo.org/forum',
-                'label' => get_lang('ChamiloForum'),
+                'label' => get_lang('Chamilo forum'),
             ];
             $items[] = [
                 'url' => '../../documentation/installation_guide.html',
-                'label' => get_lang('InstallationGuide'),
+                'label' => get_lang('Installation guide'),
             ];
             $items[] = [
                 'url' => '../../documentation/changelog.html',
-                'label' => get_lang('ChangesInLastVersion'),
+                'label' => get_lang('Changes in last version'),
             ];
             $items[] = [
                 'url' => '../../documentation/credits.html',
-                'label' => get_lang('ContributorsList'),
+                'label' => get_lang('Contributors list'),
             ];
             $items[] = [
                 'url' => '../../documentation/security.html',
-                'label' => get_lang('SecurityGuide'),
+                'label' => get_lang('Security guide'),
             ];
             $items[] = [
                 'url' => '../../documentation/optimization.html',
-                'label' => get_lang('OptimizationGuide'),
+                'label' => get_lang('Optimization guide'),
             ];
             $items[] = [
                 'url' => 'http://www.chamilo.org/extensions',
-                'label' => get_lang('ChamiloExtensions'),
+                'label' => get_lang('Chamilo extensions'),
             ];
             $items[] = [
                 'url' => 'http://www.chamilo.org/en/providers',
-                'label' => get_lang('ChamiloOfficialServicesProviders'),
+                'label' => get_lang('Chamilo official services providers'),
             ];
 
             $blocks['chamilo']['items'] = $items;

+ 1 - 1
src/CoreBundle/EventListener/LegacyListener.php

@@ -166,7 +166,7 @@ class LegacyListener
             $rightFloatMenu = '';
             $iconBug = \Display::return_icon(
                 'bug.png',
-                get_lang('ReportABug'),
+                get_lang('Report a bug'),
                 [],
                 ICON_SIZE_LARGE
             );

+ 17 - 17
src/CoreBundle/Framework/PageController.php

@@ -45,7 +45,7 @@ class PageController
         if (!empty($home_menu)) {
             $home_menu_content = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
             $this->show_right_block(
-                get_lang('MenuGeneral'),
+                get_lang('Help'),
                 null,
                 'help_block',
                 ['content' => $home_menu_content]
@@ -63,14 +63,14 @@ class PageController
         if (api_get_setting('skill.allow_skills_tool') == 'true') {
             $content = [];
             $content[] = [
-                'title' => get_lang('MySkills'),
+                'title' => get_lang('My skills'),
                 'href' => api_get_path(WEB_CODE_PATH).'social/skills_wheel.php',
             ];
 
             if (api_get_setting('skill.allow_hr_skills_management') == 'true'
                 || api_is_platform_admin()) {
                 $content[] = [
-                    'title' => get_lang('ManageSkills'),
+                    'title' => get_lang('Manage skills'),
                     'href' => api_get_path(WEB_CODE_PATH).'admin/skills_wheel.php',
                 ];
             }
@@ -192,7 +192,7 @@ class PageController
             }
 
             if (empty($home_top_temp) && api_is_platform_admin()) {
-                $home_top_temp = get_lang('PortalHomepageDefaultIntroduction');
+                //$home_top_temp = get_lang('<h2>Congratulations! You have successfully installed your e-learning portal!</h2>  <p>You can now complete the installation by following three easy steps:<br /> <ol>     <li>Configure you portal by going to the administration section, and select the Portal -> <a href="main/admin/settings.php">Configuration settings</a> entry.</li>     <li>Add some life to your portal by creating users and/or training. You can do that by inviting new people to create their accounts or creating them yourself through the <a href="main/admin/">administration</a>'s Users and Training sections.</li>     <li>Edit this page through the <a href="main/admin/configure_homepage.php">Edit portal homepage</a> entry in the administration section.</li> </ol> <p>You can always find more information about this software on our website: <a href="http://www.chamilo.org">http://www.chamilo.org</a>.</p> <p>Have fun, and don't hesitate to join the community and give us feedback through <a href="http://www.chamilo.org/forum">our forum</a>.</p>');
             }
             $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
             if (!empty($open)) {
@@ -228,7 +228,7 @@ class PageController
             if (api_is_platform_admin()) {
                 $classes .= Display::tag(
                     'li',
-                    Display::url(get_lang('AddClasses'), api_get_path(WEB_CODE_PATH).'admin/usergroups.php?action=add')
+                    Display::url(get_lang('Add classes'), api_get_path(WEB_CODE_PATH).'admin/usergroups.php?action=add')
                 );
             }
             if (!empty($classes)) {
@@ -373,7 +373,7 @@ class PageController
         $resCats = Database::query($sqlGetSubCatList);
         $thereIsSubCat = false;
         if (Database::num_rows($resCats) > 0) {
-            $htmlListCat = Display::page_header(get_lang('CatList'));
+            $htmlListCat = Display::page_header(get_lang('Categories'));
             $htmlListCat .= '<ul>';
             while ($catLine = Database::fetch_array($resCats)) {
                 if ($catLine['code'] != $category) {
@@ -405,7 +405,7 @@ class PageController
                 } else {
                     $htmlTitre = '<p>';
                     if (api_get_setting('show_back_link_on_top_of_tree') == 'true') {
-                        $htmlTitre .= '<a href="'.api_get_self().'">&lt;&lt; '.get_lang('BackToHomePage').'</a>';
+                        $htmlTitre .= '<a href="'.api_get_self().'">&lt;&lt; '.get_lang('Categories Overview').'</a>';
                     }
                     if (!is_null($catLine['parent_id']) ||
                         (api_get_setting('show_back_link_on_top_of_tree') != 'true' &&
@@ -435,7 +435,7 @@ class PageController
         $courses_list_string = '';
         $courses_shown = 0;
         if ($numrows > 0) {
-            $courses_list_string .= Display::page_header(get_lang('CourseList'));
+            $courses_list_string .= Display::page_header(get_lang('Course list'));
             $courses_list_string .= "<ul>";
 
             if (api_get_user_id()) {
@@ -543,7 +543,7 @@ class PageController
                             $courses_list_string .= '<input type="image" name="unsub" src="'.api_get_path(WEB_IMG_PATH).'enroll.gif" alt="'.get_lang('Subscribe').'" />'.get_lang('Subscribe').'
                             </form>';
                         } else {
-                            $courses_list_string .= '<br />'.get_lang('SubscribingNotAllowed');
+                            $courses_list_string .= '<br />'.get_lang('Subscribing not allowed');
                         }
                     }
                     $courses_list_string .= "</li>";
@@ -557,7 +557,7 @@ class PageController
             $result .= $courses_list_string;
         }
         if ($category != '') {
-            $result .= '<p><a href="'.api_get_self().'"> '.Display :: return_icon('back.png', get_lang('BackToHomePage')).get_lang('BackToHomePage').'</a></p>';
+            $result .= '<p><a href="'.api_get_self().'"> '.Display :: return_icon('back.png', get_lang('Categories Overview')).get_lang('Categories Overview').'</a></p>';
         }
 
         return $result;
@@ -726,9 +726,9 @@ class PageController
         $html = null;
         //Showing history title
         if ($load_history) {
-            $html .= Display::page_subheader(get_lang('HistoryTrainingSession'));
+            $html .= Display::page_subheader(get_lang('Courses history'));
             if (empty($session_categories)) {
-                $html .= get_lang('YouDoNotHaveAnySessionInItsHistory');
+                $html .= get_lang('You have no session in your sessions history');
             }
         }
 
@@ -840,7 +840,7 @@ class PageController
 
                     if (!empty($session_category_start_date) && $session_category_start_date != '0000-00-00' && !empty($session_category_end_date) && $session_category_end_date != '0000-00-00') {
                         $params['subtitle'] = sprintf(
-                            get_lang('FromDateXToDateY'),
+                            get_lang('From %s to %s'),
                             $session_category['session_category']['date_start'],
                             $session_category['session_category']['date_end']
                         );
@@ -914,7 +914,7 @@ class PageController
                 )
             );
             $history = $menu->addChild(
-                get_lang('HistoryTrainingSession'),
+                get_lang('Courses history'),
                 array(
                     'route'           => 'userportal',
                     'routeParameters' => array(
@@ -986,9 +986,9 @@ class PageController
 
         // Showing history title
         if ($loadHistory) {
-            // $html .= Display::page_subheader(get_lang('HistoryTrainingSession'));
+            // $html .= Display::page_subheader(get_lang('Courses history'));
             if (empty($session_categories)) {
-                $html .= get_lang('YouDoNotHaveAnySessionInItsHistory');
+                $html .= get_lang('You have no session in your sessions history');
             }
         }
 
@@ -1168,7 +1168,7 @@ class PageController
                 $content .= '</li>';
             }
             $content .= '</ul>';
-            $this->show_right_block(get_lang('MainNavigation'), null, 'navigation_block', ['content' => $content]);
+            $this->show_right_block(get_lang('Main navigation'), null, 'navigation_block', ['content' => $content]);
         }
     }
 }

+ 2 - 2
src/CourseBundle/Component/CourseCopy/CourseBuilder.php

@@ -977,7 +977,7 @@ class CourseBuilder
 
         $obj = [
             'id' => -1,
-            'title' => get_lang('OrphanQuestions'),
+            'title' => get_lang('Orphan questions'),
             'type' => 2,
         ];
         $newQuiz = new Quiz((object) $obj);
@@ -1021,7 +1021,7 @@ class CourseBuilder
             // This is the fictional test for collecting orphan questions.
             $orphan_questions = new Quiz(
                 -1,
-                get_lang('OrphanQuestions', ''),
+                get_lang('Orphan questions'),
                 '',
                 0,
                 0,

+ 2 - 2
src/CourseBundle/Component/CourseCopy/CourseRestorer.php

@@ -2702,7 +2702,7 @@ class CourseRestorer
                 }
 
                 if ($this->add_text_in_items) {
-                    $lp->name = $lp->name.' '.get_lang('CopyLabelSuffix');
+                    $lp->name = $lp->name.' '.get_lang('Copy');
                 }
 
                 if (isset($this->tool_copy_settings['learnpaths'])) {
@@ -2997,7 +2997,7 @@ class CourseRestorer
                     if (is_file($path)) {
                         /* if (!is_file($dest . '/' . $file) || $overwrite)
                          if (!@copy($path, $dest . '/' . $file)) {
-                             echo '<font color="red">File ('.$path.') '.get_lang('NotHavePermission').'</font>';
+                             echo '<font color="red">File ('.$path.') '.get_lang('The user doesn't have permissions to do the requested operation.').'</font>';
                          }*/
                     } elseif (is_dir($path)) {
                         if (!is_dir($dest.'/'.$file)) {

+ 25 - 25
src/CourseBundle/Component/CourseCopy/CourseSelectForm.php

@@ -24,28 +24,28 @@ class CourseSelectForm
     public static function getResourceTitleList()
     {
         $list = [];
-        $list[RESOURCE_LEARNPATH_CATEGORY] = get_lang('Learnpath').' '.get_lang('Category');
+        $list[RESOURCE_LEARNPATH_CATEGORY] = get_lang('Courses').' '.get_lang('Category');
         $list[RESOURCE_ASSET] = get_lang('Assets');
-        $list[RESOURCE_GRADEBOOK] = get_lang('Gradebook');
+        $list[RESOURCE_GRADEBOOK] = get_lang('Assessments');
         $list[RESOURCE_EVENT] = get_lang('Events');
         $list[RESOURCE_ANNOUNCEMENT] = get_lang('Announcements');
         $list[RESOURCE_DOCUMENT] = get_lang('Documents');
         $list[RESOURCE_LINK] = get_lang('Links');
-        $list[RESOURCE_COURSEDESCRIPTION] = get_lang('CourseDescription');
+        $list[RESOURCE_COURSEDESCRIPTION] = get_lang('Course Description');
         $list[RESOURCE_FORUM] = get_lang('Forums');
-        $list[RESOURCE_FORUMCATEGORY] = get_lang('ForumCategory');
+        $list[RESOURCE_FORUMCATEGORY] = get_lang('Forum category');
         $list[RESOURCE_QUIZ] = get_lang('Tests');
-        $list[RESOURCE_TEST_CATEGORY] = get_lang('QuestionCategory');
-        $list[RESOURCE_LEARNPATH] = get_lang('ToolLearnpath');
-        $list[RESOURCE_LEARNPATH_CATEGORY] = get_lang('LearnpathCategory');
+        $list[RESOURCE_TEST_CATEGORY] = get_lang('Questions category');
+        $list[RESOURCE_LEARNPATH] = get_lang('ToolCourses');
+        $list[RESOURCE_LEARNPATH_CATEGORY] = get_lang('CoursesCategory');
         $list[RESOURCE_SCORM] = 'SCORM';
-        $list[RESOURCE_TOOL_INTRO] = get_lang('ToolIntro');
+        $list[RESOURCE_TOOL_INTRO] = get_lang('Tool introduction');
         $list[RESOURCE_SURVEY] = get_lang('Survey');
         $list[RESOURCE_GLOSSARY] = get_lang('Glossary');
-        $list[RESOURCE_WIKI] = get_lang('Wiki');
+        $list[RESOURCE_WIKI] = get_lang('Group wiki');
         $list[RESOURCE_THEMATIC] = get_lang('Thematic');
         $list[RESOURCE_ATTENDANCE] = get_lang('Attendance');
-        $list[RESOURCE_WORK] = get_lang('ToolStudentPublication');
+        $list[RESOURCE_WORK] = get_lang('Assignments');
 
         return $list;
     }
@@ -166,7 +166,7 @@ class CourseSelectForm
             $sessionTitle = !empty($hidden_fields['destination_session']) ? ' ('.api_get_session_name($hidden_fields['destination_session']).')' : null;
             $courseInfo = api_get_course_info($hidden_fields['destination_course']);
             echo '<h3>';
-            echo get_lang('DestinationCourse').' : '.$courseInfo['title'].' ('.$courseInfo['code'].') '.$sessionTitle;
+            echo get_lang('Target course').' : '.$courseInfo['title'].' ('.$courseInfo['code'].') '.$sessionTitle;
             echo '</h3>';
         }
 
@@ -191,9 +191,9 @@ class CourseSelectForm
         $forum_topics = [];
 
         echo '<p>';
-        echo get_lang('SelectResources');
+        echo get_lang('Select resources');
         echo '</p>';
-        echo Display::return_message(get_lang('DontForgetToSelectTheMediaFilesIfYourResourceNeedIt'));
+        echo Display::return_message(get_lang('Don\'t forget to select the media files if your resource need it'));
 
         $resource_titles = self::getResourceTitleList();
         $element_count = self::parseResources($resource_titles, $course->resources, true, true);
@@ -287,25 +287,25 @@ class CourseSelectForm
 
         $recycleOption = isset($_POST['recycle_option']) ? true : false;
         if (empty($element_count)) {
-            echo Display::return_message(get_lang('NoDataAvailable'), 'warning');
+            echo Display::return_message(get_lang('No data available'), 'warning');
         } else {
             if (!empty($hidden_fields['destination_session'])) {
                 echo '<br />
                       <button 
                         class="save" 
                         type="submit" 
-                        onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset))."'".')) return false;" >'.
-                    get_lang('Ok').'</button>';
+                        onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("Please confirm your choice"), ENT_QUOTES, $charset))."'".')) return false;" >'.
+                    get_lang('Validate').'</button>';
             } else {
                 if ($recycleOption) {
-                    echo '<br /><button class="save" type="submit">'.get_lang('Ok').'</button>';
+                    echo '<br /><button class="save" type="submit">'.get_lang('Validate').'</button>';
                 } else {
                     echo '<br />
                           <button 
                                 class="save btn btn-primary" 
                                 type="submit" 
-                                onclick="checkLearnPath(\''.addslashes(get_lang('DocumentsWillBeAddedToo')).'\')">'.
-                    get_lang('Ok').'</button>';
+                                onclick="checkLearnPath(\''.addslashes(get_lang('Documents will be added too')).'\')">'.
+                    get_lang('Validate').'</button>';
                 }
             }
         }
@@ -373,7 +373,7 @@ class CourseSelectForm
                         if ($type == RESOURCE_LEARNPATH) {
                             echo Display::return_message(
                                 get_lang(
-                                    'ToExportLearnpathWithQuizYouHaveToSelectQuiz'
+                                    'ToExportCoursesWithQuizYouHaveToSelectQuiz'
                                 ),
                                 'warning'
                             );
@@ -404,7 +404,7 @@ class CourseSelectForm
                                         onclick=\"javascript: setCheckbox('$type',true);\" >".get_lang('All')."</a>";
                             echo "<a class=\"btn btn-default\" 
                                         href=\"javascript: void(0);\" 
-                                        onclick=\"javascript:setCheckbox('$type',false);\" >".get_lang('None')."</a>";
+                                        onclick=\"javascript:setCheckbox('$type',false);\" >".get_lang('none')."</a>";
                             echo '</div>';
                             echo '<ul class="list-backups-options">';
                             foreach ($resources as $id => $resource) {
@@ -758,7 +758,7 @@ class CourseSelectForm
             }
             $courseInfo = api_get_course_info($hidden_fields['destination_course']);
             echo '<h3>';
-            echo get_lang('DestinationCourse').' : '.$courseInfo['title'].$sessionTitle;
+            echo get_lang('Target course').' : '.$courseInfo['title'].$sessionTitle;
             echo '</h3>';
         }
 
@@ -778,7 +778,7 @@ class CourseSelectForm
 
                     echo '<div class="btn-group">';
                     echo "<a class=\"btn\" href=\"#\" onclick=\"javascript:setCheckbox('".$course->code."',true);\" >".get_lang('All')."</a>";
-                    echo "<a class=\"btn\" href=\"#\" onclick=\"javascript:setCheckbox('".$course->code."',false);\" >".get_lang('None')."</a>";
+                    echo "<a class=\"btn\" href=\"#\" onclick=\"javascript:setCheckbox('".$course->code."',false);\" >".get_lang('none')."</a>";
                     echo '</div>';
 
                     foreach ($resources as $id => $resource) {
@@ -807,8 +807,8 @@ class CourseSelectForm
             }
         }
         echo '<br /><button class="save" type="submit" 
-            onclick="checkLearnPath(\''.addslashes(get_lang('DocumentsWillBeAddedToo')).'\')">'.
-            get_lang('Ok').'</button>';
+            onclick="checkLearnPath(\''.addslashes(get_lang('Documents will be added too')).'\')">'.
+            get_lang('Validate').'</button>';
         self::display_hidden_quiz_questions($course);
         self::display_hidden_scorm_directories($course);
         echo '</form>';

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

@@ -195,7 +195,7 @@ class HomeController extends ToolBaseController
         }
         $entityManager->persist($tool);
         //$entityManager->flush();
-        return Display::return_message(get_lang('ToolIsNowHidden'), 'confirmation');
+        return Display::return_message(get_lang('The tool is now invisible.'), 'confirmation');
     }
 
     /**
@@ -458,7 +458,7 @@ class HomeController extends ToolBaseController
             $content .= '<div class="alert alert-success" style="border:0px; margin-top: 0px;padding:0px;">
                 <div class="normal-message" id="id_normal_message" style="display:none">';
             $content .= '<img src="'.api_get_path(WEB_PATH).'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
-            $content .= get_lang('PleaseStandBy');
+            $content .= get_lang('Please stand by...');
             $content .= '</div>
                 <div class="alert alert-success" id="id_confirmation_message" style="display:none"></div>
             </div>';
@@ -469,7 +469,7 @@ class HomeController extends ToolBaseController
                 $content .= '
                 <div class="row">
                     <div class="col-xs-12 col-md-12">
-                        <span class="viewcaption">'.get_lang('SessionData').'</span>
+                        <span class="viewcaption">'.get_lang('Session\'s data').'</span>
                         <table class="course_activity_home">'.
                             CourseHome::show_session_data($session_id).'
                         </table>
@@ -507,7 +507,7 @@ class HomeController extends ToolBaseController
             if (api_get_setting('show_session_data') === 'true' && $session_id > 0) {
                 $content .= '<div class="row">
                     <div class="col-xs-12 col-md-12">
-                    <span class="viewcaption">'.get_lang('SessionData').'</span>
+                    <span class="viewcaption">'.get_lang('Session\'s data').'</span>
                     <table class="course_activity_home">';
                 $content .= CourseHome::show_session_data($session_id);
                 $content .= '</table></div></div>';

+ 2 - 2
src/LtiBundle/Controller/CourseController.php

@@ -420,7 +420,7 @@ class CourseController extends BaseController
 
             if (!empty($categories)) {
                 $actions .= \Display::url(
-                    \Display::return_icon('gradebook.png', get_lang('MakeQualifiable'), [], ICON_SIZE_MEDIUM),
+                    \Display::return_icon('gradebook.png', get_lang('Add to gradebook'), [], ICON_SIZE_MEDIUM),
                     $this->generateUrl(
                         'chamilo_lti_grade',
                         ['catId' => $categories[0]->get_id(), 'code' => $course->getCode()]
@@ -532,7 +532,7 @@ class CourseController extends BaseController
         /** @var \HTML_QuickForm_select $slcLtiTools */
         $slcLtiTools = $form->createElement('select', 'name', $this->trans('External tool'));
         $form->insertElementBefore($slcLtiTools, 'hid_category_id');
-        $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
+        $form->addRule('name', get_lang('Required field'), 'required');
 
         $tools = $toolRepo->findBy(['course' => $course, 'gradebookEval' => null]);
 

+ 3 - 5
src/ThemeBundle/EventListener/TwigListener.php

@@ -14,8 +14,6 @@ use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
  * Class TwigListener.
- *
- * @package Chamilo\ThemeBundle\EventListener
  */
 class TwigListener implements EventSubscriberInterface
 {
@@ -69,7 +67,7 @@ class TwigListener implements EventSubscriberInterface
             $adminName = '';
             // Administrator name
             if (!empty($name)) {
-                $adminName = get_lang('Manager').' : ';
+                $adminName = get_lang('Administrator').' : ';
                 $adminName .= \Display::encrypted_mailto_link($email, $name);
             }
             $twig->addGlobal('administrator_name', $adminName);
@@ -131,9 +129,9 @@ class TwigListener implements EventSubscriberInterface
                         $teachersParsed[] = api_get_user_info($userId);
                     }
                     $links = array_column($teachersParsed, 'complete_name_with_message_link');
-                    $label = get_lang('Teacher');
+                    $label = get_lang('Trainer');
                     if (count($links) > 1) {
-                        $label = get_lang('Teachers');
+                        $label = get_lang('Trainers');
                     }
                     $teacherData .= $label.' : '.array_to_string($links, CourseManager::USER_SEPARATOR);
                 }

+ 1 - 1
src/UserBundle/Repository/UserRepository.php

@@ -572,7 +572,7 @@ class UserRepository extends EntityRepository
                 foreach ($fs as $file) {
                     $chatFiles[] =
                         $course->getCourse()->getDirectory().'/document/chat_files/'.$file->getFilename().' - '.
-                        get_lang('ContentNotAccessibleRequestFromDataPrivacyOfficer');
+                        get_lang('This content is not accessible to you directly because of course-related access rules. If you require access to that data, please contact the Data Privacy Officer as defined in our privacy terms.');
                 }
             }
         }

+ 4 - 4
user_portal.php

@@ -56,7 +56,7 @@ if ($collapsable) {
                     $table = Database::get_main_table(TABLE_MAIN_SESSION_USER);
                     $sql = "UPDATE $table SET collapsed = $value WHERE id = ".$userRelSession['id'];
                     Database::query($sql);
-                    Display::addFlash(Display::return_message(get_lang('Updated')));
+                    Display::addFlash(Display::return_message(get_lang('Update successful')));
                 }
                 header('Location: user_portal.php');
                 exit;
@@ -68,7 +68,7 @@ if ($collapsable) {
 /* Constants and CONFIGURATION parameters */
 $load_dirs = api_get_setting('show_documents_preview');
 $displayMyCourseViewBySessionLink = api_get_setting('my_courses_view_by_session') === 'true';
-$nameTools = get_lang('MyCourses');
+$nameTools = get_lang('My courses');
 $loadHistory = isset($_GET['history']) && intval($_GET['history']) == 1 ? true : false;
 
 // Load course notification by ajax
@@ -159,7 +159,7 @@ if ($displayMyCourseViewBySessionLink) {
 
 $myCourseListAsCategory = api_get_configuration_value('my_courses_list_as_category');
 
-$controller = new IndexManager(get_lang('MyCourses'));
+$controller = new IndexManager(get_lang('My courses'));
 
 if (!$myCourseListAsCategory) {
     // Main courses and session list
@@ -298,7 +298,7 @@ if (!empty($_GET['history'])) {
 }
 $controller->tpl->assign('course_history_page', $historyClass);
 if ($myCourseListAsCategory) {
-    $controller->tpl->assign('header', get_lang('MyCourses'));
+    $controller->tpl->assign('header', get_lang('My courses'));
 }
 
 $controller->setGradeBookDependencyBar($userId);

+ 1 - 1
whoisonline.php

@@ -58,7 +58,7 @@ if (isset($_GET['id'])) {
     }
 }
 
-$tpl = new Template(get_lang('UsersOnLineList'));
+$tpl = new Template(get_lang('Online users list'));
 
 if (api_get_setting('allow_social_tool') === 'true' && !api_is_anonymous()) {
     $tpl->assign('whoisonline', $whoisonline_list);

+ 2 - 2
whoisonlinesession.php

@@ -31,7 +31,7 @@ if (!$allow) {
 $maxNumberItems = 20;
 $sessionInfo = api_get_session_info($sessionId);
 
-Display::display_header(get_lang('UsersOnLineList'));
+Display::display_header(get_lang('Online users list'));
 echo Display::page_header($sessionInfo['name']);
 
 function getUsers(
@@ -116,7 +116,7 @@ $table = new SortableTable(
     $maxNumberItems
 );
 $table->set_header(0, get_lang('Name'), false);
-$table->set_header(1, get_lang('InCourse'), false);
+$table->set_header(1, get_lang('In course'), false);
 
 $table->set_column_filter(0, 'user_filter');
 $table->set_column_filter(1, 'course_filter');