Quellcode durchsuchen

Merge branch '1.10.x' of https://github.com/chamilo/chamilo-lms into 9084

Conflicts:
	main/inc/lib/usermanager.lib.php
Angel Fernando Quiroz Campos vor 10 Jahren
Ursprung
Commit
424349a0b5
100 geänderte Dateien mit 5693 neuen und 9644 gelöschten Zeilen
  1. 1 0
      composer.json
  2. 48 3
      composer.lock
  3. 4 0
      main/admin/index.php
  4. 1 1
      main/admin/statistics/statistics.lib.php
  5. 280 0
      main/admin/teacher_time_report.php
  6. 2 2
      main/auth/inscription.php
  7. 105 0
      main/cron/fix_online_time.php
  8. 14 13
      main/css/base.css
  9. 8 8
      main/document/document.php
  10. 2 2
      main/exercice/exercise.class.php
  11. 202 0
      main/fonts/opensans/LICENSE.txt
  12. BIN
      main/fonts/opensans/OpenSans-Bold.ttf
  13. BIN
      main/fonts/opensans/OpenSans-BoldItalic.ttf
  14. BIN
      main/fonts/opensans/OpenSans-ExtraBold.ttf
  15. BIN
      main/fonts/opensans/OpenSans-ExtraBoldItalic.ttf
  16. BIN
      main/fonts/opensans/OpenSans-Italic.ttf
  17. BIN
      main/fonts/opensans/OpenSans-Light.ttf
  18. BIN
      main/fonts/opensans/OpenSans-LightItalic.ttf
  19. BIN
      main/fonts/opensans/OpenSans-Regular.ttf
  20. BIN
      main/fonts/opensans/OpenSans-Semibold.ttf
  21. BIN
      main/fonts/opensans/OpenSans-SemiboldItalic.ttf
  22. 0 2
      main/gradebook/gradebook_flatview.php
  23. 19 11
      main/gradebook/lib/be/category.class.php
  24. 12 4
      main/gradebook/lib/be/evallink.class.php
  25. 1 1
      main/gradebook/lib/be/exerciselink.class.php
  26. 158 328
      main/gradebook/lib/fe/flatviewtable.class.php
  27. 16 9
      main/gradebook/lib/flatview_data_generator.class.php
  28. 2 0
      main/gradebook/lib/scoredisplay.class.php
  29. 19 0
      main/inc/autoload.inc.php
  30. 11 9
      main/inc/global.inc.php
  31. 101 0
      main/inc/lib/TeacherTimeReport.php
  32. 0 4
      main/inc/lib/autoload.class.php
  33. 1 1
      main/inc/lib/database.lib.php
  34. 10 1
      main/inc/lib/main_api.lib.php
  35. 0 450
      main/inc/lib/pchart/MyHorBar.class.php
  36. 0 6
      main/inc/lib/pchart/fonts/index.html
  37. BIN
      main/inc/lib/pchart/fonts/tahoma.ttf
  38. 0 6
      main/inc/lib/pchart/index.html
  39. 0 121
      main/inc/lib/pchart/pCache.class.php
  40. 0 3655
      main/inc/lib/pchart/pChart.class.php
  41. 0 262
      main/inc/lib/pchart/pData.class.php
  42. 0 17
      main/inc/lib/pchart/palette/blue_tones.txt
  43. 0 14
      main/inc/lib/pchart/palette/default.txt
  44. 0 8
      main/inc/lib/pchart/palette/hard_blue.txt
  45. 0 6
      main/inc/lib/pchart/palette/index.html
  46. 0 13
      main/inc/lib/pchart/palette/pastel.txt
  47. 0 7
      main/inc/lib/pchart/palette/reduced.txt
  48. 0 5
      main/inc/lib/pchart/palette/soft_tones.txt
  49. 137 0
      main/inc/lib/sessionmanager.lib.php
  50. 4 2
      main/inc/lib/sortable_table.class.php
  51. 348 180
      main/inc/lib/tracking.lib.php
  52. 54 0
      main/inc/lib/usermanager.lib.php
  53. 2 2
      main/inc/lib/userportal.lib.php
  54. 96 106
      main/lang/arabic/trad4all.inc.php
  55. 97 107
      main/lang/asturian/trad4all.inc.php
  56. 97 107
      main/lang/basque/trad4all.inc.php
  57. 97 107
      main/lang/brazilian/trad4all.inc.php
  58. 97 107
      main/lang/bulgarian/trad4all.inc.php
  59. 97 107
      main/lang/catalan/trad4all.inc.php
  60. 96 106
      main/lang/croatian/trad4all.inc.php
  61. 84 92
      main/lang/czech/trad4all.inc.php
  62. 96 106
      main/lang/danish/trad4all.inc.php
  63. 97 107
      main/lang/dutch/trad4all.inc.php
  64. 107 107
      main/lang/english/trad4all.inc.php
  65. 86 93
      main/lang/esperanto/trad4all.inc.php
  66. 17 18
      main/lang/faroese/trad4all.inc.php
  67. 96 106
      main/lang/finnish/trad4all.inc.php
  68. 106 109
      main/lang/french/trad4all.inc.php
  69. 97 107
      main/lang/galician/trad4all.inc.php
  70. 97 107
      main/lang/german/trad4all.inc.php
  71. 97 107
      main/lang/greek/trad4all.inc.php
  72. 96 106
      main/lang/hungarian/trad4all.inc.php
  73. 86 93
      main/lang/indonesian/trad4all.inc.php
  74. 97 107
      main/lang/italian/trad4all.inc.php
  75. 49 54
      main/lang/japanese/trad4all.inc.php
  76. 81 88
      main/lang/korean/trad4all.inc.php
  77. 97 107
      main/lang/latvian/trad4all.inc.php
  78. 92 102
      main/lang/lithuanian/trad4all.inc.php
  79. 96 106
      main/lang/macedonian/trad4all.inc.php
  80. 51 52
      main/lang/malay/trad4all.inc.php
  81. 78 85
      main/lang/norwegian/trad4all.inc.php
  82. 69 76
      main/lang/occitan/trad4all.inc.php
  83. 96 106
      main/lang/persian/trad4all.inc.php
  84. 97 107
      main/lang/polish/trad4all.inc.php
  85. 96 106
      main/lang/portuguese/trad4all.inc.php
  86. 95 105
      main/lang/quechua_cusco/trad4all.inc.php
  87. 96 106
      main/lang/romanian/trad4all.inc.php
  88. 96 106
      main/lang/russian/trad4all.inc.php
  89. 89 96
      main/lang/serbian/trad4all.inc.php
  90. 97 107
      main/lang/simpl_chinese/trad4all.inc.php
  91. 97 107
      main/lang/slovak/trad4all.inc.php
  92. 1 0
      main/lang/slovenian/install.inc.php
  93. 116 107
      main/lang/slovenian/trad4all.inc.php
  94. 104 107
      main/lang/spanish/trad4all.inc.php
  95. 96 105
      main/lang/spanish_latin/trad4all.inc.php
  96. 96 106
      main/lang/swedish/trad4all.inc.php
  97. 36 40
      main/lang/tagalog/trad4all.inc.php
  98. 86 93
      main/lang/thai/trad4all.inc.php
  99. 96 106
      main/lang/trad_chinese/trad4all.inc.php
  100. 92 99
      main/lang/turkish/trad4all.inc.php

+ 1 - 0
composer.json

@@ -34,6 +34,7 @@
         "emojione/emojione": "1.3.0",
         "zendframework/zend-config": "2.3.3",
         "ezyang/htmlpurifier": "4.6.0",
+        "szymach/c-pchart": "1.*",
         "aferrandini/phpqrcode": "1.0.1"
     },
     "extra": {

+ 48 - 3
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "a422c2e4eb5cfff2fa4784fd9036ed9c",
+    "hash": "14f25295cfdba7534deecf11519b2d22",
     "packages": [
         {
             "name": "aferrandini/phpqrcode",
@@ -782,8 +782,11 @@
                     "email": "fabien@symfony.com"
                 }
             ],
-            "description": "Symfony Process Component",
-            "homepage": "http://symfony.com",
+            "description": "Standards compliant HTML filter written in PHP",
+            "homepage": "http://htmlpurifier.org/",
+            "keywords": [
+                "html"
+            ],
             "time": "2015-01-25 04:39:26"
         },
         {
@@ -833,6 +836,48 @@
             "homepage": "http://symfony.com",
             "time": "2015-01-25 04:39:26"
         },
+        {
+            "name": "szymach/c-pchart",
+            "version": "1.1.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/szymach/c-pchart.git",
+                "reference": "1d54c14f8b7295abc87039ba806fed45d29d67d9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/szymach/c-pchart/zipball/1d54c14f8b7295abc87039ba806fed45d29d67d9",
+                "reference": "1d54c14f8b7295abc87039ba806fed45d29d67d9",
+                "shasum": ""
+            },
+            "require": {
+                "ext-gd": "*",
+                "php": ">=5.3.3"
+            },
+            "type": "project",
+            "autoload": {
+                "psr-4": {
+                    "CpChart\\": "src/"
+                },
+                "files": [
+                    "src/Resources/data/constants.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Port of \"pChart\" library into PHP 5.3.",
+            "homepage": "https://github.com/szymach/c-pchart",
+            "keywords": [
+                "c-pChart",
+                "charts",
+                "composer",
+                "pchart",
+                "statistics"
+            ],
+            "time": "2015-01-28 19:54:53"
+        },
         {
             "name": "toin0u/digitalocean",
             "version": "1.4.2",

+ 4 - 0
main/admin/index.php

@@ -167,6 +167,10 @@ if (api_is_platform_admin()) {
     $items[] = array('url'=>'configure_inscription.php', 	'label' => get_lang('ConfigureInscription'));
     $items[] = array('url'=>'statistics/index.php', 		'label' => get_lang('Statistics'));
     $items[] = array('url'=> api_get_path(WEB_CODE_PATH).'mySpace/company_reports.php',          'label' => get_lang('Reports'));
+    $items[] = array(
+        'url'=> api_get_path(WEB_CODE_PATH) . 'admin/teacher_time_report.php',
+        'label' => get_lang('TeacherTimeReport')
+    );
 
     /* Event settings */
 

+ 1 - 1
main/admin/statistics/statistics.lib.php

@@ -252,7 +252,7 @@ class Statistics
                 // User id.
                 $row[3] = Display::url(
                     $row[3],
-                    api_get_path(WEB_CODE_PATH).'admin/user_information?user_id='.$row[4], array('title' => get_lang('UserInfo'))
+                    api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.$row[4], array('title' => get_lang('UserInfo'))
                 );
 
                 $row[4] = TrackingUserLog::get_ip_from_user_event($row[4], $row[5], true);

+ 280 - 0
main/admin/teacher_time_report.php

@@ -0,0 +1,280 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+/**
+ * Generate a teacher time report in platform or sessions/courses
+ *
+ * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
+ * @package chamilo.admin
+ */
+/* INIT SECTION */
+
+// Language files that need to be included.
+if (isset($_GET['category']) && $_GET['category'] == 'Templates') {
+    $language_file = array('admin', 'document');
+} else if (isset($_GET['category']) && $_GET['category'] == 'Gradebook') {
+    $language_file = array('admin', 'gradebook');
+} else {
+    $language_file = array('admin', 'document');
+}
+$language_file[] = 'tracking';
+
+// Resetting the course id.
+$cidReset = true;
+
+// Including some necessary library files.
+require_once '../inc/global.inc.php';
+require_once api_get_path(LIBRARY_PATH) . 'TeacherTimeReport.php';
+
+// Setting the section (for the tabs).
+$this_section = SECTION_PLATFORM_ADMIN;
+
+$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+
+$toolName = get_lang('TeacherTimeReport');
+
+// Access restrictions.
+api_protect_admin_script();
+
+$startDate = new DateTime(api_get_local_time());
+$startDate->modify('first day of this month');
+
+$limitDate = new DateTime(api_get_local_time());
+
+$selectedCourse = isset($_REQUEST['course']) ? $_REQUEST['course'] : null;
+$selectedSession = isset($_REQUEST['session']) ? $_REQUEST['session'] : 0;
+$selectedTeacher = isset($_REQUEST['teacher']) ? $_REQUEST['teacher'] : 0;
+$selectedFrom = isset($_REQUEST['from']) && !empty($_REQUEST['from']) ? $_REQUEST['from'] : $startDate->format('Y-m-d');
+$selectedUntil = isset($_REQUEST['from']) && !empty($_REQUEST['until']) ? $_REQUEST['until'] : $limitDate->format('Y-m-d');
+
+$courseList = CourseManager::get_courses_list(0, 0, 'title');
+$sessionsList = SessionManager::get_sessions_list(array(), array('name'));
+
+$teacherList = UserManager::getTeachersList();
+
+$htmlHeadXtra[] = '
+<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/daterange/moment.min.js"></script>
+<link rel="stylesheet" href="' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/daterange/daterangepicker-bs2.css">
+<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/daterange/daterangepicker.js"></script>';
+
+$withFilter = false;
+
+$reportTitle = get_lang('TimeReportIncludingAllCoursesAndSessionsByTeacher');
+$reportSubTitle = sprintf(get_lang('TimeSpentBetweenXAndY'), $selectedFrom, $selectedUntil);
+
+$timeReport = new TeacherTimeReport();
+
+if (!empty($selectedCourse)) {
+    $withFilter = true;
+
+    $course = api_get_course_info($selectedCourse);
+
+    $reportTitle = sprintf(get_lang('TimeReportForCourseX'), $course['title']);
+
+    $sessionsByCourse = SessionManager::get_session_by_course($selectedCourse);
+
+    foreach ($sessionsByCourse as $session) {
+        $coaches = CourseManager::get_coachs_from_course($session['id'], $selectedCourse);
+
+        if ($coaches) {
+            foreach ($coaches as $coach) {
+                $totalTime = SessionManager::getUserTimeInCourse(
+                    $coach['user_id'],
+                    $selectedCourse,
+                    $session['id'],
+                    $selectedFrom,
+                    $selectedUntil
+                );
+
+                $timeReport->data[] = array(
+                    'session' => array(
+                        'id' => $session['id'],
+                        'name' => $session['name']
+                    ),
+                    'course' => array(
+                        'id' => $course['real_id'],
+                        'name' => $course['title']
+                    ),
+                    'coach' => array(
+                        'userId' => $coach['user_id'],
+                        'lastname' => $coach['lastname'],
+                        'firstname' => $coach['firstname'],
+                        'username' => $coach['username'],
+                        'completeName' => api_get_person_name($coach['firstname'], $coach['lastname'])
+                    ),
+                    'totalTime' => $totalTime
+                );
+            }
+        }
+    }
+}
+
+if (!empty($selectedSession)) {
+    $withFilter = true;
+
+    $session = api_get_session_info($selectedSession);
+
+    $reportTitle = sprintf(get_lang('TimeReportForSessionX'), $session['name']);
+
+    $courses = SessionManager::get_course_list_by_session_id($selectedSession);
+
+    foreach ($courses as $course) {
+        $coaches = CourseManager::get_coachs_from_course($selectedSession, $course['code']);
+
+        if ($coaches) {
+            foreach ($coaches as $coach) {
+                $totalTime = SessionManager::getUserTimeInCourse(
+                    $coach['user_id'],
+                    $course['code'],
+                    $selectedSession,
+                    $selectedFrom,
+                    $selectedUntil
+                );
+
+                $timeReport->data[] = array(
+                    'session' => array(
+                        'id' => $session['id'],
+                        'name' => $session['name']
+                    ),
+                    'course' => array(
+                        'id' => $course['id'],
+                        'name' => $course['title']
+                    ),
+                    'coach' => array(
+                        'userId' => $coach['user_id'],
+                        'lastname' => $coach['lastname'],
+                        'firstname' => $coach['firstname'],
+                        'username' => $coach['username'],
+                        'completeName' => api_get_person_name($coach['firstname'], $coach['lastname'])
+                    ),
+                    'totalTime' => $totalTime
+                );
+            }
+        }
+    }
+}
+
+if (!empty($selectedTeacher)) {
+    $withFilter = true;
+
+    $coach = api_get_user_info($selectedTeacher);
+
+    $reportTitle = sprintf(get_lang('TimeReportForTeacherX'), $coach['complete_name']);
+
+    $courses = SessionManager::getCoursesListByCourseCoach($selectedTeacher);
+
+    foreach ($courses as $course) {
+        $session = api_get_session_info($course['id_session']);
+
+        $courseInfo = api_get_course_info($course['course_code']);
+
+        $totalTime = SessionManager::getUserTimeInCourse(
+            $selectedTeacher,
+            $course['course_code'],
+            $session['id'],
+            $selectedFrom,
+            $selectedUntil
+        );
+
+        $timeReport->data[] = array(
+            'session' => array(
+                'id' => $session['id'],
+                'name' => $session['name']
+            ),
+            'course' => array(
+                'id' => $courseInfo['real_id'],
+                'name' => $courseInfo['title']
+            ),
+            'coach' => array(
+                'userId' => $coach['user_id'],
+                'lastname' => $coach['lastname'],
+                'firstname' => $coach['firstname'],
+                'username' => $coach['username'],
+                'completeName' => $coach['complete_name']
+            ),
+            'totalTime' => $totalTime
+        );
+    }
+}
+
+if (empty($selectedCourse) && empty($selectedSession) && empty($selectedTeacher)) {
+    foreach ($teacherList as &$teacher) {
+        $timeReport->data[] = array(
+            'coach' => array(
+                'username' => $teacher['username'],
+                'completeName' => $teacher['completeName'],
+            ),
+            'totalTime' => SessionManager::getTotalUserTimeInPlatform($teacher['user_id'], $selectedFrom, $selectedUntil)
+        );
+    }
+}
+
+$timeReport->sortData($withFilter);
+
+if (isset($_GET['export'])) {
+    require_once api_get_path(LIBRARY_PATH) . 'export.lib.inc.php';
+
+    $dataToExport = $timeReport->prepareDataToExport($withFilter);
+
+    $fileName = get_lang('TeacherTimeReport') . ' ' . api_get_local_time();
+
+    switch ($_GET['export']) {
+        case 'pdf':
+            $params = array(
+                'add_signatures' => false,
+                'filename' => $fileName,
+                'pdf_title' => "$reportTitle - $reportSubTitle",
+                'pdf_description' => get_lang('TeacherTimeReport'),
+                'format' => 'A4-L',
+                'orientation' => 'L'
+            );
+
+            $pdfContent = Export::convert_array_to_html($dataToExport);
+
+            Export::export_html_to_pdf($pdfContent, $params);
+            break;
+        case 'xls':
+
+            array_unshift($dataToExport, array(
+                $reportTitle
+            ), array(
+                $reportSubTitle
+            ), array());
+            
+            Export::export_table_xls_html($dataToExport, $fileName);
+            break;
+    }
+
+    die;
+}
+
+// view
+//hack for daterangepicker
+$startDate->modify('+1 day');
+$limitDate->modify('+1 day');
+
+$tpl = new Template($toolName);
+$tpl->assign('reportTitle', $reportTitle);
+$tpl->assign('reportSubTitle', $reportSubTitle);
+
+$tpl->assign('filterStartDate', $startDate->format('Y-m-d'));
+$tpl->assign('filterEndDate', $limitDate->format('Y-m-d'));
+$tpl->assign('filterMaxDate', $limitDate->format('Y-m-d'));
+
+$tpl->assign('selectedCourse', $selectedCourse);
+$tpl->assign('selectedSession', $selectedSession);
+$tpl->assign('selectedTeacher', $selectedTeacher);
+$tpl->assign('selectedFrom', $selectedFrom);
+$tpl->assign('selectedUntil', $selectedUntil);
+
+$tpl->assign('withFilter', $withFilter);
+
+$tpl->assign('courses', $courseList);
+$tpl->assign('sessions', $sessionsList);
+$tpl->assign('courseCoaches', $teacherList);
+
+$tpl->assign('rows', $timeReport->data);
+
+$contentTemplate = $tpl->get_template('admin/teacher_time_report.tpl');
+
+$tpl->display($contentTemplate);

+ 2 - 2
main/auth/inscription.php

@@ -165,8 +165,8 @@ if ($user_already_registered_show_terms == false) {
             'sessionVar'   => basename(__FILE__, '.php'),
             'imageOptions' => array(
                 'font_size' => 20,
-                'font_path' => api_get_path(LIBRARY_PATH).'pchart/fonts/',
-                'font_file' => 'tahoma.ttf',
+                'font_path' => api_get_path(SYS_FONTS_PATH) . 'opensans/',
+                'font_file' => 'OpenSans-Regular.ttf',
                     //'output' => 'gif'
             )
         );

+ 105 - 0
main/cron/fix_online_time.php

@@ -0,0 +1,105 @@
+<?php
+/* For licensing terms, see /license.txt */
+/**
+ * Automatic fix online time procedure. If a COURSEMANAGER has been idle for $timeLimit
+ * or more then the procedure adds $extraTime to his logout_course_date.
+ * @package chamilo.cron
+ * @author Imanol Losada <imanol.losada@beeznest.com>
+ */
+require_once __DIR__ . '/../inc/global.inc.php';
+
+/**
+ * Get ids of COURSEMANAGERs that are inside a course right now
+ * @return array COURSEMANAGER's ids
+ */
+function getTeachersInCourseIds()
+{
+    $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $joinStatement = ' JOIN ' . Database::get_main_table(TABLE_MAIN_USER) . ' ON login_user_id = user_id';
+    return Database::select(
+        'login_user_id', $table . $joinStatement,
+        array(
+            'where' => array(
+                'course IS NOT NULL AND status = ?' => array(
+                    COURSEMANAGER
+                )
+            )
+        )
+    );
+}
+
+/**
+ * If a COURSEMANAGER has been idle for $timeLimit or more then
+ * the procedure adds $extraTime to his logout_course_date.
+ * @param array COURSEMANAGER's ids
+ * @return void
+ */
+function updateTeachersInCourseIdleForTimeLimit($teachersInCourseIds)
+{
+    $timeLimit = '- 30 minute';
+    $extraTime = '+ 5 minute';
+    $utcResult = Database::fetch_array(
+        Database::query('SELECT UTC_TIMESTAMP')
+    );
+    $dataBaseCurrentHour = array_shift($utcResult);
+    $maximumIdleTimeInCourse = date(
+        'Y-m-d H:i:s',
+        strtotime($dataBaseCurrentHour . ' ' . $timeLimit)
+    );
+    $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+    $onLineTrackTable = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    foreach ($teachersInCourseIds as $key => $value) {
+        $value = array_shift($value);
+        $logResult = Database::select(
+            'course_access_id,logout_course_date',
+            $table,
+            array(
+                'where' => array(
+                    'user_id = ?' => array(
+                        $value,
+                    )
+                ),
+                'order' => 'course_access_id DESC',
+                'limit' => '1'
+            )
+        );
+        $currentTeacherData = array_shift($logResult);
+        Database::update(
+            $table,
+            array(
+                'logout_course_date' => date(
+                    'Y-m-d H:i:s',
+                    strtotime($currentTeacherData['logout_course_date'] . ' ' . $extraTime)
+                )
+            ),
+            array(
+                'user_id = ? AND logout_course_date < ? AND course_access_id = ?' => array(
+                    $value,
+                    $maximumIdleTimeInCourse,
+                    $currentTeacherData['course_access_id']
+                )
+            )
+        );
+        /*
+         * (Avoid multiple updates)
+         * When the user enters a course, this field is updated with the course code.
+         * And when the user goes to another tool, returns to NULL
+         */
+        $userId = intval($value);
+        $updateOnLineSql = "UPDATE $onLineTrackTable SET "
+            . "COURSE = NULL "
+            . "WHERE login_user_id = $userId";
+        Database::query($updateOnLineSql);
+    }
+}
+
+/**
+ * Initialization
+ */
+if (php_sapi_name() != 'cli') {
+    exit; //do not run from browser
+}
+$teachersInCourseIds = getTeachersInCourseIds();
+if (!empty($teachersInCourseIds)) {
+    updateTeachersInCourseIdleForTimeLimit($teachersInCourseIds);
+}

+ 14 - 13
main/css/base.css

@@ -5155,20 +5155,21 @@ i.size-32.icon-new-note{
         padding: 10px 0px 10px 40px;
         background-repeat:no-repeat;
     }
-    select#question_type_hidden option[value="1"] {background-image: url(../img/icons/32/mcua.gif);}
-    select#question_type_hidden option[value="2"] {background-image: url(../img/icons/32/mcma.gif);}
-    select#question_type_hidden option[value="3"] {background-image: url(../img/icons/32/fill_in_blanks.gif);}
-    select#question_type_hidden option[value="4"] {background-image: url(../img/icons/32/matching.gif);}
-    select#question_type_hidden option[value="5"] {background-image: url(../img/icons/32/open_answer.gif);}
-    select#question_type_hidden option[value="6"] {background-image: url(../img/icons/32/hotspot.gif);}
-    select#question_type_hidden option[value="7"] {background-image: url(../img/icons/32/mcma.gif);}
-    select#question_type_hidden option[value="8"] {background-image: url(../img/icons/32/mcma.gif);}
-    select#question_type_hidden option[value="9"] {background-image: url(../img/icons/32/mcmac.gif);}
-    select#question_type_hidden option[value="10"] {background-image: url(../img/icons/32/mcuao.gif);}
-    select#question_type_hidden option[value="11"] {background-image: url(../img/icons/32/mcmao.gif);}
-    select#question_type_hidden option[value="12"] {background-image: url(../img/icons/32/mcmaco.gif);}
+    select#question_type_hidden option[value="1"] {background-image: url(../img/icons/32/mcua.png);}
+    select#question_type_hidden option[value="2"] {background-image: url(../img/icons/32/mcma.png);}
+    select#question_type_hidden option[value="3"] {background-image: url(../img/icons/32/fill_in_blanks.png);}
+    select#question_type_hidden option[value="4"] {background-image: url(../img/icons/32/matching.png);}
+    select#question_type_hidden option[value="5"] {background-image: url(../img/icons/32/open_answer.png);}
+    select#question_type_hidden option[value="6"] {background-image: url(../img/icons/32/hotspot.png);}
+    select#question_type_hidden option[value="7"] {background-image: url(../img/icons/32/mcma.png);}
+    select#question_type_hidden option[value="8"] {background-image: url(../img/icons/32/mcma.png);}
+    select#question_type_hidden option[value="9"] {background-image: url(../img/icons/32/mcmac.png);}
+    select#question_type_hidden option[value="10"] {background-image: url(../img/icons/32/mcuao.png);}
+    select#question_type_hidden option[value="11"] {background-image: url(../img/icons/32/mcmao.png);}
+    select#question_type_hidden option[value="12"] {background-image: url(../img/icons/32/mcmaco.png);}
     select#question_type_hidden option[value="13"] {background-image: url(../img/icons/32/audio_question.png);}
-    select#question_type_hidden option[value="14"] {background-image: url(../img/icons/32/mcmagl.gif);}
+    select#question_type_hidden option[value="14"] {background-image: url(../img/icons/32/mcmagl.png);}
+    select#question_type_hidden option[value="16"] {background-image: url(../img/icons/32/calculated_answer.png);}
 }
 
 

+ 8 - 8
main/document/document.php

@@ -749,13 +749,13 @@ if ($sessionId == 0) {
     if (!file_exists($base_work_dir.'/shared_folder')) {
         $usf_dir_title = get_lang('UserFolders');
         $usf_dir_name = '/shared_folder';
-        $groupId = 0;
+        //$groupId = 0;
         $visibility = 0;
         create_unexisting_directory(
             $courseInfo,
             api_get_user_id(),
             $sessionId,
-            $groupId,
+            0,
             $to_user_id,
             $base_work_dir,
             $usf_dir_name,
@@ -767,13 +767,13 @@ if ($sessionId == 0) {
     if (!file_exists($base_work_dir.'/shared_folder/sf_user_'.$userId)) {
         $usf_dir_title = $userInfo['complete_name'];
         $usf_dir_name = '/shared_folder/sf_user_'.$userId;
-        $groupId = 0;
+        //$groupId = 0;
         $visibility = 1;
         create_unexisting_directory(
             $courseInfo,
             api_get_user_id(),
             $sessionId,
-            $groupId,
+            0,
             $to_user_id,
             $base_work_dir,
             $usf_dir_name,
@@ -786,13 +786,13 @@ if ($sessionId == 0) {
     if (!file_exists($base_work_dir.'/shared_folder_session_'.$sessionId)) {
         $usf_dir_title = get_lang('UserFolders').' ('.api_get_session_name($sessionId).')';
         $usf_dir_name = '/shared_folder_session_'.$sessionId;
-        $groupId = 0;
+        //$groupId = 0;
         $visibility = 0;
         create_unexisting_directory(
             $courseInfo,
             api_get_user_id(),
             $sessionId,
-            $groupId,
+            0,
             $to_user_id,
             $base_work_dir,
             $usf_dir_name,
@@ -804,13 +804,13 @@ if ($sessionId == 0) {
     if (!file_exists($base_work_dir.'/shared_folder_session_'.$sessionId.'/sf_user_'.$userId)) {
         $usf_dir_title = $userInfo['complete_name'].'('.api_get_session_name($sessionId).')';
         $usf_dir_name = '/shared_folder_session_'.$sessionId.'/sf_user_'.$userId;
-        $groupId = 0;
+        //$groupId = 0;
         $visibility = 1;
         create_unexisting_directory(
             $courseInfo,
             $userId,
             $sessionId,
-            $groupId,
+            0,
             $to_user_id,
             $base_work_dir,
             $usf_dir_name,

+ 2 - 2
main/exercice/exercise.class.php

@@ -2341,14 +2341,14 @@ class Exercise
                             $choice[$ind] = 1;
                         }
 
-                        $studentChoice = $choice[$numAnswer];
+                        $studentChoice = isset($choice[$numAnswer]) ? $choice[$numAnswer] : null;
                         $real_answers[$answerId] = (bool)$studentChoice;
 
                         if ($studentChoice) {
                             $questionScore  +=$answerWeighting;
                         }
                     } else {
-                        $studentChoice = $choice[$numAnswer];
+                        $studentChoice = isset($choice[$numAnswer]) ? $choice[$numAnswer] : null;
                         $real_answers[$answerId] = (bool)$studentChoice;
 
                         if (isset($studentChoice)) {

+ 202 - 0
main/fonts/opensans/LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

BIN
main/fonts/opensans/OpenSans-Bold.ttf


BIN
main/fonts/opensans/OpenSans-BoldItalic.ttf


BIN
main/fonts/opensans/OpenSans-ExtraBold.ttf


BIN
main/fonts/opensans/OpenSans-ExtraBoldItalic.ttf


BIN
main/fonts/opensans/OpenSans-Italic.ttf


BIN
main/fonts/opensans/OpenSans-Light.ttf


BIN
main/fonts/opensans/OpenSans-LightItalic.ttf


BIN
main/fonts/opensans/OpenSans-Regular.ttf


BIN
main/fonts/opensans/OpenSans-Semibold.ttf


BIN
main/fonts/opensans/OpenSans-SemiboldItalic.ttf


+ 0 - 2
main/gradebook/gradebook_flatview.php

@@ -282,8 +282,6 @@ if (isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'false') {
 
     // main graph
     $flatviewtable->display();
-    // @todo this needs a fix
-    //$image_file = $flatviewtable->display_graph();
     //@todo load images with jquery
     echo '<div id="contentArea" style="text-align: center;" >';
     if (!empty($image_file)) {

+ 19 - 11
main/gradebook/lib/be/category.class.php

@@ -292,7 +292,6 @@ class Category implements GradebookItem
                 // otherwise a special parameter is given to ask explicitely
                 $sql .= " AND (session_id IS NULL OR session_id = 0) ";
             } else {*/
-
             if (empty($session_id)) {
                 $sql .= ' AND (session_id IS NULL OR session_id = 0) ';
             } else {
@@ -326,14 +325,15 @@ class Category implements GradebookItem
                 $sql .= ' '.$order_by;
             }
         }
+
         $result = Database::query($sql);
-        $allcat = array();
 
+        $categories = array();
         if (Database::num_rows($result) > 0) {
-            $allcat = Category::create_category_objects_from_sql_result($result);
+            $categories = Category::create_category_objects_from_sql_result($result);
         }
 
-        return $allcat;
+        return $categories;
     }
 
     /**
@@ -731,7 +731,7 @@ class Category implements GradebookItem
      */
     public function calc_score($stud_id = null, $course_code = '', $session_id = null)
     {
-        // get appropriate subcategories, evaluations and links
+        // Get appropriate subcategories, evaluations and links
         if (!empty($course_code)) {
             $cats  = $this->get_subcategories($stud_id, $course_code, $session_id);
             $evals = $this->get_evaluations($stud_id, false, $course_code);
@@ -782,10 +782,9 @@ class Category implements GradebookItem
         }
 
         if (!empty($links)) {
-            /** @var EvalLink $link */
+            /** @var EvalLink|ExerciseLink $link */
             foreach ($links as $link) {
                 $linkres = $link->calc_score($stud_id);
-
                 if (!empty($linkres) && $link->get_weight() != 0) {
                     $linkweight = $link->get_weight();
                     $link_res_denom = $linkres[1] == 0 ? 1 : $linkres[1];
@@ -1296,14 +1295,23 @@ class Category implements GradebookItem
 
         // 1 student
         if (isset($stud_id)) {
-            // special case: this is the root
+            // Special case: this is the root
             if ($this->id == 0) {
                 return Category::get_root_categories_for_student($stud_id, $course_code, $session_id);
             } else {
-                return Category::load(null,null, $course_code, $this->id, api_is_allowed_to_edit() ? null : 1, $session_id, $order);
+                return Category::load(
+                    null,
+                    null,
+                    $course_code,
+                    $this->id,
+                    api_is_allowed_to_edit() ? null : 1,
+                    $session_id,
+                    $order
+                );
             }
-        } else {// all students
-            // course admin
+        } else {
+            // All students
+            // Course admin
             if (api_is_allowed_to_edit() && !api_is_platform_admin()) {
                 // root
                 if ($this->id == 0) {

+ 12 - 4
main/gradebook/lib/be/evallink.class.php

@@ -19,18 +19,26 @@ abstract class EvalLink extends AbstractLink
         parent::__construct();
     }
 
-    // Functions implementing AbstractLink
-
+    /**
+     * @return bool
+     */
     public function has_results()
     {
         $eval = $this->get_evaluation();
+
         return $eval->has_results();
     }
 
-    public function calc_score($stud_id = null)
+    /**
+     * @param int $userId
+     *
+     * @return array
+     */
+    public function calc_score($userId = null)
     {
         $eval = $this->get_evaluation();
-        return $eval->calc_score($stud_id);
+
+        return $eval->calc_score($userId);
     }
 
     public function get_link()

+ 1 - 1
main/gradebook/lib/be/exerciselink.class.php

@@ -221,7 +221,7 @@ class ExerciseLink extends AbstractLink
             if ($student_count == 0) {
                 return null;
             } else {
-                return array ($sum , $student_count);
+                return array($sum, $student_count);
             }
         }
     }

+ 158 - 328
main/gradebook/lib/fe/flatviewtable.class.php

@@ -5,6 +5,10 @@ require_once dirname(__FILE__) . '/../../../inc/global.inc.php';
 require_once dirname(__FILE__) . '/../be.inc.php';
 set_time_limit(0);
 
+use CpChart\Classes\pData as pData;
+use CpChart\Classes\pImage as pImage;
+use CpChart\Classes\pCache as pCache;
+
 /**
  * Class FlatViewTable
  * Table to display flat view (all evaluations and links for all students)
@@ -43,6 +47,7 @@ class FlatViewTable extends SortableTable
         $mainCourseCategory = null
     ) {
         parent :: __construct('flatviewlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 1 : 0);
+
         $this->selectcat = $selectcat;
 
         $this->datagen = new FlatViewDataGenerator(
@@ -80,159 +85,29 @@ class FlatViewTable extends SortableTable
         return $this->mainCourseCategory;
     }
 
-    /**
-     * Display the graph of the total results of all students
-     * */
-    public function display_graph()
-    {
-        include_once api_get_path(LIBRARY_PATH) . 'pchart/pData.class.php';
-        include_once api_get_path(LIBRARY_PATH) . 'pchart/pChart.class.php';
-        include_once api_get_path(LIBRARY_PATH) . 'pchart/pCache.class.php';
-
-        $header_name = $this->datagen->get_header_names();
-        $total_users = $this->datagen->get_total_users_count();
-
-        $img_file = '';
-
-        if ($this->datagen->get_total_items_count() > 0 && $total_users > 0) {
-            // Removing user names and total
-            array_shift($header_name);
-            array_shift($header_name);
-            array_pop($header_name);
-
-            $user_results = $this->datagen->get_data_to_graph();
-
-            $pre_result = $new_result = array();
-            $DataSet = new pData();
-
-            //$pre_result total score of students
-            //filling the Dataset
-            foreach ($user_results as $result) {
-                for ($i = 0; $i < count($header_name); $i++) {
-                    $pre_result[$i + 3]+= $result[$i + 1];
-                }
-            }
-
-            $i = 1;
-            $show_draw = false;
-            if ($total_users > 0) {
-                foreach ($pre_result as $res) {
-                    $total = $res / ($total_users);
-                    if ($total != 0) {
-                        $show_draw = true;
-                    }
-                    $DataSet->AddPoint($total, "Serie" . $i);
-                    $DataSet->SetSerieName(strip_tags($header_name[$i - 1]), "Serie" . $i);
-
-                    // Dataset definition
-                    $DataSet->AddAllSeries();
-                    $DataSet->SetAbsciseLabelSerie();
-                    $i++;
-                }
-            }
-
-            // Cache definition
-            $Cache = new pCache();
-            // the graph id
-            $gradebook_id = intval($_GET['selectcat']);
-            $graph_id = api_get_user_id() . 'AverageResultsVsResource' . $gradebook_id . api_get_course_id();
-            $data = $DataSet->GetData();
-
-            if ($show_draw) {
-                if ($Cache->IsInCache($graph_id, $DataSet->GetData())) {
-                    //if (0) {
-                    //if we already created the img
-                    //echo 'in cache';
-                    $img_file = $Cache->GetHash($graph_id, $DataSet->GetData());
-                } else {
-                    // if the image does not exist in the archive/ folder
-                    // Initialise the graph
-                    $angle = -30;
-                    $Test = new pChart(760, 360);
-
-                    // set font of the axes
-                    $Test->setFontProperties(api_get_path(LIBRARY_PATH) . "pchart/fonts/tahoma.ttf", 8);
-
-                    $Test = $Test->fixHeightByRotation($DataSet->GetData(), $DataSet->GetDataDescription(), $angle);
-
-                    //which schema of color will be used
-                    $quant_resources = count($data[0]) - 1;
-                    // Adding the color schemma
-                    if ($quant_resources < 8) {
-                        $Test->loadColorPalette(api_get_path(LIBRARY_PATH) . "pchart/palette/reduced.txt");
-                    } else {
-                        $Test->loadColorPalette(api_get_path(LIBRARY_PATH) . "pchart/palette/default.txt");
-                    }
-
-                    $Test->setGraphArea(50, 30, 610, 300);
-
-                    $Test->drawFilledRoundedRectangle(7, 7, $Test->XSize + 20, $Test->YSize - 30, 5, 240, 240, 240);
-                    //$Test->drawRoundedRectangle(5,5,790,330,5,230,230,230);
-                    //background color area & stripe or not
-                    $Test->drawGraphArea(255, 255, 255, TRUE);
-                    $Test->drawScale($DataSet->GetData(), $DataSet->GetDataDescription(), SCALE_START0, 150, 150, 150, TRUE, 0, 1, FALSE);
-
-                    //background grid
-                    $Test->drawGrid(4, TRUE, 230, 230, 230, 50);
-
-                    // Draw the 0 line
-                    //$Test->setFontProperties(api_get_path(LIBRARY_PATH)."pchart/fonts/tahoma.ttf",6);
-                    //$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
-                    // Draw the bar graph
-                    $Test->drawBarGraph($DataSet->GetData(), $DataSet->GetDataDescription(), TRUE);
-
-                    //Set legend properties: width, height and text color and font
-                    $Test->setFontProperties(api_get_path(LIBRARY_PATH) . "pchart/fonts/tahoma.ttf", 9);
-                    $Test->drawLegend(620, 70, $DataSet->GetDataDescription(), 255, 255, 255);
-
-                    //Set title properties
-                    $Test->setFontProperties(api_get_path(LIBRARY_PATH) . "pchart/fonts/tahoma.ttf", 10);
-                    $Test->drawTitle(50, 22, get_lang('AverageResultsVsResource'), 50, 50, 80, 620);
-
-                    //------------------
-                    //echo 'not in cache';
-                    $Cache->WriteToCache($graph_id, $DataSet->GetData(), $Test);
-                    ob_start();
-                    $Test->Stroke();
-                    ob_end_clean();
-                    $img_file = $Cache->GetHash($graph_id, $DataSet->GetData());
-                }
-            }
-        }
-        return api_get_path(WEB_ARCHIVE_PATH) . $img_file;
-    }
-
     /**
      *
      */
     public function display_graph_by_resource()
     {
-        require_once api_get_path(LIBRARY_PATH) . 'pchart/pData.class.php';
-        require_once api_get_path(LIBRARY_PATH) . 'pchart/pChart.class.php';
-        require_once api_get_path(LIBRARY_PATH) . 'pchart/pCache.class.php';
-
-        $header_name = $this->datagen->get_header_names();
+        $headerName = $this->datagen->get_header_names();
         $total_users = $this->datagen->get_total_users_count();
-        $img_file = '';
 
         if ($this->datagen->get_total_items_count() > 0 && $total_users > 0) {
             //Removing first name
-            array_shift($header_name);
+            array_shift($headerName);
             //Removing last name
-            array_shift($header_name);
+            array_shift($headerName);
 
-            $displayscore = ScoreDisplay :: instance();
+            $displayscore = ScoreDisplay::instance();
             $customdisplays = $displayscore->get_custom_score_display_settings();
 
             if (is_array($customdisplays) && count(($customdisplays))) {
 
                 $user_results = $this->datagen->get_data_to_graph2(false);
                 $pre_result = $new_result = array();
-                $DataSet = new pData();
-                //filling the Dataset
                 foreach ($user_results as $result) {
-                    //print_r($result);
-                    for ($i = 0; $i < count($header_name); $i++) {
+                    for ($i = 0; $i < count($headerName); $i++) {
                         $pre_result[$i + 3][] = $result[$i + 1];
                     }
                 }
@@ -284,197 +159,150 @@ class FlatViewTable extends SortableTable
                 $resource_list = $new_list;
 
                 $i = 1;
-                $j = 0;
 
                 foreach ($resource_list as $key => $resource) {
-                    $new_resource_list = $new_resource_list_name = array();
-                    $DataSet = new pData();
                     // Reverse array, otherwise we get highest values first
                     $resource = array_reverse($resource, true);
-                    foreach ($resource as $name => $cant) {
-                        $DataSet->AddPoint($cant, "Serie" . $j);
-                        $DataSet->SetSerieName(strip_tags($name), "Serie" . $j);
-                        $j++;
-                    }
-                    //print_r($pre_result); print_r($header_name);
-                    // Dataset definition
-                    $DataSet->AddAllSeries();
-                    $DataSet->SetAbsciseLabelSerie('');
-                    $DataSet->SetXAxisName(get_lang('GradebookSkillsRanking'));
-                    $DataSet->SetYAxisName(get_lang('Students'));
-                    $show_draw = true;
+
+                    $dataSet = new pData();
+                    $dataSet->addPoints($resource, 'Serie');
+                    $dataSet->addPoints(array_keys($resource), 'Labels');
+                    $dataSet->setSerieDescription('Labels', strip_tags($headerName[$i - 1]));
+                    $dataSet->setAbscissa('Labels');
+                    $dataSet->setAbscissaName(get_lang('GradebookSkillsRanking'));
+                    $dataSet->setAxisName(0, get_lang('Students'));
+                    $palette = array(
+                        '0' => array('R' => 186, 'G' => 206, 'B' => 151, 'Alpha' => 100),
+                        '1' => array('R' => 210, 'G' => 148, 'B' => 147, 'Alpha' => 100),
+                        '2' => array('R' => 148, 'G' => 170, 'B' => 208, 'Alpha' => 100),
+                        '3' => array('R' => 221, 'G' => 133, 'B' => 61, 'Alpha' => 100),
+                        '4' => array('R' => 65, 'G' => 153, 'B' => 176, 'Alpha' => 100),
+                        '5' => array('R' => 114, 'G' => 88, 'B' => 144, 'Alpha' => 100),
+                        '6' => array('R' => 138, 'G' => 166, 'B' => 78, 'Alpha' => 100),
+                        '7' => array('R' => 171, 'G' => 70, 'B' => 67, 'Alpha' => 100),
+                        '8' => array('R' => 69, 'G' => 115, 'B' => 168, 'Alpha' => 100),
+                    );
                     // Cache definition
-                    $Cache = new pCache();
-                    // the graph id
-                    $gradebook_id = intval($_GET['selectcat']);
-                    $graph_id = api_get_user_id() . 'ByResource' . $gradebook_id . api_get_course_id() . api_get_session_id();
-
-                    if ($show_draw) {
-                        //if ($Cache->IsInCache($graph_id, $DataSet->GetData())) {
-                        if (0) {
-                            //if we already created the img we get the img file id
-                            //echo 'in cache';
-                            $img_file = $Cache->GetHash($graph_id, $DataSet->GetData());
-                        } else {
-                            // if the image does not exist in the archive/ folder
-                            // Initialise the graph
-                            $chart_size_w = 480;
-                            $chart_size_h = 250;
-                            $angle = -30;
-
-                            $Test = new pChart($chart_size_w, $chart_size_h);
-
-                            // set font of the axes
-                            $Test->setFontProperties(api_get_path(LIBRARY_PATH) . "pchart/fonts/tahoma.ttf", 8);
-
-                            $Test = $Test->fixHeightByRotation(
-                                $DataSet->GetData(),
-                                $DataSet->GetDataDescription(),
-                                $angle
-                            );
-
-                            // Adding the color schemma
-                            $Test->loadColorPalette(api_get_path(LIBRARY_PATH) . "pchart/palette/pastel.txt");
-
-                            $area_graph_w = $chart_size_w - 130;
-                            $Test->setGraphArea(50, 30, $area_graph_w, $chart_size_h - 50);
-
-                            $Test->drawFilledRoundedRectangle(
-                                5,
-                                5,
-                                $chart_size_w - 1,
-                                $Test->YSize - 20,
-                                5,
-                                240,
-                                240,
-                                240
-                            );
-                            //$Test->drawRoundedRectangle(5,5,790,330,5,230,230,230);
-                            //background color area & stripe or not
-                            $Test->drawGraphArea(255, 255, 255, TRUE);
-
-                            //Setting max height by default see #3296
-                            if (!empty($max)) {
-                                if (is_int($max)) {
-                                    $Test->setFixedScale(0, $max + 1, $max + 1);
-                                } else {
-                                    $Test->setFixedScale(0, $max);
-                                }
-                            }
-
-                            $Test->drawScale(
-                                $DataSet->GetData(),
-                                $DataSet->GetDataDescription(),
-                                SCALE_ADDALLSTART0,
-                                150,
-                                150,
-                                150,
-                                TRUE,
-                                0,
-                                1,
-                                FALSE
-                            );
-
-                            //background grid
-                            $Test->drawGrid(4, TRUE, 230, 230, 230, 50);
-
-                            // Draw the 0 line
-                            //$Test->setFontProperties(api_get_path(LIBRARY_PATH)."pchart/fonts/tahoma.ttf",6);
-                            //$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
-                            // Draw the bar graph
-                            $Test->setFontProperties(api_get_path(LIBRARY_PATH) . "pchart/fonts/tahoma.ttf", 11);
-                            $Test->drawBarGraph($DataSet->GetData(), $DataSet->GetDataDescription(), TRUE);
-
-                            //Set legend properties: width, height and text color and font
-                            $Test->setFontProperties(api_get_path(LIBRARY_PATH) . "pchart/fonts/tahoma.ttf", 9);
-                            $Test->drawLegend($area_graph_w + 10, 50, $DataSet->GetDataDescription(), 255, 255, 255);
-
-                            //Set title properties
-                            $Test->setFontProperties(api_get_path(LIBRARY_PATH) . "pchart/fonts/tahoma.ttf", 10);
-                            $Test->drawTitle(50, 22, strip_tags($header_name[$i - 1]), 50, 50, 80, $chart_size_w - 50);
-
-                            //------------------
-                            //echo 'not in cache';
-                            $Cache->WriteToCache($graph_id, $DataSet->GetData(), $Test);
-                            //ob_start();
-                            //$Test->Stroke();
-                            //ob_end_clean();
-                            $img_file = $Cache->GetHash($graph_id, $DataSet->GetData());
-                        }
-                        echo '<img src="' . api_get_path(WEB_ARCHIVE_PATH) . $img_file . '" >';
-                        if ($i % 2 == 0 && $i != 0) {
-                            echo '<br />';
-                        }
-                        $i++;
+                    $cachePath = api_get_path(SYS_ARCHIVE_PATH);
+                    $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
+                    $chartHash = $myCache->getHash($dataSet);
+                    if ($myCache->isInCache($chartHash)) {
+                        $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+                        $myCache->saveFromCache($chartHash, $imgPath);
+                        $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+                    } else {
+                        /* Create the pChart object */
+                        $widthSize = 480;
+                        $heightSize = 250;
+
+                        $myPicture = new pImage($widthSize, $heightSize, $dataSet);
+
+                        /* Turn of Antialiasing */
+                        $myPicture->Antialias = false;
+
+                        /* Add a border to the picture */
+                        $myPicture->drawRectangle(
+                            0,
+                            0,
+                            $widthSize - 1,
+                            $heightSize - 1,
+                            array(
+                                'R' => 0,
+                                'G' => 0,
+                                'B' => 0
+                            )
+                        );
+
+                        /* Set the default font */
+                        $myPicture->setFontProperties(
+                            array(
+                                'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                                'FontSize' => 10
+                            )
+                        );
+
+                        /* Write the chart title */
+                        $myPicture->drawText(
+                            250,
+                            30,
+                            strip_tags($headerName[$i - 1]),
+                            array(
+                                'FontSize' => 12,
+                                'Align' => TEXT_ALIGN_BOTTOMMIDDLE
+                            )
+                        );
+
+                        /* Define the chart area */
+                        $myPicture->setGraphArea(50, 40, $widthSize - 20, $heightSize - 50);
+
+                        /* Draw the scale */
+                        $scaleSettings = array(
+                            'GridR' => 200,
+                            'GridG' => 200,
+                            'GridB' => 200,
+                            'DrawSubTicks' => true,
+                            'CycleBackground' => true,
+                            'Mode' => SCALE_MODE_START0
+                        );
+                        $myPicture->drawScale($scaleSettings);
+
+                        /* Turn on shadow computing */
+                        $myPicture->setShadow(
+                            true,
+                            array(
+                                'X' => 1,
+                                'Y' => 1,
+                                'R' => 0,
+                                'G' => 0,
+                                'B' => 0,
+                                'Alpha' => 10
+                            )
+                        );
+
+                        /* Draw the chart */
+                        $myPicture->setShadow(
+                            true,
+                            array(
+                                'X' => 1,
+                                'Y' => 1,
+                                'R' => 0,
+                                'G' => 0,
+                                'B' => 0,
+                                'Alpha' => 10
+                            )
+                        );
+                        $settings = array(
+                            'OverrideColors' => $palette,
+                            'Gradient' => false,
+                            'GradientMode' => GRADIENT_SIMPLE,
+                            'DisplayPos' => LABEL_POS_TOP,
+                            'DisplayValues' => true,
+                            'DisplayR' => 0,
+                            'DisplayG' => 0,
+                            'DisplayB' => 0,
+                            'DisplayShadow' => true,
+                            'Surrounding' => 10,
+                        );
+                        $myPicture->drawBarChart($settings);
+
+                        /* Render the picture (choose the best way) */
+
+                        $myCache->writeToCache($chartHash, $myPicture);
+                        $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+                        $myCache->saveFromCache($chartHash, $imgPath);
+                        $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
                     }
-                } //end foreach
-            } else {
-                echo get_lang('ToViewGraphScoreRuleMustBeEnabled');
-            }
-            // Pie charts
-            /*
-              $show_draw = false;
-              $resource_list = array();
-              //print_r($pre_result_pie);
-
-              if ($total_users>0) {
-              foreach($pre_result_pie as $key=>$res_array) {
-              //$resource_list
-              foreach($res_array as $user_result) {
-              $total+=  $user_result / ($total_users*100);
-              }
-              echo $total;
-              //echo $total =  $res / ($total_users*100);
-              echo '<br>';
-              //$DataSet->AddPoint($total,"Serie".$i);
-              //$DataSet->SetSerieName($header_name[$i-1],"Serie".$i);
-
-              }
-              }
-              //here--------------
-              foreach($resource_list as $key=>$resource) {
-              $new_resource_list = $new_resource_list_name = array();
-
-              foreach($resource as $name=>$cant) {
-              $new_resource_list[]=$cant;
-              $new_resource_list_name[]=$name;
-              }
-              //Pie chart
-              $DataSet = new pData;
-              $DataSet->AddPoint($new_resource_list,"Serie1");
-              $DataSet->AddPoint($new_resource_list_name,"Serie2");
-              $DataSet->AddAllSeries();
-              $DataSet->SetAbsciseLabelSerie("Serie2");
-
-              $Test = new pChart(400,300);
-              $Test->loadColorPalette(api_get_path(LIBRARY_PATH)."pchart/palette/soft_tones.txt");
-              // background
-              //$Test->drawFilledRoundedRectangle(7,7,293,193,5,240,240,240);
-              // border color
-              $Test->drawRoundedRectangle(5,5,295,195,5,230,230,230);
-
-              // This will draw a shadow under the pie chart
-              //$Test->drawFilledCircle(122,102,70,200,200,200);
-
-              //Draw the pie chart
-              $Test->setFontProperties(api_get_path(LIBRARY_PATH)."pchart/fonts/tahoma.ttf",8);
-
-              $Test->drawBarGraph($DataSet->GetData(),$DataSet->GetDataDescription(),TRUE);
-              $tmp_path = api_get_path(SYS_ARCHIVE_PATH);
-
-              $Test->drawBasicPieGraph($DataSet->GetData(),$DataSet->GetDataDescription(),120,100,70,PIE_PERCENTAGE,255,255,218);
-              $Test->drawPieLegend(230,15,$DataSet->GetData(),$DataSet->GetDataDescription(),250,250,250);
-              $user_id = api_get_user_id();
-              $img_file_generated_name = $key.uniqid('').'gradebook.png';
-              $Test->Render($tmp_path.$img_file_generated_name);
-              chmod($tmp_path.$img_file_generated_name, api_get_permissions_for_new_files());
-
-              if ($i % 2 == 0 && $i!= 0) {
-              echo '<br>';
-              }
-              echo '<img src="'.api_get_path(WEB_ARCHIVE_PATH).$img_file_generated_name.'">';
-              }
-             */
+                    echo '<img src="' . $imgPath . '" >';
+                    if ($i % 2 == 0 && $i != 0) {
+                        echo '<br /><br />';
+                    } else {
+                        echo '&nbsp;&nbsp;&nbsp;';
+                    }
+                    $i++;
+                }
+            } //end foreach
+        } else {
+            echo get_lang('ToViewGraphScoreRuleMustBeEnabled');
         }
     }
 
@@ -541,10 +369,13 @@ class FlatViewTable extends SortableTable
         }
 
         // retrieve sorting type
+
         if ($is_western_name_order) {
-            $users_sorting = ($this->column == 0 ? FlatViewDataGenerator :: FVDG_SORT_FIRSTNAME : FlatViewDataGenerator :: FVDG_SORT_LASTNAME);
+            //$users_sorting = ($this->column == 0 ? FlatViewDataGenerator :: FVDG_SORT_FIRSTNAME : FlatViewDataGenerator :: FVDG_SORT_LASTNAME);
+            $users_sorting = FlatViewDataGenerator :: FVDG_SORT_FIRSTNAME;
         } else {
-            $users_sorting = ($this->column == 0 ? FlatViewDataGenerator :: FVDG_SORT_LASTNAME : FlatViewDataGenerator :: FVDG_SORT_FIRSTNAME);
+            //$users_sorting = ($this->column == 0 ? FlatViewDataGenerator :: FVDG_SORT_LASTNAME : FlatViewDataGenerator :: FVDG_SORT_FIRSTNAME);
+            $users_sorting = FlatViewDataGenerator :: FVDG_SORT_LASTNAME;
         }
         if ($this->direction == 'DESC') {
             $users_sorting |= FlatViewDataGenerator :: FVDG_SORT_DESC;
@@ -555,16 +386,15 @@ class FlatViewTable extends SortableTable
 
         $header_names = $this->datagen->get_header_names($this->offset, $selectlimit);
 
-        $column = 0;
-
         if ($is_western_name_order) {
-            $this->set_header($column++, $header_names[1]);
-            $this->set_header($column++, $header_names[0]);
+            $this->set_header(0, $header_names[1]);
+            $this->set_header(1, $header_names[0]);
         } else {
-            $this->set_header($column++, $header_names[0]);
-            $this->set_header($column++, $header_names[1]);
+            $this->set_header(0, $header_names[0]);
+            $this->set_header(1, $header_names[1]);
         }
 
+        $column = 2;
         while ($column < count($header_names)) {
             $this->set_header($column, $header_names[$column], false);
             $column++;

+ 16 - 9
main/gradebook/lib/flatview_data_generator.class.php

@@ -157,9 +157,11 @@ class FlatViewDataGenerator
             $session_id,
             'ORDER BY id'
         );
+
         $evaluationsAdded = array();
         if ($parent_id == 0 && !empty($allcat)) {
             // Means there are any subcategory
+
             foreach ($allcat as $sub_cat) {
                 $sub_cat_weight = round(100 * $sub_cat->get_weight() / $main_weight, 1);
                 $add_weight = " $sub_cat_weight %";
@@ -216,7 +218,8 @@ class FlatViewDataGenerator
                 $max = $score[0];
             }
         }
-        return $max ;
+
+        return $max;
     }
 
     /**
@@ -389,7 +392,12 @@ class FlatViewDataGenerator
 
             $course_code = api_get_course_id();
             $session_id = api_get_session_id();
-            $allcat = $this->category->get_subcategories(null, $course_code, $session_id, 'ORDER BY id');
+            $allcat = $this->category->get_subcategories(
+                null,
+                $course_code,
+                $session_id,
+                'ORDER BY id'
+            );
 
             $evaluationsAdded = array();
 
@@ -400,7 +408,7 @@ class FlatViewDataGenerator
 
                     $real_score = $score;
 
-                    $divide = ( ($score[1])==0 ) ? 1 : $score[1];
+                    $divide = $score[1] == 0 ? 1 : $score[1];
 
                     $sub_cat_percentage = $sum_categories_weight_array[$sub_cat->get_id()];
                     $item_value  = $score[0]/$divide*$main_weight;
@@ -410,10 +418,10 @@ class FlatViewDataGenerator
                     $item_value = $percentage*$item_value;
                     $item_total += $sub_cat->get_weight();
                     /*
-                                        if ($convert_using_the_global_weight) {
-                                            $score[0] = $score[0]/$main_weight*$sub_cat->get_weight();
-                                            $score[1] = $main_weight ;
-                                        }
+                        if ($convert_using_the_global_weight) {
+                            $score[0] = $score[0]/$main_weight*$sub_cat->get_weight();
+                            $score[1] = $main_weight ;
+                        }
                     */
                     if (api_get_setting('gradebook_show_percentage_in_reports') == 'false') {
                         //if (true)
@@ -427,8 +435,7 @@ class FlatViewDataGenerator
                     }
 
                     if (!isset($this->params['only_total_category']) ||
-                        (isset($this->params['only_total_category']) &&
-                            $this->params['only_total_category'] == false)
+                        (isset($this->params['only_total_category']) && $this->params['only_total_category'] == false)
                     ) {
                         if (!$show_all) {
                             $row[] = $temp_score.' ';

+ 2 - 0
main/gradebook/lib/scoredisplay.class.php

@@ -364,9 +364,11 @@ class ScoreDisplay
                 return $this->display_as_div($score).' (' . $this->display_as_percent($score) . ')'.$custom;
             case SCORE_DIV_SIMPLE_WITH_CUSTOM :         // X - Good!
                 $custom = $this->display_custom($score);
+
                 if (!empty($custom)) {
                     $custom = ' - '.$custom;
                 }
+
                 return $this->display_simple_score($score).$custom;
                 break;
             case SCORE_DIV_SIMPLE_WITH_CUSTOM_LETTERS:

+ 19 - 0
main/inc/autoload.inc.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Set up the Chamilo autoload stack. Can be called several time if needed also
+ * better to avoid it.
+ */
+
+require_once dirname(__FILE__) . '/lib/autoload.class.php';
+require_once __DIR__ . '/../../vendor/autoload.php';
+Autoload::register();
+
+/**
+use Symfony\Component\ClassLoader\UniversalClassLoader;
+$loader = new UniversalClassLoader();
+$loader->registerNamespaces(array(
+    'Symfony\\Component\\HttpFoundation', __DIR__.'/vendor/symfony/http-foundation',
+));
+$loader->register();
+ */

+ 11 - 9
main/inc/global.inc.php

@@ -115,17 +115,19 @@ if (empty($_configuration['statistics_database']) && $already_installed) {
 global $database_connection;
 // Connect to the server database and select the main chamilo database.
 // When $_configuration['db_persistent_connection'] is set, it is expected to be a boolean type.
+$dbPersistConnection = api_get_configuration_value('db_persistent_connection');
+// $_configuration['db_client_flags'] can be set in configuration.php to pass
+// flags to the DB connection
+$dbFlags = api_get_configuration_value('db_client_flags');
+
 $params = array(
-    'server'        => $_configuration['db_host'],
-    'username'      => $_configuration['db_user'],
-    'password'      => $_configuration['db_password'],
-    'persistent'    => $_configuration['db_persistent_connection']
+    'server' => $_configuration['db_host'],
+    'username' => $_configuration['db_user'],
+    'password' => $_configuration['db_password'],
+    'persistent' => $dbPersistConnection,
+    'client_flags' => $dbFlags,
 );
-// $_configuration['db_client_flags'] can be set in configuration.php to pass 
-// flags to the DB connection
-if (isset($_configuration['db_client_flags']) && !empty($_configuration['db_client_flags'])) {
-    $params['client_flags'] = $_configuration['db_client_flags'];
-}
+
 if (!($conn_return = @Database::connect($params))) {
     $global_error_code = 3;
     // The database server is not available or credentials are invalid.

+ 101 - 0
main/inc/lib/TeacherTimeReport.php

@@ -0,0 +1,101 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+/**
+ * Library for generate a teacher time report
+ *
+ * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
+ * @package chamilo.admin
+ */
+class TeacherTimeReport
+{
+
+    /**
+     * The report data
+     * @var array
+     */
+    public $data = array();
+
+    /**
+     * Callback for compare sessions names
+     * @param array $dataA The datab A
+     * @param array $dataB The data B
+     * @return int returns -1 if dataA is less than dataB, 1 if dataA is greater than dataB, and 0 if they are equal 
+     */
+    public function compareSessions($dataA, $dataB)
+    {
+        return strnatcmp($dataA['session']['name'], $dataB['session']['name']);
+    }
+
+    /**
+     * Callback for compare courses names
+     * @param array $dataA The datab A
+     * @param array $dataB The data B
+     * @return int returns -1 if dataA is less than dataB, 1 if dataA is greater than dataB, and 0 if they are equal 
+     */
+    public function compareCourses($dataA, $dataB)
+    {
+        return strnatcmp($dataA['course']['name'], $dataB['course']['name']);
+    }
+
+    /**
+     * Callback for compare coaches names
+     * @param array $dataA The datab A
+     * @param array $dataB The data B
+     * @return int returns -1 if dataA is less than dataB, 1 if dataA is greater than dataB, and 0 if they are equal 
+     */
+    public function compareCoaches($dataA, $dataB)
+    {
+        return strnatcmp($dataA['coach']['completeName'], $dataB['coach']['completeName']);
+    }
+
+    /**
+     * Sort the report data
+     * @param boolean $withFilter Whether sort by sessions and courses
+     */
+    public function sortData($withFilter = false)
+    {
+        if ($withFilter) {
+            uasort($this->data, array($this, 'compareSessions'));
+            uasort($this->data, array($this, 'compareCourses'));
+        }
+
+        uasort($this->data, array($this, 'compareCoaches'));
+    }
+
+    public function prepareDataToExport($withFilter = false)
+    {
+        $dataToExport = array();
+
+        if ($withFilter) {
+            $dataToExport[] = array(
+                get_lang('Session'),
+                get_lang('Course'),
+                get_lang('Coach'),
+                get_lang('TotalTime')
+            );
+        } else {
+            $dataToExport[] = array(
+                get_lang('Coach'),
+                get_lang('TotalTime')
+            );
+        }
+
+        foreach ($this->data as $row) {
+            $data = array();
+
+            if ($withFilter) {
+                $data[] = $row['session']['name'];
+                $data[] = $row['course']['name'];
+            }
+
+            $data[] = $row['coach']['completeName'];
+            $data[] = $row['totalTime'];
+
+            $dataToExport[] = $data;
+        }
+
+        return $dataToExport;
+    }
+
+}

+ 0 - 4
main/inc/lib/autoload.class.php

@@ -751,7 +751,6 @@ class Autoload
         $result['MultipleAnswerCombination'] = '/main/exercice/multiple_answer_combination.class.php';
         $result['MultipleAnswerCombinationTrueFalse'] = '/main/exercice/multiple_answer_combination_true_false.class.php';
         $result['MultipleAnswerTrueFalse'] = '/main/exercice/multiple_answer_true_false.class.php';
-        $result['MyHorBar'] = '/main/inc/lib/pchart/MyHorBar.class.php';
         $result['MySpace'] = '/main/mySpace/myspace.lib.php';
         $result['Nanogong'] = '/main/inc/lib/nanogong.lib.php';
         $result['NotebookManager'] = '/main/inc/lib/notebook.lib.php';
@@ -975,9 +974,6 @@ class Autoload
         $result['learnpath_processor'] = '/main/inc/lib/search/tool_processors/learnpath_processor.class.php';
         $result['link_processor'] = '/main/inc/lib/search/tool_processors/link_processor.class.php';
         $result['net\HttpChannel'] = '/main/inc/lib/system/net/http_channel.class.php';
-        $result['pCache'] = '/main/inc/lib/pchart/pCache.class.php';
-        $result['pChart'] = '/main/inc/lib/pchart/pChart.class.php';
-        $result['pData'] = '/main/inc/lib/pchart/pData.class.php';
         $result['quiz_processor'] = '/main/inc/lib/search/tool_processors/quiz_processor.class.php';
         $result['scorm'] = '/main/newscorm/scorm.class.php';
         $result['scormItem'] = '/main/newscorm/scormItem.class.php';

+ 1 - 1
main/inc/lib/database.lib.php

@@ -411,7 +411,7 @@ class Database
         if (!isset($parameters['new_link'])) {
             $parameters['new_link'] = false;
         }
-        if (!isset($parameters['client_flags'])) {
+        if (!isset($parameters['client_flags']) || empty($parameters['client_flags'])) {
             $parameters['client_flags'] = 0;
         }
 

+ 10 - 1
main/inc/lib/main_api.lib.php

@@ -285,6 +285,8 @@ define('WEB_AJAX_PATH', 'WEB_AJAX_PATH');
 define('SYS_TEST_PATH', 'SYS_TEST_PATH');
 define('WEB_TEMPLATE_PATH', 'WEB_TEMPLATE_PATH');
 define('SYS_TEMPLATE_PATH', 'SYS_TEMPLATE_PATH');
+define('WEB_FONTS_PATH', 'WEB_FONTS_PATH');
+define('SYS_FONTS_PATH', 'SYS_FONTS_PATH');
 
 // Constants for requesting path conversion.
 define('TO_WEB', 'TO_WEB');
@@ -477,7 +479,9 @@ function api_get_path($path_type, $path = null)
         WEB_AJAX_PATH           => 'inc/ajax/',
         SYS_TEST_PATH           => 'tests/',
         WEB_TEMPLATE_PATH       => 'template/',
-        SYS_TEMPLATE_PATH       => 'template/'
+        SYS_TEMPLATE_PATH       => 'template/',
+        WEB_FONTS_PATH          => 'fonts/',
+        SYS_FONTS_PATH          => 'fonts/',
     );
 
     static $resource_paths = array(
@@ -582,11 +586,13 @@ function api_get_path($path_type, $path = null)
         $paths[SYS_TEST_PATH]           = $paths[SYS_PATH].$paths[SYS_TEST_PATH];
         $paths[SYS_TEMPLATE_PATH]       = $paths[SYS_CODE_PATH].$paths[SYS_TEMPLATE_PATH];
         $paths[SYS_CSS_PATH]            = $paths[SYS_CODE_PATH].$paths[SYS_CSS_PATH];
+        $paths[SYS_FONTS_PATH]          = $paths[SYS_CODE_PATH].$paths[SYS_FONTS_PATH];
 
         $paths[WEB_CSS_PATH]            = $paths[WEB_CODE_PATH].$paths[WEB_CSS_PATH];
         $paths[WEB_IMG_PATH]            = $paths[WEB_CODE_PATH].$paths[WEB_IMG_PATH];
         $paths[WEB_LIBRARY_PATH]        = $paths[WEB_CODE_PATH].$paths[WEB_LIBRARY_PATH];
         $paths[WEB_AJAX_PATH]           = $paths[WEB_CODE_PATH].$paths[WEB_AJAX_PATH];
+        $paths[WEB_FONTS_PATH]          = $paths[WEB_CODE_PATH].$paths[WEB_FONTS_PATH];
 
         $paths[WEB_PLUGIN_PATH]         = $paths[WEB_PATH].$paths[WEB_PLUGIN_PATH];
         $paths[WEB_ARCHIVE_PATH]        = $paths[WEB_PATH].$paths[WEB_ARCHIVE_PATH];
@@ -632,6 +638,7 @@ function api_get_path($path_type, $path = null)
             $paths[WEB_ARCHIVE_PATH]        = $paths[WEB_PATH].$web_paths[WEB_ARCHIVE_PATH];
             $paths[WEB_LIBRARY_PATH]        = $paths[WEB_CODE_PATH].$web_paths[WEB_LIBRARY_PATH];
             $paths[WEB_AJAX_PATH]           = $paths[WEB_CODE_PATH].$web_paths[WEB_AJAX_PATH];
+            $paths[WEB_FONTS_PATH]          = $paths[WEB_CODE_PATH].$paths[WEB_FONTS_PATH];
         }
     }
 
@@ -1307,6 +1314,8 @@ function api_get_user_info_from_username($username = '')
     if (empty($username)) {
         return false;
     }
+    $username = trim($username);
+
     $sql = "SELECT * FROM ".Database :: get_main_table(TABLE_MAIN_USER)."
             WHERE username='".Database::escape_string($username)."'";
     $result = Database::query($sql);

+ 0 - 450
main/inc/lib/pchart/MyHorBar.class.php

@@ -1,450 +0,0 @@
-<?php
-
-/*
-     pChart - a PHP class to build charts!
-     Copyright (C) 2008 Jean-Damien POGOLOTTI
-     Version  1.27d last updated on 09/30/08
-
-     Extension by Gabriele FERRI
-	http://www.gabrieleferri.it
-	MyHorBar.class is writen to extend pChart.class to write a horizontal bar charts
-	Copyright (C) 2009 Gabriele FERRI
-	version 1.0beta 08/05/2009
-	Contact me with bug reports and comments: info@gabrieleferri.it
-
-
-     http://pchart.sourceforge.net
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation, either version 1,2,3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
     Draw methods :
-	drawHorBarGraph($Data,$DataDescription,$Shadow=TRUE,$Alpha=100)
-	drawHorScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$RightScale=FALSE)
-	drawHorGrid($LineWidth,$Mosaic,$R=220,$G=220,$B=220,$Alpha=100)
-	drawTreshold($Value,$R,$G,$B,$ShowLabel=FALSE,$ShowOnBottom=FALSE,$TickWidth=4,$FreeText=NULL,$Angle=0)
-*/
-
-class MyHorBar extends pChart
-  {
-
-
-   /* This function draw a bar graph */
-   function drawHorBarGraph($Data,$DataDescription,$Shadow=TRUE,$Alpha=100)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawBarGraph",$DataDescription);
-     $this->validateData("drawBarGraph",$Data);
-
-     $GraphID      = 0;
-     $Series       = count($DataDescription["Values"]);
-     $SeriesWidth  = $this->DivisionWidth / ($Series+1);
-
-     $SerieYOffset = $this->DivisionWidth / 2 - $SeriesWidth * $Series / 2;
-     
-     $XZero  = $this->GArea_X1 + ((0-$this->VMin) * $this->DivisionRatio);
-     if ( $XZero < $this->GArea_X1 ) { $XZero = $this->GArea_X1; }
-
-     $SerieID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $YPos  = $this->GArea_Y1 + $this->GAreaXOffset + $SerieYOffset + $SeriesWidth * $SerieID;
-
-       $XLast = -1;
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$ColName]))
-          {
-           if ( is_numeric($Data[$Key][$ColName]) )
-            {
-             $Value = $Data[$Key][$ColName];
-
-	     $XPos = $this->GArea_X1 + (($Value-$this->VMin) * $this->DivisionRatio);
-
-             /* Save point into the image map if option activated */
-             if ( $this->BuildMap )
-              {
-               $this->addToImageMap(min($XZero,$XPos),$YPos+1,max($XZero,$XPos), $YPos+$SeriesWidth-1,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Bar");
-              }
-           
-             if ( $Shadow && $Alpha == 100 )
-              $this->drawRectangle($XZero,$YPos+1,$XPos,$YPos+$SeriesWidth-1,25,25,25,TRUE,$Alpha);
-
-             $this->drawFilledRectangle($XZero,$YPos+1,$XPos,$YPos+$SeriesWidth-1,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha);
-            }
-          }
-         $YPos = $YPos + $this->DivisionWidth;
-        }
-       $SerieID++;
-      }
-    }
-
-
-/* Compute and draw the scale */
-   function drawHorScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$RightScale=FALSE)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateData("drawScale",$Data);
-
-     $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B);
-
-     $this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y1,$R,$G,$B);
-     $this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X1,$this->GArea_Y2,$R,$G,$B);
-
-     if ( $this->VMin == NULL && $this->VMax == NULL)
-      {
-       if (isset($DataDescription["Values"][0]))
-        {
-         $this->VMin = $Data[0][$DataDescription["Values"][0]];
-         $this->VMax = $Data[0][$DataDescription["Values"][0]];
-        }
-       else { $this->VMin = 2147483647; $this->VMax = -2147483647; }
-
-       /* Compute Min and Max values */
-       if ( $ScaleMode == SCALE_NORMAL || $ScaleMode == SCALE_START0 )
-        {
-         if ( $ScaleMode == SCALE_START0 ) { $this->VMin = 0; }
-
-         foreach ( $Data as $Key => $Values )
-          {
-           foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-            {
-             if (isset($Data[$Key][$ColName]))
-              {
-               $Value = $Data[$Key][$ColName];
-
-               if ( is_numeric($Value) )
-                {
-                 if ( $this->VMax < $Value) { $this->VMax = $Value; }
-                 if ( $this->VMin > $Value) { $this->VMin = $Value; }
-                }
-              }
-            }
-          }
-        }
-       elseif ( $ScaleMode == SCALE_ADDALL || $ScaleMode == SCALE_ADDALLSTART0 ) /* Experimental */
-        {
-         if ( $ScaleMode == SCALE_ADDALLSTART0 ) { $this->VMin = 0; }
-
-         foreach ( $Data as $Key => $Values )
-          {
-           $Sum = 0;
-           foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-            {
-             if (isset($Data[$Key][$ColName]))
-              {
-               $Value = $Data[$Key][$ColName];
-               if ( is_numeric($Value) )
-                $Sum  += $Value;
-              }
-            }
-           if ( $this->VMax < $Sum) { $this->VMax = $Sum; }
-           if ( $this->VMin > $Sum) { $this->VMin = $Sum; }
-          }
-        }
-
-       if ( $this->VMax > preg_replace('/\.[0-9]+/','',$this->VMax) )
-        $this->VMax = preg_replace('/\.[0-9]+/','',$this->VMax)+1;
-
-       /* If all values are the same */
-       if ( $this->VMax == $this->VMin )
-        {
-         if ( $this->VMax >= 0 ) { $this->VMax++; }
-         else { $this->VMin--; }
-        }
-
-       $DataRange = $this->VMax - $this->VMin;
-       if ( $DataRange == 0 ) { $DataRange = .1; }
-
-       /* Compute automatic scaling */
-       $ScaleOk = FALSE; $Factor = 1;
-       $MinDivHeight = 25;
-
-       $MaxDivs = ($this->GArea_X2 - $this->GArea_X1) / $MinDivHeight;
-
-       if ( $this->VMin == 0 && $this->VMax == 0 )
-        { $this->VMin = 0; $this->VMax = 2; $Scale = 1; $Divisions = 2;}
-       elseif ($MaxDivs > 1)
-        {
-         while(!$ScaleOk)
-          {
-           $Scale1 = ( $this->VMax - $this->VMin ) / $Factor;
-           $Scale2 = ( $this->VMax - $this->VMin ) / $Factor / 2;
-           $Scale4 = ( $this->VMax - $this->VMin ) / $Factor / 4;
-
-           if ( $Scale1 > 1 && $Scale1 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale1); $Scale = 1;}
-           if ( $Scale2 > 1 && $Scale2 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale2); $Scale = 2;}
-           if (!$ScaleOk)
-            {
-             if ( $Scale2 > 1 ) { $Factor = $Factor * 10; }
-             if ( $Scale2 < 1 ) { $Factor = $Factor / 10; }
-            }
-          }
-
-         if ( floor($this->VMax / $Scale / $Factor) != $this->VMax / $Scale / $Factor)
-          {
-           $GridID     = floor ( $this->VMax / $Scale / $Factor) + 1;
-           $this->VMax = $GridID * $Scale * $Factor;
-           $Divisions++;
-          }
-
-         if ( floor($this->VMin / $Scale / $Factor) != $this->VMin / $Scale / $Factor)
-          {
-           $GridID     = floor( $this->VMin / $Scale / $Factor);
-           $this->VMin = $GridID * $Scale * $Factor;
-           $Divisions++;
-          }
-        }
-       else /* Can occurs for small graphs */
-        $Scale = 1;
-
-       if ( !isset($Divisions) )
-        $Divisions = 2;
-
-       if ($Scale == 1 && $Divisions%2 == 1)
-        $Divisions--;
-      }
-     else
-      $Divisions = $this->Divisions;
-
-     $this->DivisionCount = $Divisions;
-
-     $DataRange = $this->VMax - $this->VMin;
-     if ( $DataRange == 0 ) { $DataRange = .1; }
-
-     $this->DivisionHeight = ( $this->GArea_X2 - $this->GArea_X1 ) / $Divisions;
-     $this->DivisionRatio  = ( $this->GArea_X2 - $this->GArea_X1 ) / $DataRange;
-
-     $this->GAreaYOffset  = 0;
-     if ( count($Data) > 1 )
-      {
-       if ( $WithMargin == FALSE )
-	$this->DivisionWidth = ( $this->GArea_Y2 - $this->GArea_Y1 ) / (count($Data)-1);
-       else
-        {
-	 $this->DivisionWidth = ( $this->GArea_Y2 - $this->GArea_Y1 ) / (count($Data));
-	 $this->GAreaYOffset  = $this->DivisionWidth / 2;
-        }
-      }
-     else
-      {
-       $this->DivisionWidth = $this->GArea_Y2 - $this->GArea_Y1;
-       $this->GAreaYOffset  = $this->DivisionWidth / 2;
-      }
-
-     $this->DataCount = count($Data);
-
-     if ( $DrawTicks == FALSE )
-      return(0);
-
-     $XPos = $this->GArea_X1;
-     $YMin = NULL;
-
-     for($i=1;$i<=$Divisions+1;$i++)
-      {
-	$this->drawLine($XPos,$this->GArea_Y1,$XPos,$this->GArea_Y1-5,$R,$G,$B);
-
-       $Value     = $this->VMin + ($i-1) * (( $this->VMax - $this->VMin ) / $Divisions);
-       $Value     = round($Value * pow(10,$Decimals)) / pow(10,$Decimals);
-       if ( $DataDescription["Format"]["Y"] == "number" )
-        $Value = $Value.$DataDescription["Unit"]["Y"];
-       if ( $DataDescription["Format"]["Y"] == "time" )
-        $Value = $this->ToTime($Value);        
-       if ( $DataDescription["Format"]["Y"] == "date" )
-        $Value = $this->ToDate($Value);        
-       if ( $DataDescription["Format"]["Y"] == "metric" )
-        $Value = $this->ToMetric($Value);        
-       if ( $DataDescription["Format"]["Y"] == "currency" )
-        $Value = $this->ToCurrency($Value);        
-		
-       $Position  = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextWidth = $Position[2]-$Position[0];
-
-         imagettftext($this->Picture,$this->FontSize,0,$XPos-($this->FontSize/2),$this->GArea_Y1-10,$C_TextColor,$this->FontName,$Value);
-         
-	 if ( $YMin > $this->GArea_Y1-10-$TextWidth || $YMin == NULL ) { $YMin = $this->GArea_Y1-10-$TextWidth; }
-
-       $XPos = $XPos + $this->DivisionHeight;
-      }
-
-     /* Write the Y Axis caption if set */ 
-     if ( isset($DataDescription["Axis"]["Y"]) )
-      {
-       $Position   = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["Y"]);
-       $TextHeight = abs($Position[1])+abs($Position[3]);
-       $TextTop = (($this->GArea_X2 - $this->GArea_X1) / 2) + $this->GArea_X1 + ($TextHeight/2);
-
-	imagettftext($this->Picture,$this->FontSize,90,$YMin-$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]);
-      }
-
-     /* Horizontal Axis */
-     $YPos = $this->GArea_Y1 + $this->GAreaYOffset;
-     $ID = 1;
-     $XMax = NULL;
-     foreach ( $Data as $Key => $Values )
-      {
-       if ( $ID % $SkipLabels == 0 )
-        {
-         
-	 $this->drawLine($this->GArea_X1,floor($YPos),$this->GArea_X1-5,floor($YPos),$R,$G,$B);
-         $Value      = $Data[$Key][$DataDescription["Position"]];
-         if ( $DataDescription["Format"]["X"] == "number" )
-          $Value = $Value.$DataDescription["Unit"]["X"];
-         if ( $DataDescription["Format"]["X"] == "time" )
-          $Value = $this->ToTime($Value);        
-         if ( $DataDescription["Format"]["X"] == "date" )
-          $Value = $this->ToDate($Value);        
-         if ( $DataDescription["Format"]["X"] == "metric" )
-          $Value = $this->ToMetric($Value);        
-         if ( $DataDescription["Format"]["X"] == "currency" )
-          $Value = $this->ToCurrency($Value);        
-
-         $Position   = imageftbbox($this->FontSize,$Angle,$this->FontName,$Value);
-         $TextWidth  = abs($Position[2])+abs($Position[0]);
-         $TextHeight = abs($Position[1])+abs($Position[3]);
-
-         if ( $Angle == 0 )
-          {
-	   $XPos = $this->GArea_Y2+18;
	   imagettftext($this->Picture,$this->FontSize,$Angle,$this->GArea_X1-10-floor($TextWidth),floor($YPos)+5-floor($TextHeight/2),$C_TextColor,$this->FontName,$Value);
-
-          }
-         else
-          {
-	   $XPos = $this->GArea_Y2+10+$TextHeight;
-           if ( $Angle <= 90 )
-	    imagettftext($this->Picture,$this->FontSize,$Angle,$XPos,floor($YPos)-$TextWidth+5,$C_TextColor,$this->FontName,$Value);
-           else
-	    imagettftext($this->Picture,$this->FontSize,$Angle,$XPos,floor($YPos)+$TextWidth+5,$C_TextColor,$this->FontName,$Value);
-          }
-	 if ( $XMax < $XPos || $XMax == NULL ) { $XMax = $XPos; }
-        }
-
-       $YPos = $YPos + $this->DivisionWidth;
-       $ID++;
-      }
-
-    /* Write the X Axis caption if set */ 
-    if ( isset($DataDescription["Axis"]["Y"]) )
-      {
-       $Position = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["Y"]);
-       $TextWidth  = abs($Position[2])+abs($Position[0]);
-       $TextLeft   = (($this->GArea_Y2 - $this->GArea_Y1) / 2) + $this->GArea_Y1 + ($TextWidth/2);
-
-       imagettftext($this->Picture,$this->FontSize,0,$TextLeft,$XMax+$this->FontSize+5,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]);
-      }
-    }
-
-
-   /* Compute and draw the scale */
-   function drawHorGrid($LineWidth,$Mosaic=TRUE,$R=220,$G=220,$B=220,$Alpha=100)
-    {
-     /* Draw mosaic */
-     if ( $Mosaic )
-      {
-       $LayerWidth  = $this->GArea_Y2-$this->GArea_Y1;
-       $LayerHeight = $this->GArea_X2-$this->GArea_X1;
-
-       $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-       $C_White =$this->AllocateColor($this->Layers[0],255,255,255);
-       imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-       imagecolortransparent($this->Layers[0],$C_White);
-
-       $C_Rectangle =$this->AllocateColor($this->Layers[0],250,250,250);
-       $XPos  = $LayerHeight;
-       $LastX = $XPos;
-
-       for($i=0;$i<=$this->DivisionCount;$i++)
-        {
-	 $LastX = $XPos;
-	 $XPos  = $XPos - $this->DivisionHeight;
-
-	 if ( $XPos <= 0 ) { $XPos = 1; }
-
-         if ( $i % 2 == 0 )
-          {
-	   imagefilledrectangle($this->Layers[0],$XPos,1,$LastX,$LayerWidth-1,$C_Rectangle);
-          }
-        }
-       imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
-       imagedestroy($this->Layers[0]);
-      }
-
-     /* Vertical lines */
-     $XPos = $this->GArea_X2 - $this->DivisionHeight;
-     for($i=1;$i<=$this->DivisionCount;$i++)
-      {
-       if ( $XPos > $this->GArea_X1 && $XPos < $this->GArea_X2 )
-        $this->drawDottedLine($XPos,$this->GArea_Y1,$XPos,$this->GArea_Y2,$LineWidth,$R,$G,$B);
-        $XPos = $XPos - $this->DivisionHeight;
-      }
-
-     /* Horizontal lines */
-     if ( $this->GAreaYOffset == 0 )
-      { $YPos = $this->GArea_Y1 + $this->DivisionWidth + $this->GAreaYOffset;
-	$ColCount = $this->DataCount-2; }
-     else
-      { $YPos = $this->GArea_Y1 + $this->GAreaYOffset;
-	//$ColCount = floor( ($this->GArea_X2 - $this->GArea_X1) / $this->DivisionWidth );
-	$ColCount = $this->DataCount;
-      }
-
-     for($i=1;$i<=$ColCount;$i++)
-      {
-       if ( $YPos > $this->GArea_Y1 && $YPos < $this->GArea_Y2 )
-        $this->drawDottedLine($this->GArea_X1,floor($YPos),$this->GArea_X2,floor($YPos),$LineWidth,$R,$G,$B);
-
-	$YPos = $YPos + $this->DivisionWidth;
-      }
-    }
-
-
-/* Compute and draw the scale */
-   function drawTreshold($Value,$R,$G,$B,$ShowLabel=FALSE,$ShowOnBottom=FALSE,$TickWidth=4,$FreeText=NULL,$Angle=0)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B);
-     $X = $this->GArea_X1 + ($Value - $this->VMin) * $this->DivisionRatio;
-
-     if ( $X <= $this->GArea_X1 || $X >= $this->GArea_X2 )
-      return(-1);
-
-     if ( $TickWidth == 0 )
-      $this->drawLine($X,$this->GArea_Y1,$X,$this->GArea_Y2,$R,$G,$B);
-     else
-      $this->drawDottedLine($X,$this->GArea_Y1,$X,$this->GArea_Y2,$TickWidth,$R,$G,$B);
-
-     if ( $ShowLabel )
-      {
-       if ( $FreeText == NULL )
-        { $Label = $Value; } else { $Label = $FreeText; }
-
-       $Position = imageftbbox($this->FontSize,$Angle,$this->FontName,$Label);
-       $TextWidth  = abs($Position[2])-abs($Position[0]);
-       $TextLeft   = abs($Position[3])-abs($Position[1]);
-
-       if ( $ShowOnBottom )
-        imagettftext($this->Picture,$this->FontSize,$Angle,$X+9,$this->GArea_Y2,$C_TextColor,$this->FontName,$Label);
-       else
-        imagettftext($this->Picture,$this->FontSize,$Angle,$X+9,$this->GArea_Y1+$TextLeft,$C_TextColor,$this->FontName,$Label);
-      }
-    }
-
-
-  }
-?>

+ 0 - 6
main/inc/lib/pchart/fonts/index.html

@@ -1,6 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-</body>
-</html>

BIN
main/inc/lib/pchart/fonts/tahoma.ttf


+ 0 - 6
main/inc/lib/pchart/index.html

@@ -1,6 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-</body>
-</html>

+ 0 - 121
main/inc/lib/pchart/pCache.class.php

@@ -1,121 +0,0 @@
-<?php
- /*
-     pCache - Faster renderding using data cache
-     Copyright (C) 2008 Jean-Damien POGOLOTTI
-     Version  1.1.2 last updated on 06/17/08
-
-     http://pchart.sourceforge.net
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation, either version 1,2,3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     Class initialisation :
-      pCache($CacheFolder="Cache/")
-     Cache management :
-      IsInCache($Data)
-      GetFromCache($ID,$Data)
-      WriteToCache($ID,$Data,$Picture)
-      DeleteFromCache($ID,$Data)
-      ClearCache()
-     Inner functions :
-      GetHash($ID,$Data)
- */
-
- /* pCache class definition */
-require_once dirname(__FILE__) . '/../../global.inc.php';
-//the cache default folder was changed
- class pCache
-  {
-   var $HashKey     = "";
-   var $CacheFolder = "";
-
-   /* Create the pCache object */
-   function pCache($CacheFolder="Cache/")
-    {
-     $this->CacheFolder = api_get_path(SYS_ARCHIVE_PATH);
-    }
-
-   /* This function is clearing the cache folder */
-   function ClearCache()
-    {
-     if ($handle = opendir($this->CacheFolder))
-      {
-       while (false !== ($file = readdir($handle)))
-        {
-         if ( $file != "." && $file != ".." )
-          unlink($this->CacheFolder.$file);
-        }
-       closedir($handle);
-      }
-    }
-
-   /* This function is checking if we have an offline version of this chart */
-   function IsInCache($ID,$Data,$Hash="")
-    {
-     if ( $Hash == "" )
-      $Hash = $this->GetHash($ID,$Data);
-
-     if ( file_exists($this->CacheFolder.$Hash) )
-      return(TRUE);
-     else
-      return(FALSE);
-    }
-
-   /* This function is making a copy of drawn chart in the cache folder */
-   function WriteToCache($ID,$Data,$Picture)
-    {
-     $Hash     = $this->GetHash($ID,$Data);
-     $FileName = $this->CacheFolder.$Hash;
-
-     imagepng($Picture->Picture,$FileName);
-    }
-
-   /* This function is removing any cached copy of this chart */
-   function DeleteFromCache($ID,$Data)
-    {
-     $Hash     = $this->GetHash($ID,$Data);
-     $FileName = $this->CacheFolder.$Hash;
-
-     if ( file_exists($FileName ) )
-      unlink($FileName);
-    }
-
-   /* This function is retrieving the cached picture if applicable */
-   function GetFromCache($ID,$Data)
-    {
-     $Hash     = $this->GetHash($ID,$Data);
-     if ( $this->IsInCache("","",$Hash ) )
-      {
-       $FileName = $this->CacheFolder.$Hash;
-
-       header('Content-type: image/png');
-       @readfile($FileName);
-       exit();
-      }
-    }
-
-   /* This function is building the graph unique hash key */
-   function GetHash($ID,$Data)
-    {
-     $mKey = "$ID";
-     foreach($Data as $key => $Values)
-      {
-       $tKey = "";
-       foreach($Values as $Serie => $Value)
-        $tKey = $tKey.$Serie.$Value;
-       $mKey = $mKey.md5($tKey);
-      }
-     return(md5($mKey));
-    }
-  }
-?>

+ 0 - 3655
main/inc/lib/pchart/pChart.class.php

@@ -1,3655 +0,0 @@
-<?php
- /*
-     pChart - a PHP class to build charts!
-     Copyright (C) 2008 Jean-Damien POGOLOTTI
-     Version  1.27d last updated on 09/30/08
-
-     http://pchart.sourceforge.net
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation, either version 1,2,3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     Class initialisation :
-      pChart($XSize,$YSize)
-     Draw methods :
-      drawBackground($R,$G,$B)
-      drawRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B)
-      drawFilledRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B,$DrawBorder=TRUE,$Alpha=100)
-      drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B)
-      drawFilledRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B)
-      drawCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0)
-      drawFilledCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0)
-      drawEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B)
-      drawFilledEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B)
-      drawLine($X1,$Y1,$X2,$Y2,$R,$G,$B,$GraphFunction=FALSE)
-      drawDottedLine($X1,$Y1,$X2,$Y2,$DotSize,$R,$G,$B)
-      drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B)
-      drawFromPNG($FileName,$X,$Y,$Alpha=100)
-      drawFromGIF($FileName,$X,$Y,$Alpha=100)
-      drawFromJPG($FileName,$X,$Y,$Alpha=100)
-     Graph setup methods :
-      addBorder($Width=3,$R=0,$G=0,$B=0)
-      clearScale()
-      clearShadow()
-      createColorGradientPalette($R1,$G1,$B1,$R2,$G2,$B2,$Shades)
-      drawGraphArea($R,$G,$B,$Stripe=FALSE)
-      drawScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$RightScale=FALSE)
-      drawRightScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1)
-      drawXYScale($Data,$DataDescription,$YSerieName,$XSerieName,$R,$G,$B,$WithMargin=0,$Angle=0,$Decimals=1)
-      drawGrid($LineWidth,$Mosaic=TRUE,$R=220,$G=220,$B=220,$Alpha=100)
-      drawLegend($XPos,$YPos,$DataDescription,$R,$G,$B,$Rs=-1,$Gs=-1,$Bs=-1,$Rt=0,$Gt=0,$Bt=0,$Border=FALSE)
-      drawPieLegend($XPos,$YPos,$Data,$DataDescription,$R,$G,$B)
-      drawTitle($XPos,$YPos,$Value,$R,$G,$B,$XPos2=-1,$YPos2=-1,$Shadow=FALSE)
-      drawTreshold($Value,$R,$G,$B,$ShowLabel=FALSE,$ShowOnRight=FALSE,$TickWidth=4,$FreeText=NULL)
-      drawArea($Data,$Serie1,$Serie2,$R,$G,$B,$Alpha = 50)
-      drawRadarAxis($Data,$DataDescription,$Mosaic=TRUE,$BorderOffset=10,$A_R=60,$A_G=60,$A_B=60,$S_R=200,$S_G=200,$S_B=200,$MaxValue=-1)
-      drawGraphAreaGradient($R,$G,$B,$Decay,$Target=TARGET_GRAPHAREA)
-      drawTextBox($X1,$Y1,$X2,$Y2,$Text,$Angle=0,$R=255,$G=255,$B=255,$Align=ALIGN_LEFT,$Shadow=TRUE,$BgR=-1,$BgG=-1,$BgB=-1,$Alpha=100)
-      getLegendBoxSize($DataDescription)
-      loadColorPalette($FileName,$Delimiter=",")
-      reportWarnings($Interface="CLI")
-      setGraphArea($X1,$Y1,$X2,$Y2)
-      setLabel($Data,$DataDescription,$SerieName,$ValueName,$Caption,$R=210,$G=210,$B=210)
-      setColorPalette($ID,$R,$G,$B)
-      setCurrency($Currency)
-      setDateFormat($Format)
-      setFontProperties($FontName,$FontSize)
-      setLineStyle($Width=1,$DotSize=0)
-      setFixedScale($VMin,$VMax,$Divisions=5,$VXMin=0,$VXMin=0,$XDivisions=5)
-      setShadowProperties($XDistance=1,$YDistance=1,$R=60,$G=60,$B=60,$Alpha)
-      writeValues($Data,$DataDescription,$Series)
-    Graphs methods :
-      drawPlotGraph($Data,$DataDescription,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1,$Shadow=FALSE)
-      drawXYPlotGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1)
-      drawLineGraph($Data,$DataDescription,$SerieName="")
-      drawXYGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0)
-      drawFilledLineGraph($Data,$DataDescription,$Alpha=100,$AroundZero=FALSE)
-      drawCubicCurve($Data,$DataDescription,$Accuracy=.1,$SerieName="")
-      drawFilledCubicCurve($Data,$DataDescription,$Accuracy=.1,$Alpha=100,$AroundZero=FALSE)
-      drawOverlayBarGraph($Data,$DataDescription,$Alpha=50)
-      drawBarGraph($Data,$DataDescription,$Shadow=FALSE)
-      drawStackedBarGraph($Data,$DataDescription,$Alpha=50,$Contiguous=FALSE)
-      drawLimitsGraph($Data,$DataDescription,$R=0,$G=0,$B=0)
-      drawRadar($Data,$DataDescription,$BorderOffset=10,$MaxValue=-1)
-      drawFilledRadar($Data,$DataDescription,$Alpha=50,$BorderOffset=10,$MaxValue=-1)
-      drawBasicPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$R=255,$G=255,$B=255,$Decimals=0)
-      drawFlatPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals = 0)
-      drawFlatPieGraphWithShadow($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals = 0)
-      drawPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$EnhanceColors=TRUE,$Skew=60,$SpliceHeight=20,$SpliceDistance=0,$Decimals=0)
-     Other methods :
-      setImageMap($Mode=TRUE,$GraphID="MyGraph")
-      getImageMap($MapName,$Flush=TRUE)
-      Render($FileName)
-      Stroke()
- */
-
- /* Declare some script wide constants */
- define("SCALE_NORMAL",1);
- define("SCALE_ADDALL",2);
- define("SCALE_START0",3);
- define("SCALE_ADDALLSTART0",4);
- define("PIE_PERCENTAGE", 1);
- define("PIE_LABELS",2);
- define("PIE_NOLABEL",3);
- define("PIE_PERCENTAGE_LABEL", 4);
- define("TARGET_GRAPHAREA",1);
- define("TARGET_BACKGROUND",2);
- define("ALIGN_TOP_LEFT",1);
- define("ALIGN_TOP_CENTER",2);
- define("ALIGN_TOP_RIGHT",3);
- define("ALIGN_LEFT",4);
- define("ALIGN_CENTER",5);
- define("ALIGN_RIGHT",6);
- define("ALIGN_BOTTOM_LEFT",7);
- define("ALIGN_BOTTOM_CENTER",8);
- define("ALIGN_BOTTOM_RIGHT",9);
-
- /* pChart class definition */
- class pChart
-  {
-   /* Palettes definition */
-   var $Palette = array("0"=>array("R"=>188,"G"=>224,"B"=>46),
-                        "1"=>array("R"=>224,"G"=>100,"B"=>46),
-                        "2"=>array("R"=>224,"G"=>214,"B"=>46),
-                        "3"=>array("R"=>46,"G"=>151,"B"=>224),
-                        "4"=>array("R"=>176,"G"=>46,"B"=>224),
-                        "5"=>array("R"=>224,"G"=>46,"B"=>117),
-                        "6"=>array("R"=>92,"G"=>224,"B"=>46),
-                        "7"=>array("R"=>224,"G"=>176,"B"=>46));
-
-   /* Some static vars used in the class */
-   var $XSize          = NULL;
-   var $YSize          = NULL;
-   var $Picture        = NULL;
-   var $ImageMap       = NULL;
-
-   /* Error management */
-   var $ErrorReporting = FALSE;
-   var $ErrorInterface = "CLI";
-   var $Errors         = NULL;
-   var $ErrorFontName  = "Fonts/pf_arma_five.ttf";
-   var $ErrorFontSize  = 6;
-
-   /* vars related to the graphing area */
-   var $GArea_X1        = NULL;
-   var $GArea_Y1        = NULL;
-   var $GArea_X2        = NULL;
-   var $GArea_Y2        = NULL;
-   var $GAreaXOffset    = NULL;
-   var $VMax            = NULL;
-   var $VMin            = NULL;
-   var $VXMax           = NULL;
-   var $VXMin           = NULL;
-   var $Divisions       = NULL;
-   var $XDivisions      = NULL;
-   var $DivisionHeight  = NULL;
-   var $XDivisionHeight = NULL;
-   var $DivisionCount   = NULL;
-   var $XDivisionCount  = NULL;
-   var $DivisionRatio   = NULL;
-   var $XDivisionRatio  = NULL;
-   var $DivisionWidth   = NULL;
-   var $DataCount       = NULL;
-   var $Currency        = "\$";
-
-   /* Text format related vars */
-   var $FontName       = NULL;
-   var $FontSize       = NULL;
-   var $DateFormat     = "d/m/Y";
-
-   /* Lines format related vars */
-   var $LineWidth      = 1;
-   var $LineDotSize    = 0;
-
-   /* Layer related vars */
-   var $Layers         = NULL;
-
-   /* Set antialias quality : 0 is maximum, 100 minimum*/
-   var $AntialiasQuality = 0;
-
-   /* Shadow settings */
-   var $ShadowActive    = FALSE;
-   var $ShadowXDistance = 1;
-   var $ShadowYDistance = 1;
-   var $ShadowRColor    = 60;
-   var $ShadowGColor    = 60;
-   var $ShadowBColor    = 60;
-   var $ShadowAlpha     = 50;
-   var $ShadowBlur      = 0;
-
-   /* Image Map settings */
-   var $BuildMap         = FALSE;
-   var $MapFunction      = NULL;
-   var $tmpFolder        = "tmp/";
-   var $MapID            = NULL;
-
-   /* This function create the background picture */
-   function pChart($XSize,$YSize)
-    {
-    	    
-     $this->XSize   = $XSize;
-     $this->YSize   = $YSize;          
-     $this->Picture = imagecreatetruecolor($XSize,$YSize);
-     $C_White = $this->AllocateColor($this->Picture,255,255,255);          
-     imagefilledrectangle($this->Picture,0,0,$XSize,$YSize,$C_White);     
-     imagecolortransparent($this->Picture,$C_White);
-     $this->setFontProperties("tahoma.ttf",8);
-          
-    }
-
-  /* Set if warnings should be reported */
-  function reportWarnings($Interface="CLI")
-   {
-    $this->ErrorReporting = TRUE;
-    $this->ErrorInterface = $Interface;
-    }
-
-   /* Set the font properties */
-   function setFontProperties($FontName,$FontSize)
-    {
-     $this->FontName = $FontName;
-     $this->FontSize = $FontSize;
-    }
-
-   /* Set the shadow properties */
-   function setShadowProperties($XDistance=1,$YDistance=1,$R=60,$G=60,$B=60,$Alpha=50,$Blur=0)
-    {
-     $this->ShadowActive    = TRUE;
-     $this->ShadowXDistance = $XDistance;
-     $this->ShadowYDistance = $YDistance;
-     $this->ShadowRColor    = $R;
-     $this->ShadowGColor    = $G;
-     $this->ShadowBColor    = $B;
-     $this->ShadowAlpha     = $Alpha;
-     $this->ShadowBlur      = $Blur;
-    }
-
-   /* Remove shadow option */
-   function clearShadow()
-    {
-     $this->ShadowActive = FALSE;
-    }
-
-   /* Set Palette color */
-   function setColorPalette($ID,$R,$G,$B)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $this->Palette[$ID]["R"] = $R;
-     $this->Palette[$ID]["G"] = $G;
-     $this->Palette[$ID]["B"] = $B;
-    }
-
-   /* Create a color palette shading from one color to another */
-   function createColorGradientPalette($R1,$G1,$B1,$R2,$G2,$B2,$Shades)
-    {
-     $RFactor = ($R2-$R1)/$Shades;
-     $GFactor = ($G2-$G1)/$Shades;
-     $BFactor = ($B2-$B1)/$Shades;
-
-     for($i=0;$i<=$Shades-1;$i++)
-      {
-       $this->Palette[$i]["R"] = $R1+$RFactor*$i;
-       $this->Palette[$i]["G"] = $G1+$GFactor*$i;
-       $this->Palette[$i]["B"] = $B1+$BFactor*$i;
-      }
-    }
-
-   /* Load Color Palette from file */
-   function loadColorPalette($FileName,$Delimiter=",")
-    {
-     $handle  = @fopen($FileName,"r");
-     $ColorID = 0;
-     if ($handle)
-      {
-       while (!feof($handle))
-        {
-         $buffer = fgets($handle, 4096);
-         $buffer = str_replace(chr(10),"",$buffer);
-         $buffer = str_replace(chr(13),"",$buffer);
-         $Values = split($Delimiter,$buffer);
-         if ( count($Values) == 3 )
-          {
-           $this->Palette[$ColorID]["R"] = $Values[0];
-           $this->Palette[$ColorID]["G"] = $Values[1];
-           $this->Palette[$ColorID]["B"] = $Values[2];
-           $ColorID++;
-          }
-        }
-      }
-    }
-
-   /* Set line style */
-  function setLineStyle($Width=1,$DotSize=0)
-   {
-    $this->LineWidth   = $Width;
-    $this->LineDotSize = $DotSize;
-   }
-
-   /* Set currency symbol */
-   function setCurrency($Currency)
-    {
-     $this->Currency = $Currency;
-    }
-
-   /* Set the graph area location */
-   function setGraphArea($X1,$Y1,$X2,$Y2)
-    {
-     $this->GArea_X1 = $X1;
-     $this->GArea_Y1 = $Y1;
-     $this->GArea_X2 = $X2;
-     $this->GArea_Y2 = $Y2;
-    }
-
-   /* Prepare the graph area */
-   function drawGraphArea($R,$G,$B,$Stripe=FALSE)
-    {
-     $this->drawFilledRectangle($this->GArea_X1,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B,FALSE);
-     $this->drawRectangle($this->GArea_X1,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y2,$R-40,$G-40,$B-40);
-
-     if ( $Stripe )
-      {
-       $R2 = $R-15; if ( $R2 < 0 ) { $R2 = 0; }
-       $G2 = $R-15; if ( $G2 < 0 ) { $G2 = 0; }
-       $B2 = $R-15; if ( $B2 < 0 ) { $B2 = 0; }
-
-       $LineColor =$this->AllocateColor($this->Picture,$R2,$G2,$B2);
-       $SkewWidth = $this->GArea_Y2-$this->GArea_Y1-1;
-
-       for($i=$this->GArea_X1-$SkewWidth;$i<=$this->GArea_X2;$i=$i+4)
-        {
-         $X1 = $i;            $Y1 = $this->GArea_Y2;
-         $X2 = $i+$SkewWidth; $Y2 = $this->GArea_Y1;
-
-
-         if ( $X1 < $this->GArea_X1 )
-          { $X1 = $this->GArea_X1; $Y1 = $this->GArea_Y1 + $X2 - $this->GArea_X1 + 1; }
-
-         if ( $X2 >= $this->GArea_X2 )
-          { $Y2 = $this->GArea_Y1 + $X2 - $this->GArea_X2 +1; $X2 = $this->GArea_X2 - 1; }
-// * Fixed in 1.27 *         { $X2 = $this->GArea_X2 - 1; $Y2 = $this->GArea_Y2 - ($this->GArea_X2 - $X1); }
-
-         imageline($this->Picture,$X1,$Y1,$X2,$Y2+1,$LineColor);
-        }
-      }
-    }
-
-   /* Allow you to clear the scale : used if drawing multiple charts */
-   function clearScale()
-    {
-     $this->VMin       = NULL;
-     $this->VMax       = NULL;
-     $this->VXMin      = NULL;
-     $this->VXMax      = NULL;
-     $this->Divisions  = NULL;
-     $this->XDivisions = NULL;    }
-
-   /* Allow you to fix the scale, use this to bypass the automatic scaling */
-   function setFixedScale($VMin,$VMax,$Divisions=5,$VXMin=0,$VXMax=0,$XDivisions=5)
-    {
-     $this->VMin      = $VMin;
-     $this->VMax      = $VMax;
-     $this->Divisions = $Divisions;
-
-     if ( !$VXMin == 0 )
-      {
-       $this->VXMin      = $VXMin;
-       $this->VXMax      = $VXMax;
-       $this->XDivisions = $XDivisions;
-      }
-    }
-
-   /* Wrapper to the drawScale() function allowing a second scale to be drawn */
-   function drawRightScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1)
-    {
-     $this->drawScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks,$Angle,$Decimals,$WithMargin,$SkipLabels,TRUE);
-    }
-
-   /* Compute and draw the scale */
-   function drawScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$RightScale=FALSE)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateData("drawScale",$Data);
-
-     $C_TextColor         =$this->AllocateColor($this->Picture,$R,$G,$B);
-
-     $this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X1,$this->GArea_Y2,$R,$G,$B);
-     $this->drawLine($this->GArea_X1,$this->GArea_Y2,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B);
-
-     if ( $this->VMin == NULL && $this->VMax == NULL)
-      {
-       if (isset($DataDescription["Values"][0]))
-        {
-         $this->VMin = $Data[0][$DataDescription["Values"][0]];
-         $this->VMax = $Data[0][$DataDescription["Values"][0]];
-        }
-       else { $this->VMin = 2147483647; $this->VMax = -2147483647; }
-
-       /* Compute Min and Max values */
-       if ( $ScaleMode == SCALE_NORMAL || $ScaleMode == SCALE_START0 )
-        {
-         if ( $ScaleMode == SCALE_START0 ) { $this->VMin = 0; }
-
-         foreach ( $Data as $Key => $Values )
-          {
-           foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-            {
-             if (isset($Data[$Key][$ColName]))
-              {
-               $Value = $Data[$Key][$ColName];
-
-               if ( is_numeric($Value) )
-                {
-                 if ( $this->VMax < $Value) { $this->VMax = $Value; }
-                 if ( $this->VMin > $Value) { $this->VMin = $Value; }
-                }
-              }
-            }
-          }
-        }
-       elseif ( $ScaleMode == SCALE_ADDALL || $ScaleMode == SCALE_ADDALLSTART0 ) /* Experimental */
-        {
-         if ( $ScaleMode == SCALE_ADDALLSTART0 ) { $this->VMin = 0; }
-
-         foreach ( $Data as $Key => $Values )
-          {
-           $Sum = 0;
-           foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-            {
-             if (isset($Data[$Key][$ColName]))
-              {
-               $Value = $Data[$Key][$ColName];
-               if ( is_numeric($Value) )
-                $Sum  += $Value;
-              }
-            }
-           if ( $this->VMax < $Sum) { $this->VMax = $Sum; }
-           if ( $this->VMin > $Sum) { $this->VMin = $Sum; }
-          }
-        }
-
-       if ( $this->VMax > preg_replace('/\.[0-9]+/','',$this->VMax) )
-        $this->VMax = preg_replace('/\.[0-9]+/','',$this->VMax)+1;
-
-       /* If all values are the same */
-       if ( $this->VMax == $this->VMin )
-        {
-         if ( $this->VMax >= 0 ) { $this->VMax++; }
-         else { $this->VMin--; }
-        }
-
-       $DataRange = $this->VMax - $this->VMin;
-       if ( $DataRange == 0 ) { $DataRange = .1; }
-
-       /* Compute automatic scaling */
-       $ScaleOk = FALSE; $Factor = 1;
-       $MinDivHeight = 25; $MaxDivs = ($this->GArea_Y2 - $this->GArea_Y1) / $MinDivHeight;
-
-       if ( $this->VMin == 0 && $this->VMax == 0 )
-        { $this->VMin = 0; $this->VMax = 2; $Scale = 1; $Divisions = 2;}
-       elseif ($MaxDivs > 1)
-        {
-         while(!$ScaleOk)
-          {
-           $Scale1 = ( $this->VMax - $this->VMin ) / $Factor;
-           $Scale2 = ( $this->VMax - $this->VMin ) / $Factor / 2;
-           $Scale4 = ( $this->VMax - $this->VMin ) / $Factor / 4;
-
-           if ( $Scale1 > 1 && $Scale1 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale1); $Scale = 1;}
-           if ( $Scale2 > 1 && $Scale2 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale2); $Scale = 2;}
-           if (!$ScaleOk)
-            {
-             if ( $Scale2 > 1 ) { $Factor = $Factor * 10; }
-             if ( $Scale2 < 1 ) { $Factor = $Factor / 10; }
-            }
-          }
-
-         if ( floor($this->VMax / $Scale / $Factor) != $this->VMax / $Scale / $Factor)
-          {
-           $GridID     = floor ( $this->VMax / $Scale / $Factor) + 1;
-           $this->VMax = $GridID * $Scale * $Factor;
-           $Divisions++;
-          }
-
-         if ( floor($this->VMin / $Scale / $Factor) != $this->VMin / $Scale / $Factor)
-          {
-           $GridID     = floor( $this->VMin / $Scale / $Factor);
-           $this->VMin = $GridID * $Scale * $Factor;
-           $Divisions++;
-          }
-        }
-       else /* Can occurs for small graphs */
-        $Scale = 1;
-
-       if ( !isset($Divisions) )
-        $Divisions = 2;
-
-       if ($Scale == 1 && $Divisions%2 == 1)
-        $Divisions--;
-      }
-     else
-      $Divisions = $this->Divisions;
-
-     $this->DivisionCount = $Divisions;
-
-     $DataRange = $this->VMax - $this->VMin;
-     if ( $DataRange == 0 ) { $DataRange = .1; }
-
-     $this->DivisionHeight = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $Divisions;
-     $this->DivisionRatio  = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $DataRange;
-
-     $this->GAreaXOffset  = 0;
-     if ( count($Data) > 1 )
-      {
-       if ( $WithMargin == FALSE )
-        $this->DivisionWidth = ( $this->GArea_X2 - $this->GArea_X1 ) / (count($Data)-1);
-       else
-        {
-         $this->DivisionWidth = ( $this->GArea_X2 - $this->GArea_X1 ) / (count($Data));
-         $this->GAreaXOffset  = $this->DivisionWidth / 2;
-        }
-      }
-     else
-      {
-       $this->DivisionWidth = $this->GArea_X2 - $this->GArea_X1;
-       $this->GAreaXOffset  = $this->DivisionWidth / 2;
-      }
-
-     $this->DataCount = count($Data);
-
-     if ( $DrawTicks == FALSE )
-      return(0);
-
-     $YPos = $this->GArea_Y2; $XMin = NULL;
-     for($i=1;$i<=$Divisions+1;$i++)
-      {
-       if ( $RightScale )
-        $this->drawLine($this->GArea_X2,$YPos,$this->GArea_X2+5,$YPos,$R,$G,$B);
-       else
-        $this->drawLine($this->GArea_X1,$YPos,$this->GArea_X1-5,$YPos,$R,$G,$B);
-
-       $Value     = $this->VMin + ($i-1) * (( $this->VMax - $this->VMin ) / $Divisions);
-       $Value     = round($Value * pow(10,$Decimals)) / pow(10,$Decimals);
-       if ( $DataDescription["Format"]["Y"] == "number" )
-        $Value = $Value.$DataDescription["Unit"]["Y"];
-       if ( $DataDescription["Format"]["Y"] == "time" )
-        $Value = $this->ToTime($Value);
-       if ( $DataDescription["Format"]["Y"] == "date" )
-        $Value = $this->ToDate($Value);
-       if ( $DataDescription["Format"]["Y"] == "metric" )
-        $Value = $this->ToMetric($Value);
-       if ( $DataDescription["Format"]["Y"] == "currency" )
-        $Value = $this->ToCurrency($Value);
-
-       $Position  = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextWidth = $Position[2]-$Position[0];
-
-       if ( $RightScale )
-        {
-         imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X2+10,$YPos+($this->FontSize/2),$C_TextColor,$this->FontName,$Value);
-         if ( $XMin < $this->GArea_X2+15+$TextWidth || $XMin == NULL ) { $XMin = $this->GArea_X2+15+$TextWidth; }
-        }
-       else
-        {
-         imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X1-10-$TextWidth,$YPos+($this->FontSize/2),$C_TextColor,$this->FontName,$Value);
-         if ( $XMin > $this->GArea_X1-10-$TextWidth || $XMin == NULL ) { $XMin = $this->GArea_X1-10-$TextWidth; }
-        }
-
-       $YPos = $YPos - $this->DivisionHeight;
-      }
-
-     /* Write the Y Axis caption if set */
-     if ( isset($DataDescription["Axis"]["Y"]) )
-      {
-       $Position   = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["Y"]);
-       $TextHeight = abs($Position[1])+abs($Position[3]);
-       $TextTop    = (($this->GArea_Y2 - $this->GArea_Y1) / 2) + $this->GArea_Y1 + ($TextHeight/2);
-
-       if ( $RightScale )
-        imagettftext($this->Picture,$this->FontSize,90,$XMin+$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]);
-       else
-        imagettftext($this->Picture,$this->FontSize,90,$XMin-$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]);
-      }
-
-     /* Horizontal Axis */
-     $XPos = $this->GArea_X1 + $this->GAreaXOffset;
-     $ID = 1; $YMax = NULL;
-     foreach ( $Data as $Key => $Values )
-      {
-       if ( $ID % $SkipLabels == 0 )
-        {
-         $this->drawLine(floor($XPos),$this->GArea_Y2,floor($XPos),$this->GArea_Y2+5,$R,$G,$B);
-         $Value      = $Data[$Key][$DataDescription["Position"]];
-         if ( $DataDescription["Format"]["X"] == "number" )
-          $Value = $Value.$DataDescription["Unit"]["X"];
-         if ( $DataDescription["Format"]["X"] == "time" )
-          $Value = $this->ToTime($Value);
-         if ( $DataDescription["Format"]["X"] == "date" )
-          $Value = $this->ToDate($Value);
-         if ( $DataDescription["Format"]["X"] == "metric" )
-          $Value = $this->ToMetric($Value);
-         if ( $DataDescription["Format"]["X"] == "currency" )
-          $Value = $this->ToCurrency($Value);
-
-         $Position   = imageftbbox($this->FontSize,$Angle,$this->FontName,$Value);
-         $TextWidth  = abs($Position[2])+abs($Position[0]);
-         $TextHeight = abs($Position[1])+abs($Position[3]);
-
-         if ( $Angle == 0 )
-          {
-           $YPos = $this->GArea_Y2+18;
-           imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-floor($TextWidth/2),$YPos,$C_TextColor,$this->FontName,$Value);
-          }
-         else
-          {
-              // Will change XY positions to show the right label position
-              // To detect side of cartesian plane XY where angles ends
-              // e.g 60 degree is in Quadrant I, 120 degree is Quadrant II
-              $isYpositive = sin(deg2rad($Angle)) >= 0;
-              $isXpositive = cos(deg2rad($Angle)) >= 0;
-              $YPos = $this->GArea_Y2 + 10;
-              if ($isYpositive && $isXpositive) {
-                  // For Quadrant I
-                  $YPos += $TextHeight;
-                  $XPos -= $TextWidth;
-              } elseif ($isYpositive && !$isXpositive) {
-                  // For Quadrant II
-                  $YPos += $TextHeight;
-                  $XPos += $TextWidth;
-              } elseif (!$isYpositive && !$isXpositive) {
-                  // For Quadrant III
-                  // Nothing to do
-              } else {
-                  // For Quadrant IV
-                  // Nothing to do
-              }
-              imagettftext(
-                  $this->Picture,
-                  $this->FontSize,
-                  $Angle,
-                  $XPos,
-                  $YPos,
-                  $C_TextColor,
-                  $this->FontName,
-                  $Value
-              );
-              // post update XY position
-              if ($isYpositive && $isXpositive) {
-                  // For Quadrant I
-                  $XPos += $TextWidth;
-              } elseif ($isYpositive && !$isXpositive) {
-                  // For Quadrant II
-                  $XPos -= $TextWidth;
-              } elseif (!$isYpositive && !$isXpositive) {
-                  // For Quadrant III
-                  $YPos += $TextHeight;
-              } else {
-                  // For Quadrant IV
-                  $YPos += $TextHeight;
-              }
-          }
-         if ( $YMax < $YPos || $YMax == NULL ) { $YMax = $YPos; }
-        }
-
-       $XPos = $XPos + $this->DivisionWidth;
-       $ID++;
-      }
-
-    /* Write the X Axis caption if set */
-    if (isset($DataDescription["Axis"]["X"]))
-      {
-       $Position   = imageftbbox($this->FontSize, 0, $this->FontName, $DataDescription["Axis"]["X"]);
-       $TextWidth  = abs($Position[2]) + abs($Position[0]);
-       $TextLeft   = (($this->GArea_X2 + $this->GArea_X1) / 2) - ($TextWidth/2);
-       imagettftext(
-           $this->Picture,
-           $this->FontSize,
-           0,
-           $TextLeft,
-           $YMax+$this->FontSize+5,
-           $C_TextColor,
-           $this->FontName,
-           $DataDescription["Axis"]["X"]
-       );
-      }
-    }
-
-   /* Compute and draw the scale for X/Y charts */
-   function drawXYScale($Data,$DataDescription,$YSerieName,$XSerieName,$R,$G,$B,$WithMargin=0,$Angle=0,$Decimals=1)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateData("drawScale",$Data);
-
-     $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B);
-
-     $this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X1,$this->GArea_Y2,$R,$G,$B);
-     $this->drawLine($this->GArea_X1,$this->GArea_Y2,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B);
-
-     /* Process Y scale */
-     if ( $this->VMin == NULL && $this->VMax == NULL)
-      {
-       $this->VMin = $Data[0][$YSerieName];
-       $this->VMax = $Data[0][$YSerieName];
-
-       foreach ( $Data as $Key => $Values )
-        {
-         if (isset($Data[$Key][$YSerieName]))
-          {
-           $Value = $Data[$Key][$YSerieName];
-           if ( $this->VMax < $Value) { $this->VMax = $Value; }
-           if ( $this->VMin > $Value) { $this->VMin = $Value; }
-          }
-        }
-
-       if ( $this->VMax > preg_replace('/\.[0-9]+/','',$this->VMax) )
-        $this->VMax = preg_replace('/\.[0-9]+/','',$this->VMax)+1;
-
-       $DataRange = $this->VMax - $this->VMin;
-       if ( $DataRange == 0 ) { $DataRange = .1; }
-
-       /* Compute automatic scaling */
-       $ScaleOk = FALSE; $Factor = 1;
-       $MinDivHeight = 25; $MaxDivs = ($this->GArea_Y2 - $this->GArea_Y1) / $MinDivHeight;
-
-       if ( $this->VMin == 0 && $this->VMax == 0 )
-        { $this->VMin = 0; $this->VMax = 2; $Scale = 1; $Divisions = 2;}
-       elseif ($MaxDivs > 1)
-        {
-         while(!$ScaleOk)
-          {
-           $Scale1 = ( $this->VMax - $this->VMin ) / $Factor;
-           $Scale2 = ( $this->VMax - $this->VMin ) / $Factor / 2;
-           $Scale4 = ( $this->VMax - $this->VMin ) / $Factor / 4;
-
-           if ( $Scale1 > 1 && $Scale1 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale1); $Scale = 1;}
-           if ( $Scale2 > 1 && $Scale2 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale2); $Scale = 2;}
-           if (!$ScaleOk)
-            {
-             if ( $Scale2 > 1 ) { $Factor = $Factor * 10; }
-             if ( $Scale2 < 1 ) { $Factor = $Factor / 10; }
-            }
-          }
-
-         if ( floor($this->VMax / $Scale / $Factor) != $this->VMax / $Scale / $Factor)
-          {
-           $GridID     = floor ( $this->VMax / $Scale / $Factor) + 1;
-           $this->VMax = $GridID * $Scale * $Factor;
-           $Divisions++;
-          }
-
-         if ( floor($this->VMin / $Scale / $Factor) != $this->VMin / $Scale / $Factor)
-          {
-           $GridID     = floor( $this->VMin / $Scale / $Factor);
-           $this->VMin = $GridID * $Scale * $Factor;
-           $Divisions++;
-          }
-        }
-       else /* Can occurs for small graphs */
-        $Scale = 1;
-
-       if ( !isset($Divisions) )
-        $Divisions = 2;
-
-       if ( $this->isRealInt(($this->VMax-$this->VMin)/($Divisions-1)))
-        $Divisions--;
-       elseif ( $this->isRealInt(($this->VMax-$this->VMin)/($Divisions+1)))
-        $Divisions++;
-      }
-     else
-      $Divisions = $this->Divisions;
-
-     $this->DivisionCount = $Divisions;
-
-     $DataRange = $this->VMax - $this->VMin;
-     if ( $DataRange == 0 ) { $DataRange = .1; }
-
-     $this->DivisionHeight = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $Divisions;
-     $this->DivisionRatio  = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $DataRange;
-
-     $YPos = $this->GArea_Y2; $XMin = NULL;
-     for($i=1;$i<=$Divisions+1;$i++)
-      {
-       $this->drawLine($this->GArea_X1,$YPos,$this->GArea_X1-5,$YPos,$R,$G,$B);
-       $Value     = $this->VMin + ($i-1) * (( $this->VMax - $this->VMin ) / $Divisions);
-       $Value     = round($Value * pow(10,$Decimals)) / pow(10,$Decimals);
-       if ( $DataDescription["Format"]["Y"] == "number" )
-        $Value = $Value.$DataDescription["Unit"]["Y"];
-       if ( $DataDescription["Format"]["Y"] == "time" )
-        $Value = $this->ToTime($Value);
-       if ( $DataDescription["Format"]["Y"] == "date" )
-        $Value = $this->ToDate($Value);
-       if ( $DataDescription["Format"]["Y"] == "metric" )
-        $Value = $this->ToMetric($Value);
-       if ( $DataDescription["Format"]["Y"] == "currency" )
-        $Value = $this->ToCurrency($Value);
-
-       $Position  = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextWidth = $Position[2]-$Position[0];
-       imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X1-10-$TextWidth,$YPos+($this->FontSize/2),$C_TextColor,$this->FontName,$Value);
-
-       if ( $XMin > $this->GArea_X1-10-$TextWidth || $XMin == NULL ) { $XMin = $this->GArea_X1-10-$TextWidth; }
-
-       $YPos = $YPos - $this->DivisionHeight;
-      }
-
-     /* Process X scale */
-     if ( $this->VXMin == NULL && $this->VXMax == NULL)
-      {
-       $this->VXMin = $Data[0][$XSerieName];
-       $this->VXMax = $Data[0][$XSerieName];
-
-       foreach ( $Data as $Key => $Values )
-        {
-         if (isset($Data[$Key][$XSerieName]))
-          {
-           $Value = $Data[$Key][$XSerieName];
-           if ( $this->VXMax < $Value) { $this->VXMax = $Value; }
-           if ( $this->VXMin > $Value) { $this->VXMin = $Value; }
-          }
-        }
-
-       if ( $this->VXMax > preg_replace('/\.[0-9]+/','',$this->VXMax) )
-        $this->VXMax = preg_replace('/\.[0-9]+/','',$this->VXMax)+1;
-
-       $DataRange = $this->VMax - $this->VMin;
-       if ( $DataRange == 0 ) { $DataRange = .1; }
-
-       /* Compute automatic scaling */
-       $ScaleOk = FALSE; $Factor = 1;
-       $MinDivWidth = 25; $MaxDivs = ($this->GArea_X2 - $this->GArea_X1) / $MinDivWidth;
-
-       if ( $this->VXMin == 0 && $this->VXMax == 0 )
-        { $this->VXMin = 0; $this->VXMax = 2; $Scale = 1; $XDivisions = 2;}
-       elseif ($MaxDivs > 1)
-        {
-         while(!$ScaleOk)
-          {
-           $Scale1 = ( $this->VXMax - $this->VXMin ) / $Factor;
-           $Scale2 = ( $this->VXMax - $this->VXMin ) / $Factor / 2;
-           $Scale4 = ( $this->VXMax - $this->VXMin ) / $Factor / 4;
-
-           if ( $Scale1 > 1 && $Scale1 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $XDivisions = floor($Scale1); $Scale = 1;}
-           if ( $Scale2 > 1 && $Scale2 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $XDivisions = floor($Scale2); $Scale = 2;}
-           if (!$ScaleOk)
-            {
-             if ( $Scale2 > 1 ) { $Factor = $Factor * 10; }
-             if ( $Scale2 < 1 ) { $Factor = $Factor / 10; }
-            }
-          }
-
-         if ( floor($this->VXMax / $Scale / $Factor) != $this->VXMax / $Scale / $Factor)
-          {
-           $GridID     = floor ( $this->VXMax / $Scale / $Factor) + 1;
-           $this->VXMax = $GridID * $Scale * $Factor;
-           $XDivisions++;
-          }
-
-         if ( floor($this->VXMin / $Scale / $Factor) != $this->VXMin / $Scale / $Factor)
-          {
-           $GridID     = floor( $this->VXMin / $Scale / $Factor);
-           $this->VXMin = $GridID * $Scale * $Factor;
-           $XDivisions++;
-          }
-        }
-       else /* Can occurs for small graphs */
-        $Scale = 1;
-
-       if ( !isset($XDivisions) )
-        $XDivisions = 2;
-
-       if ( $this->isRealInt(($this->VXMax-$this->VXMin)/($XDivisions-1)))
-        $XDivisions--;
-       elseif ( $this->isRealInt(($this->VXMax-$this->VXMin)/($XDivisions+1)))
-        $XDivisions++;
-      }
-     else
-      $XDivisions = $this->XDivisions;
-
-     $this->XDivisionCount = $Divisions;
-     $this->DataCount      = $Divisions + 2;
-
-     $XDataRange = $this->VXMax - $this->VXMin;
-     if ( $XDataRange == 0 ) { $XDataRange = .1; }
-
-     $this->DivisionWidth   = ( $this->GArea_X2 - $this->GArea_X1 ) / $XDivisions;
-     $this->XDivisionRatio  = ( $this->GArea_X2 - $this->GArea_X1 ) / $XDataRange;
-
-     $XPos = $this->GArea_X1; $YMax = NULL;
-     for($i=1;$i<=$XDivisions+1;$i++)
-      {
-       $this->drawLine($XPos,$this->GArea_Y2,$XPos,$this->GArea_Y2+5,$R,$G,$B);
-
-       $Value     = $this->VXMin + ($i-1) * (( $this->VXMax - $this->VXMin ) / $XDivisions);
-       $Value     = round($Value * pow(10,$Decimals)) / pow(10,$Decimals);
-       if ( $DataDescription["Format"]["Y"] == "number" )
-        $Value = $Value.$DataDescription["Unit"]["Y"];
-       if ( $DataDescription["Format"]["Y"] == "time" )
-        $Value = $this->ToTime($Value);
-       if ( $DataDescription["Format"]["Y"] == "date" )
-        $Value = $this->ToDate($Value);
-       if ( $DataDescription["Format"]["Y"] == "metric" )
-        $Value = $this->ToMetric($Value);
-       if ( $DataDescription["Format"]["Y"] == "currency" )
-        $Value = $this->ToCurrency($Value);
-
-       $Position   = imageftbbox($this->FontSize,$Angle,$this->FontName,$Value);
-       $TextWidth  = abs($Position[2])+abs($Position[0]);
-       $TextHeight = abs($Position[1])+abs($Position[3]);
-
-       if ( $Angle == 0 )
-        {
-         $YPos = $this->GArea_Y2+18;
-         imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-floor($TextWidth/2),$YPos,$C_TextColor,$this->FontName,$Value);
-        }
-       else
-        {
-         $YPos = $this->GArea_Y2+10+$TextHeight;
-         if ( $Angle <= 90 )
-          imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value);
-         else
-          imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)+$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value);
-         }
-
-       if ( $YMax < $YPos || $YMax == NULL ) { $YMax = $YPos; }
-
-       $XPos = $XPos + $this->DivisionWidth;
-      }
-
-     /* Write the Y Axis caption if set */
-     if ( isset($DataDescription["Axis"]["Y"]) )
-      {
-       $Position   = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["Y"]);
-       $TextHeight = abs($Position[1])+abs($Position[3]);
-       $TextTop    = (($this->GArea_Y2 - $this->GArea_Y1) / 2) + $this->GArea_Y1 + ($TextHeight/2);
-       imagettftext($this->Picture,$this->FontSize,90,$XMin-$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]);
-      }
-
-     /* Write the X Axis caption if set */
-     if ( isset($DataDescription["Axis"]["X"]) )
-      {
-       $Position   = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["X"]);
-       $TextWidth  = abs($Position[2])+abs($Position[0]);
-       $TextLeft   = (($this->GArea_X2 - $this->GArea_X1) / 2) + $this->GArea_X1 + ($TextWidth/2);
-       imagettftext($this->Picture,$this->FontSize,0,$TextLeft,$YMax+$this->FontSize+5,$C_TextColor,$this->FontName,$DataDescription["Axis"]["X"]);
-      }
-    }
-
-   /* Compute and draw the scale */
-   function drawGrid($LineWidth,$Mosaic=TRUE,$R=220,$G=220,$B=220,$Alpha=100)
-    {
-     /* Draw mosaic */
-     if ( $Mosaic )
-      {
-       $LayerWidth  = $this->GArea_X2-$this->GArea_X1;
-       $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
-
-       $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-       $C_White         =$this->AllocateColor($this->Layers[0],255,255,255);
-       imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-       imagecolortransparent($this->Layers[0],$C_White);
-
-       $C_Rectangle =$this->AllocateColor($this->Layers[0],250,250,250);
-
-       $YPos  = $LayerHeight; //$this->GArea_Y2-1;
-       $LastY = $YPos;
-       for($i=0;$i<=$this->DivisionCount;$i++)
-        {
-         $LastY = $YPos;
-         $YPos  = $YPos - $this->DivisionHeight;
-
-         if ( $YPos <= 0 ) { $YPos = 1; }
-
-         if ( $i % 2 == 0 )
-          {
-           imagefilledrectangle($this->Layers[0],1,$YPos,$LayerWidth-1,$LastY,$C_Rectangle);
-          }
-        }
-       imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
-       imagedestroy($this->Layers[0]);
-      }
-
-     /* Horizontal lines */
-     $YPos = $this->GArea_Y2 - $this->DivisionHeight;
-     for($i=1;$i<=$this->DivisionCount;$i++)
-      {
-       if ( $YPos > $this->GArea_Y1 && $YPos < $this->GArea_Y2 )
-        $this->drawDottedLine($this->GArea_X1,$YPos,$this->GArea_X2,$YPos,$LineWidth,$R,$G,$B);
-
-       $YPos = $YPos - $this->DivisionHeight;
-      }
-
-     /* Vertical lines */
-     if ( $this->GAreaXOffset == 0 )
-      { $XPos = $this->GArea_X1 + $this->DivisionWidth + $this->GAreaXOffset; $ColCount = $this->DataCount-2; }
-     else
-      { $XPos = $this->GArea_X1 + $this->GAreaXOffset; $ColCount = floor( ($this->GArea_X2 - $this->GArea_X1) / $this->DivisionWidth ); }
-
-     for($i=1;$i<=$ColCount;$i++)
-      {
-       if ( $XPos > $this->GArea_X1 && $XPos < $this->GArea_X2 )
-        $this->drawDottedLine(floor($XPos),$this->GArea_Y1,floor($XPos),$this->GArea_Y2,$LineWidth,$R,$G,$B);
-       $XPos = $XPos + $this->DivisionWidth;
-      }
-    }
-
-   /* retrieve the legends size */
-   function getLegendBoxSize($DataDescription)
-    {
-     if ( !isset($DataDescription["Description"]) )
-      return(-1);
-
-     /* <-10->[8]<-4->Text<-10-> */
-     $MaxWidth = 0; $MaxHeight = 8;
-     foreach($DataDescription["Description"] as $Key => $Value)
-      {
-       $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextWidth  = $Position[2]-$Position[0];
-       $TextHeight = $Position[1]-$Position[7];
-       if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; }
-       $MaxHeight = $MaxHeight + $TextHeight + 4;
-      }
-     $MaxHeight = $MaxHeight - 3;
-     $MaxWidth  = $MaxWidth + 32;
-
-     return(array($MaxWidth,$MaxHeight));
-    }
-
-   /* Draw the data legends */
-   function drawLegend($XPos,$YPos,$DataDescription,$R,$G,$B,$Rs=-1,$Gs=-1,$Bs=-1,$Rt=0,$Gt=0,$Bt=0,$Border=TRUE)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawLegend",$DataDescription);
-
-     if ( !isset($DataDescription["Description"]) )
-      return(-1);
-
-     $C_TextColor =$this->AllocateColor($this->Picture,$Rt,$Gt,$Bt);
-
-     /* <-10->[8]<-4->Text<-10-> */
-     $MaxWidth = 0; $MaxHeight = 8;
-     foreach($DataDescription["Description"] as $Key => $Value)
-      {
-       $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextWidth  = $Position[2]-$Position[0];
-       $TextHeight = $Position[1]-$Position[7];
-       if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; }
-       $MaxHeight = $MaxHeight + $TextHeight + 4;
-      }
-     $MaxHeight = $MaxHeight - 5;
-     $MaxWidth  = $MaxWidth + 32;
-
-     if ( $Rs == -1 || $Gs == -1 || $Bs == -1 )
-      { $Rs = $R-30; $Gs = $G-30; $Bs = $B-30; }
-
-     if ( $Border )
-      {
-       $this->drawFilledRoundedRectangle($XPos+1,$YPos+1,$XPos+$MaxWidth+1,$YPos+$MaxHeight+1,5,$Rs,$Gs,$Bs);
-       $this->drawFilledRoundedRectangle($XPos,$YPos,$XPos+$MaxWidth,$YPos+$MaxHeight,5,$R,$G,$B);
-      }
-
-     $YOffset = 4 + $this->FontSize; $ID = 0;
-     foreach($DataDescription["Description"] as $Key => $Value)
-      {
-       $this->drawFilledRoundedRectangle($XPos+10,$YPos+$YOffset-4,$XPos+14,$YPos+$YOffset-4,2,$this->Palette[$ID]["R"],$this->Palette[$ID]["G"],$this->Palette[$ID]["B"]);
-       imagettftext($this->Picture,$this->FontSize,0,$XPos+22,$YPos+$YOffset,$C_TextColor,$this->FontName,$Value);
-
-       $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextHeight = $Position[1]-$Position[7];
-
-       $YOffset = $YOffset + $TextHeight + 4;
-       $ID++;
-      }
-    }
-
-   /* Draw the data legends */
-   function drawPieLegend($XPos,$YPos,$Data,$DataDescription,$R,$G,$B)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawPieLegend",$DataDescription,FALSE);
-     $this->validateData("drawPieLegend",$Data);
-
-     if ( !isset($DataDescription["Position"]) )
-      return(-1);
-
-     $C_TextColor =$this->AllocateColor($this->Picture,0,0,0);
-
-     /* <-10->[8]<-4->Text<-10-> */
-     $MaxWidth = 0; $MaxHeight = 8;
-     foreach($Data as $Key => $Value)
-      {
-       $Value2 = $Value[$DataDescription["Position"]];
-       $Position  = imageftbbox($this->FontSize,0,$this->FontName,$Value2);
-       $TextWidth = $Position[2]-$Position[0];
-       $TextHeight = $Position[1]-$Position[7];
-       if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; }
-
-       $MaxHeight = $MaxHeight + $TextHeight + 4;
-      }
-     $MaxHeight = $MaxHeight - 3;
-     $MaxWidth  = $MaxWidth + 32;
-
-     $this->drawFilledRoundedRectangle($XPos+1,$YPos+1,$XPos+$MaxWidth+1,$YPos+$MaxHeight+1,5,$R-30,$G-30,$B-30);
-     $this->drawFilledRoundedRectangle($XPos,$YPos,$XPos+$MaxWidth,$YPos+$MaxHeight,5,$R,$G,$B);
-
-     $YOffset = 4 + $this->FontSize; $ID = 0;
-     foreach($Data as $Key => $Value)
-      {
-       $Value2     = $Value[$DataDescription["Position"]];
-       $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Value2);
-       $TextHeight = $Position[1]-$Position[7];
-       $this->drawFilledRectangle($XPos+10,$YPos+$YOffset-6,$XPos+14,$YPos+$YOffset-2,$this->Palette[$ID]["R"],$this->Palette[$ID]["G"],$this->Palette[$ID]["B"]);
-
-       imagettftext($this->Picture,$this->FontSize,0,$XPos+22,$YPos+$YOffset,$C_TextColor,$this->FontName,$Value2);
-       $YOffset = $YOffset + $TextHeight + 4;
-       $ID++;
-      }
-    }
-
-   /* Draw the graph title */
-   function drawTitle($XPos,$YPos,$Value,$R,$G,$B,$XPos2=-1,$YPos2=-1,$Shadow=FALSE)
-    {
-     $C_TextColor = $this->AllocateColor($this->Picture,$R,$G,$B);
-
-     if ( $XPos2 != -1 )
-      {
-       $Position  = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextWidth = $Position[2]-$Position[0];
-       $XPos      = floor(( $XPos2 - $XPos - $TextWidth ) / 2 ) + $XPos;
-      }
-
-     if ( $YPos2 != -1 )
-      {
-       $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextHeight = $Position[5]-$Position[3];
-       $YPos       = floor(( $YPos2 - $YPos - $TextHeight ) / 2 ) + $YPos;
-      }
-
-     if ( $Shadow )
-      {
-       $C_ShadowColor = $this->AllocateColor($this->Picture,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor);
-       imagettftext($this->Picture,$this->FontSize,0,$XPos+$this->ShadowXDistance,$YPos+$this->ShadowYDistance,$C_ShadowColor,$this->FontName,$Value);
-      }
-
-     imagettftext($this->Picture,$this->FontSize,0,$XPos,$YPos,$C_TextColor,$this->FontName,$Value);
-    }
-
-   /* Draw a text box with text align & alpha properties */
-   function drawTextBox($X1,$Y1,$X2,$Y2,$Text,$Angle=0,$R=255,$G=255,$B=255,$Align=ALIGN_LEFT,$Shadow=TRUE,$BgR=-1,$BgG=-1,$BgB=-1,$Alpha=100)
-    {
-     $Position   = imageftbbox($this->FontSize,$Angle,$this->FontName,$Text);
-     $TextWidth  = $Position[2]-$Position[0];
-     $TextHeight = $Position[5]-$Position[3];
-     $AreaWidth  = $X2 - $X1;
-     $AreaHeight = $Y2 - $Y1;
-
-     if ( $BgR != -1 && $BgG != -1 && $BgB != -1 )
-      $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$BgR,$BgG,$BgB,FALSE,$Alpha);
-
-     if ( $Align == ALIGN_TOP_LEFT )      { $X = $X1+1; $Y = $Y1+$this->FontSize+1; }
-     if ( $Align == ALIGN_TOP_CENTER )    { $X = $X1+($AreaWidth/2)-($TextWidth/2); $Y = $Y1+$this->FontSize+1; }
-     if ( $Align == ALIGN_TOP_RIGHT )     { $X = $X2-$TextWidth-1; $Y = $Y1+$this->FontSize+1; }
-     if ( $Align == ALIGN_LEFT )          { $X = $X1+1; $Y = $Y1+($AreaHeight/2)-($TextHeight/2); }
-     if ( $Align == ALIGN_CENTER )        { $X = $X1+($AreaWidth/2)-($TextWidth/2); $Y = $Y1+($AreaHeight/2)-($TextHeight/2); }
-     if ( $Align == ALIGN_RIGHT )         { $X = $X2-$TextWidth-1; $Y = $Y1+($AreaHeight/2)-($TextHeight/2); }
-     if ( $Align == ALIGN_BOTTOM_LEFT )   { $X = $X1+1; $Y = $Y2-1; }
-     if ( $Align == ALIGN_BOTTOM_CENTER ) { $X = $X1+($AreaWidth/2)-($TextWidth/2); $Y = $Y2-1; }
-     if ( $Align == ALIGN_BOTTOM_RIGHT )  { $X = $X2-$TextWidth-1; $Y = $Y2-1; }
-
-     $C_TextColor   =$this->AllocateColor($this->Picture,$R,$G,$B);
-     $C_ShadowColor =$this->AllocateColor($this->Picture,0,0,0);
-     if ( $Shadow )
-      imagettftext($this->Picture,$this->FontSize,$Angle,$X+1,$Y+1,$C_ShadowColor,$this->FontName,$Text);
-
-     imagettftext($this->Picture,$this->FontSize,$Angle,$X,$Y,$C_TextColor,$this->FontName,$Text);
-    }
-
-   /* Compute and draw the scale */
-   function drawTreshold($Value,$R,$G,$B,$ShowLabel=FALSE,$ShowOnRight=FALSE,$TickWidth=4,$FreeText=NULL)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B);
-     $Y = $this->GArea_Y2 - ($Value - $this->VMin) * $this->DivisionRatio;
-
-     if ( $Y <= $this->GArea_Y1 || $Y >= $this->GArea_Y2 )
-      return(-1);
-
-     if ( $TickWidth == 0 )
-      $this->drawLine($this->GArea_X1,$Y,$this->GArea_X2,$Y,$R,$G,$B);
-     else
-      $this->drawDottedLine($this->GArea_X1,$Y,$this->GArea_X2,$Y,$TickWidth,$R,$G,$B);
-
-     if ( $ShowLabel )
-      {
-       if ( $FreeText == NULL )
-        { $Label = $Value; } else { $Label = $FreeText; }
-
-       if ( $ShowOnRight )
-        imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X2+2,$Y+($this->FontSize/2),$C_TextColor,$this->FontName,$Label);
-       else
-        imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X1+2,$Y-($this->FontSize/2),$C_TextColor,$this->FontName,$Label);
-      }
-    }
-
-   /* This function put a label on a specific point */
-   function setLabel($Data,$DataDescription,$SerieName,$ValueName,$Caption,$R=210,$G=210,$B=210)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("setLabel",$DataDescription);
-     $this->validateData("setLabel",$Data);
-     $ShadowFactor = 100;
-     $C_Label      =$this->AllocateColor($this->Picture,$R,$G,$B);
-     $C_Shadow     =$this->AllocateColor($this->Picture,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor);
-     $C_TextColor  =$this->AllocateColor($this->Picture,0,0,0);
-
-     $Cp = 0; $Found = FALSE;
-     foreach ( $Data as $Key => $Value )
-      {
-       if ( $Data[$Key][$DataDescription["Position"]] == $ValueName )
-        { $NumericalValue = $Data[$Key][$SerieName]; $Found = TRUE; }
-       if ( !$Found )
-        $Cp++;
-      }
-
-     $XPos = $this->GArea_X1 + $this->GAreaXOffset + ( $this->DivisionWidth * $Cp ) + 2;
-     $YPos = $this->GArea_Y2 - ($NumericalValue - $this->VMin) * $this->DivisionRatio;
-
-     $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Caption);
-     $TextHeight = $Position[3] - $Position[5];
-     $TextWidth  = $Position[2]-$Position[0] + 2;
-     $TextOffset = floor($TextHeight/2);
-
-     // Shadow
-     $Poly = array($XPos+1,$YPos+1,$XPos + 9,$YPos - $TextOffset,$XPos + 8,$YPos + $TextOffset + 2);
-     imagefilledpolygon($this->Picture,$Poly,3,$C_Shadow);
-     $this->drawLine($XPos,$YPos+1,$XPos + 9,$YPos - $TextOffset - .2,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor);
-     $this->drawLine($XPos,$YPos+1,$XPos + 9,$YPos + $TextOffset + 2.2,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor);
-     $this->drawFilledRectangle($XPos + 9,$YPos - $TextOffset-.2,$XPos + 13 + $TextWidth,$YPos + $TextOffset + 2.2,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor);
-
-     // Label background
-     $Poly = array($XPos,$YPos,$XPos + 8,$YPos - $TextOffset - 1,$XPos + 8,$YPos + $TextOffset + 1);
-     imagefilledpolygon($this->Picture,$Poly,3,$C_Label);
-     $this->drawLine($XPos-1,$YPos,$XPos + 8,$YPos - $TextOffset - 1.2,$R,$G,$B);
-     $this->drawLine($XPos-1,$YPos,$XPos + 8,$YPos + $TextOffset + 1.2,$R,$G,$B);
-     $this->drawFilledRectangle($XPos + 8,$YPos - $TextOffset - 1.2,$XPos + 12 + $TextWidth,$YPos + $TextOffset + 1.2,$R,$G,$B);
-
-     imagettftext($this->Picture,$this->FontSize,0,$XPos + 10,$YPos + $TextOffset,$C_TextColor,$this->FontName,$Caption);
-    }
-
-   /* This function draw a plot graph */
-   function drawPlotGraph($Data,$DataDescription,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1,$Shadow=FALSE)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawPlotGraph",$DataDescription);
-     $this->validateData("drawPlotGraph",$Data);
-
-     $GraphID = 0;
-     $Ro = $R2; $Go = $G2; $Bo = $B2;
-
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $R = $this->Palette[$ColorID]["R"];
-       $G = $this->Palette[$ColorID]["G"];
-       $B = $this->Palette[$ColorID]["B"];
-       $R2 = $Ro; $G2 = $Go; $B2 = $Bo;
-
-       if ( isset($DataDescription["Symbol"][$ColName]) )
-        {
-         $Is_Alpha = ((ord ( file_get_contents ($DataDescription["Symbol"][$ColName], false, null, 25, 1)) & 6) & 4) == 4;
-
-         $Infos       = getimagesize($DataDescription["Symbol"][$ColName]);
-         $ImageWidth  = $Infos[0];
-         $ImageHeight = $Infos[1];
-         $Symbol      = imagecreatefromgif($DataDescription["Symbol"][$ColName]);
-        }
-
-       $XPos  = $this->GArea_X1 + $this->GAreaXOffset;
-       $Hsize = round($BigRadius/2);
-       $R3 = -1; $G3 = -1; $B3 = -1;
-       foreach ( $Data as $Key => $Values )
-        {
-         $Value = $Data[$Key][$ColName];
-         $YPos  = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-
-         /* Save point into the image map if option activated */
-         if ( $this->BuildMap )
-          $this->addToImageMap($XPos-$Hsize,$YPos-$Hsize,$XPos+1+$Hsize,$YPos+$Hsize+1,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Plot");
-
-         if ( is_numeric($Value) )
-          {
-           if ( !isset($DataDescription["Symbol"][$ColName]) )
-            {
-
-             if ( $Shadow )
-              {
-               if ( $R3 !=-1 && $G3 !=-1 && $B3 !=-1 )
-                $this->drawFilledCircle($XPos+2,$YPos+2,$BigRadius,$R3,$G3,$B3);
-               else
-                {
-                 $R3 = $this->Palette[$ColorID]["R"]-20; if ( $R3 < 0 ) { $R3 = 0; }
-                 $G3 = $this->Palette[$ColorID]["G"]-20; if ( $G3 < 0 ) { $G3 = 0; }
-                 $B3 = $this->Palette[$ColorID]["B"]-20; if ( $B3 < 0 ) { $B3 = 0; }
-                 $this->drawFilledCircle($XPos+2,$YPos+2,$BigRadius,$R3,$G3,$B3);
-                }
-              }
-
-             $this->drawFilledCircle($XPos+1,$YPos+1,$BigRadius,$R,$G,$B);
-
-             if ( $SmallRadius != 0 )
-              {
-               if ( $R2 !=-1 && $G2 !=-1 && $B2 !=-1 )
-                $this->drawFilledCircle($XPos+1,$YPos+1,$SmallRadius,$R2,$G2,$B2);
-               else
-                {
-                 $R2 = $this->Palette[$ColorID]["R"]-15; if ( $R2 < 0 ) { $R2 = 0; }
-                 $G2 = $this->Palette[$ColorID]["G"]-15; if ( $G2 < 0 ) { $G2 = 0; }
-                 $B2 = $this->Palette[$ColorID]["B"]-15; if ( $B2 < 0 ) { $B2 = 0; }
-
-                 $this->drawFilledCircle($XPos+1,$YPos+1,$SmallRadius,$R2,$G2,$B2);
-                }
-              }
-            }
-           else
-            {
-             imagecopymerge($this->Picture,$Symbol,$XPos+1-$ImageWidth/2,$YPos+1-$ImageHeight/2,0,0,$ImageWidth,$ImageHeight,100);
-            }
-          }
-
-         $XPos = $XPos + $this->DivisionWidth;
-        }
-       $GraphID++;
-      }
-    }
-
-   /* This function draw a plot graph in an X/Y space */
-   function drawXYPlotGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1,$Shadow=TRUE)
-    {
-     $R = $this->Palette[$PaletteID]["R"];
-     $G = $this->Palette[$PaletteID]["G"];
-     $B = $this->Palette[$PaletteID]["B"];
-     $R3 = -1; $G3 = -1; $B3 = -1;
-
-     $YLast = -1; $XLast = -1;
-     foreach ( $Data as $Key => $Values )
-      {
-       if ( isset($Data[$Key][$YSerieName]) && isset($Data[$Key][$XSerieName]) )
-        {
-         $X = $Data[$Key][$XSerieName];
-         $Y = $Data[$Key][$YSerieName];
-
-         $Y = $this->GArea_Y2 - (($Y-$this->VMin) * $this->DivisionRatio);
-         $X = $this->GArea_X1 + (($X-$this->VXMin) * $this->XDivisionRatio);
-
-
-         if ( $Shadow )
-          {
-           if ( $R3 !=-1 && $G3 !=-1 && $B3 !=-1 )
-            $this->drawFilledCircle($X+2,$Y+2,$BigRadius,$R3,$G3,$B3);
-           else
-            {
-             $R3 = $this->Palette[$PaletteID]["R"]-20; if ( $R < 0 ) { $R = 0; }
-             $G3 = $this->Palette[$PaletteID]["G"]-20; if ( $G < 0 ) { $G = 0; }
-             $B3 = $this->Palette[$PaletteID]["B"]-20; if ( $B < 0 ) { $B = 0; }
-             $this->drawFilledCircle($X+2,$Y+2,$BigRadius,$R3,$G3,$B3);
-            }
-          }
-
-         $this->drawFilledCircle($X+1,$Y+1,$BigRadius,$R,$G,$B);
-
-         if ( $R2 !=-1 && $G2 !=-1 && $B2 !=-1 )
-          $this->drawFilledCircle($X+1,$Y+1,$SmallRadius,$R2,$G2,$B2);
-         else
-          {
-           $R2 = $this->Palette[$PaletteID]["R"]+20; if ( $R > 255 ) { $R = 255; }
-           $G2 = $this->Palette[$PaletteID]["G"]+20; if ( $G > 255 ) { $G = 255; }
-           $B2 = $this->Palette[$PaletteID]["B"]+20; if ( $B > 255 ) { $B = 255; }
-           $this->drawFilledCircle($X+1,$Y+1,$SmallRadius,$R2,$G2,$B2);
-          }
-        }
-      }
-
-    }
-
-   /* This function draw an area between two series */
-   function drawArea($Data,$Serie1,$Serie2,$R,$G,$B,$Alpha = 50)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateData("drawArea",$Data);
-
-     $LayerWidth  = $this->GArea_X2-$this->GArea_X1;
-     $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
-
-     $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-     $C_White         =$this->AllocateColor($this->Layers[0],255,255,255);
-     imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-     imagecolortransparent($this->Layers[0],$C_White);
-
-     $C_Graph =$this->AllocateColor($this->Layers[0],$R,$G,$B);
-
-     $XPos     = $this->GAreaXOffset;
-     $LastXPos = -1;
-     foreach ( $Data as $Key => $Values )
-      {
-       $Value1 = $Data[$Key][$Serie1];
-       $Value2 = $Data[$Key][$Serie2];
-       $YPos1  = $LayerHeight - (($Value1-$this->VMin) * $this->DivisionRatio);
-       $YPos2  = $LayerHeight - (($Value2-$this->VMin) * $this->DivisionRatio);
-
-       if ( $LastXPos != -1 )
-        {
-         $Points   = "";
-         $Points[] = $LastXPos; $Points[] = $LastYPos1;
-         $Points[] = $LastXPos; $Points[] = $LastYPos2;
-         $Points[] = $XPos; $Points[] = $YPos2;
-         $Points[] = $XPos; $Points[] = $YPos1;
-
-         imagefilledpolygon($this->Layers[0],$Points,4,$C_Graph);
-        }
-
-       $LastYPos1 = $YPos1;
-       $LastYPos2 = $YPos2;
-       $LastXPos  = $XPos;
-
-       $XPos = $XPos + $this->DivisionWidth;
-      }
-
-     imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
-     imagedestroy($this->Layers[0]);
-    }
-
-
-   /* This function write the values of the specified series */
-   function writeValues($Data,$DataDescription,$Series)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("writeValues",$DataDescription);
-     $this->validateData("writeValues",$Data);
-
-     if ( !is_array($Series) ) { $Series = array($Series); }
-
-     foreach($Series as $Key => $Serie)
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $Serie ) { $ColorID = $ID; }; $ID++; }
-
-       $XPos  = $this->GArea_X1 + $this->GAreaXOffset;
-       $XLast = -1;
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$Serie]) && is_numeric($Data[$Key][$Serie]))
-          {
-           $Value = $Data[$Key][$Serie];
-           $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-
-           $Positions = imagettfbbox($this->FontSize,0,$this->FontName,$Value);
-           $Width  = $Positions[2] - $Positions[6]; $XOffset = $XPos - ($Width/2);
-           $Height = $Positions[3] - $Positions[7]; $YOffset = $YPos - 4;
-
-           $C_TextColor =$this->AllocateColor($this->Picture,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-           imagettftext($this->Picture,$this->FontSize,0,$XOffset,$YOffset,$C_TextColor,$this->FontName,$Value);
-          }
-         $XPos = $XPos + $this->DivisionWidth;
-        }
-
-      }
-    }
-
-   /* This function draw a line graph */
-   function drawLineGraph($Data,$DataDescription,$SerieName="")
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawLineGraph",$DataDescription);
-     $this->validateData("drawLineGraph",$Data);
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       if ( $SerieName == "" || $SerieName == $ColName )
-        {
-         $XPos  = $this->GArea_X1 + $this->GAreaXOffset;
-         $XLast = -1;
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]))
-            {
-             $Value = $Data[$Key][$ColName];
-             $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-
-             /* Save point into the image map if option activated */
-             if ( $this->BuildMap )
-              $this->addToImageMap($XPos-3,$YPos-3,$XPos+3,$YPos+3,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Line");
-
-             if (!is_numeric($Value)) { $XLast = -1; }
-             if ( $XLast != -1 )
-              $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
-
-             $XLast = $XPos;
-             $YLast = $YPos;
-             if (!is_numeric($Value)) { $XLast = -1; }
-            }
-           $XPos = $XPos + $this->DivisionWidth;
-          }
-         $GraphID++;
-        }
-      }
-    }
-
-   /* This function draw a line graph */
-   function drawXYGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0)
-    {
-     $YLast = -1; $XLast = -1;
-     foreach ( $Data as $Key => $Values )
-      {
-       if ( isset($Data[$Key][$YSerieName]) && isset($Data[$Key][$XSerieName]) )
-        {
-         $X = $Data[$Key][$XSerieName];
-         $Y = $Data[$Key][$YSerieName];
-
-         $Y = $this->GArea_Y2 - (($Y-$this->VMin) * $this->DivisionRatio);
-         $X = $this->GArea_X1 + (($X-$this->VXMin) * $this->XDivisionRatio);
-
-         if ($XLast != -1 && $YLast != -1)
-          {
-           $this->drawLine($XLast,$YLast,$X,$Y,$this->Palette[$PaletteID]["R"],$this->Palette[$PaletteID]["G"],$this->Palette[$PaletteID]["B"],TRUE);
-          }
-
-         $XLast = $X;
-         $YLast = $Y;
-        }
-      }
-    }
-
-   /* This function draw a cubic curve */
-   function drawCubicCurve($Data,$DataDescription,$Accuracy=.1,$SerieName="")
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawCubicCurve",$DataDescription);
-     $this->validateData("drawCubicCurve",$Data);
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       if ( $SerieName == "" || $SerieName == $ColName )
-        {
-         $XIn = ""; $Yin = ""; $Yt = ""; $U = "";
-         $XIn[0] = 0; $YIn[0] = 0;
-
-         $ID = 0;
-         foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-          { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-         $Index = 1;
-         $XLast = -1; $Missing = "";
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]) )
-            {
-             $Value = $Data[$Key][$ColName];
-             $XIn[$Index] = $Index;
-             $YIn[$Index] = $Value;
-             if ( !is_numeric($Value) ) { $Missing[$Index] = TRUE; }
-             $Index++;
-            }
-          }
-         $Index--;
-
-         $Yt[0] = 0;
-         $Yt[1] = 0;
-         $U[1]  = 0;
-         for($i=2;$i<=$Index-1;$i++)
-          {
-           $Sig    = ($XIn[$i] - $XIn[$i-1]) / ($XIn[$i+1] - $XIn[$i-1]);
-           $p      = $Sig * $Yt[$i-1] + 2;
-           $Yt[$i] = ($Sig - 1) / $p;
-           $U[$i]  = ($YIn[$i+1] - $YIn[$i]) / ($XIn[$i+1] - $XIn[$i]) - ($YIn[$i] - $YIn[$i-1]) / ($XIn[$i] - $XIn[$i-1]);
-           $U[$i]  = (6 * $U[$i] / ($XIn[$i+1] - $XIn[$i-1]) - $Sig * $U[$i-1]) / $p;
-          }
-
-         $qn = 0;
-         $un = 0;
-         $Yt[$Index] = ($un - $qn * $U[$Index-1]) / ($qn * $Yt[$Index-1] + 1);
-
-         for($k=$Index-1;$k>=1;$k--)
-          $Yt[$k] = $Yt[$k] * $Yt[$k+1] + $U[$k];
-
-         $XPos  = $this->GArea_X1 + $this->GAreaXOffset;
-         for($X=1;$X<=$Index;$X=$X+$Accuracy)
-          {
-           $klo = 1;
-           $khi = $Index;
-           $k   = $khi - $klo;
-           while($k > 1)
-            {
-             $k = $khi - $klo;
-             If ( $XIn[$k] >= $X )
-              $khi = $k;
-             else
-              $klo = $k;
-            }
-           $klo = $khi - 1;
-
-           $h     = $XIn[$khi] - $XIn[$klo];
-           $a     = ($XIn[$khi] - $X) / $h;
-           $b     = ($X - $XIn[$klo]) / $h;
-           $Value = $a * $YIn[$klo] + $b * $YIn[$khi] + (($a*$a*$a - $a) * $Yt[$klo] + ($b*$b*$b - $b) * $Yt[$khi]) * ($h*$h) / 6;
-
-           $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-
-           if ( $XLast != -1 && !isset($Missing[floor($X)]) && !isset($Missing[floor($X+1)]) )
-            $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
-
-           $XLast = $XPos;
-           $YLast = $YPos;
-           $XPos  = $XPos + $this->DivisionWidth * $Accuracy;
-          }
-
-         // Add potentialy missing values
-         $XPos  = $XPos - $this->DivisionWidth * $Accuracy;
-         if ( $XPos < ($this->GArea_X2 - $this->GAreaXOffset) )
-          {
-           $YPos = $this->GArea_Y2 - (($YIn[$Index]-$this->VMin) * $this->DivisionRatio);
-           $this->drawLine($XLast,$YLast,$this->GArea_X2-$this->GAreaXOffset,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
-          }
-
-         $GraphID++;
-        }
-      }
-    }
-
-   /* This function draw a filled cubic curve */
-   function drawFilledCubicCurve($Data,$DataDescription,$Accuracy=.1,$Alpha=100,$AroundZero=FALSE)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawFilledCubicCurve",$DataDescription);
-     $this->validateData("drawFilledCubicCurve",$Data);
-
-     $LayerWidth  = $this->GArea_X2-$this->GArea_X1;
-     $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
-     $YZero = $LayerHeight - ((0-$this->VMin) * $this->DivisionRatio);
-     if ( $YZero > $LayerHeight ) { $YZero = $LayerHeight; }
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $XIn = ""; $Yin = ""; $Yt = ""; $U = "";
-       $XIn[0] = 0; $YIn[0] = 0;
-
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $Index = 1;
-       $XLast = -1; $Missing = "";
-       foreach ( $Data as $Key => $Values )
-        {
-         $Value = $Data[$Key][$ColName];
-         $XIn[$Index] = $Index;
-         $YIn[$Index] = $Value;
-         if ( !is_numeric($Value) ) { $Missing[$Index] = TRUE; }
-         $Index++;
-        }
-       $Index--;
-
-       $Yt[0] = 0;
-       $Yt[1] = 0;
-       $U[1]  = 0;
-       for($i=2;$i<=$Index-1;$i++)
-        {
-         $Sig    = ($XIn[$i] - $XIn[$i-1]) / ($XIn[$i+1] - $XIn[$i-1]);
-         $p      = $Sig * $Yt[$i-1] + 2;
-         $Yt[$i] = ($Sig - 1) / $p;
-         $U[$i]  = ($YIn[$i+1] - $YIn[$i]) / ($XIn[$i+1] - $XIn[$i]) - ($YIn[$i] - $YIn[$i-1]) / ($XIn[$i] - $XIn[$i-1]);
-         $U[$i]  = (6 * $U[$i] / ($XIn[$i+1] - $XIn[$i-1]) - $Sig * $U[$i-1]) / $p;
-        }
-
-       $qn = 0;
-       $un = 0;
-       $Yt[$Index] = ($un - $qn * $U[$Index-1]) / ($qn * $Yt[$Index-1] + 1);
-
-       for($k=$Index-1;$k>=1;$k--)
-        $Yt[$k] = $Yt[$k] * $Yt[$k+1] + $U[$k];
-
-       $Points   = "";
-       $Points[] = $this->GAreaXOffset;
-       $Points[] = $LayerHeight;
-
-       $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-       $C_White         =$this->AllocateColor($this->Layers[0],255,255,255);
-       imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-       imagecolortransparent($this->Layers[0],$C_White);
-
-       $YLast = NULL;
-       $XPos  = $this->GAreaXOffset; $PointsCount = 2;
-       for($X=1;$X<=$Index;$X=$X+$Accuracy)
-        {
-         $klo = 1;
-         $khi = $Index;
-         $k   = $khi - $klo;
-         while($k > 1)
-          {
-           $k = $khi - $klo;
-           If ( $XIn[$k] >= $X )
-            $khi = $k;
-           else
-            $klo = $k;
-          }
-         $klo = $khi - 1;
-
-         $h     = $XIn[$khi] - $XIn[$klo];
-         $a     = ($XIn[$khi] - $X) / $h;
-         $b     = ($X - $XIn[$klo]) / $h;
-         $Value = $a * $YIn[$klo] + $b * $YIn[$khi] + (($a*$a*$a - $a) * $Yt[$klo] + ($b*$b*$b - $b) * $Yt[$khi]) * ($h*$h) / 6;
-
-         $YPos = $LayerHeight - (($Value-$this->VMin) * $this->DivisionRatio);
-
-         if ( $YLast != NULL && $AroundZero && !isset($Missing[floor($X)]) && !isset($Missing[floor($X+1)]))
-          {
-           $aPoints   = "";
-           $aPoints[] = $XLast;
-           $aPoints[] = $YLast;
-           $aPoints[] = $XPos;
-           $aPoints[] = $YPos;
-           $aPoints[] = $XPos;
-           $aPoints[] = $YZero;
-           $aPoints[] = $XLast;
-           $aPoints[] = $YZero;
-
-           $C_Graph =$this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-           imagefilledpolygon($this->Layers[0],$aPoints,4,$C_Graph);
-          }
-
-         if ( !isset($Missing[floor($X)]) || $YLast == NULL )
-          {
-           $PointsCount++;
-           $Points[] = $XPos;
-           $Points[] = $YPos;
-          }
-         else
-          {
-           $PointsCount++; $Points[] = $XLast; $Points[] = $LayerHeight;
-          }
-
-         $YLast = $YPos; $XLast = $XPos;
-         $XPos  = $XPos + $this->DivisionWidth * $Accuracy;
-        }
-
-       // Add potentialy missing values
-       $XPos  = $XPos - $this->DivisionWidth * $Accuracy;
-       if ( $XPos < ($LayerWidth-$this->GAreaXOffset) )
-        {
-         $YPos = $LayerHeight - (($YIn[$Index]-$this->VMin) * $this->DivisionRatio);
-
-         if ( $YLast != NULL && $AroundZero )
-          {
-           $aPoints   = "";
-           $aPoints[] = $XLast;
-           $aPoints[] = $YLast;
-           $aPoints[] = $LayerWidth-$this->GAreaXOffset;
-           $aPoints[] = $YPos;
-           $aPoints[] = $LayerWidth-$this->GAreaXOffset;
-           $aPoints[] = $YZero;
-           $aPoints[] = $XLast;
-           $aPoints[] = $YZero;
-
-           $C_Graph =$this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-           imagefilledpolygon($this->Layers[0],$aPoints,4,$C_Graph);
-          }
-
-         if ( $YIn[$klo] != "" && $YIn[$khi] != "" || $YLast == NULL )
-          {
-           $PointsCount++;
-           $Points[] = $LayerWidth-$this->GAreaXOffset;
-           $Points[] = $YPos;
-          }
-        }
-
-       $Points[] = $LayerWidth-$this->GAreaXOffset;
-       $Points[] = $LayerHeight;
-
-       if ( !$AroundZero )
-        {
-         $C_Graph =$this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-         imagefilledpolygon($this->Layers[0],$Points,$PointsCount,$C_Graph);
-        }
-
-       imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
-       imagedestroy($this->Layers[0]);
-
-       $this->drawCubicCurve($Data,$DataDescription,$Accuracy,$ColName);
-
-       $GraphID++;
-      }
-    }
-
-   /* This function draw a filled line graph */
-   function drawFilledLineGraph($Data,$DataDescription,$Alpha=100,$AroundZero=FALSE)
-    {
-     $Empty = -2147483647;
-
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawFilledLineGraph",$DataDescription);
-     $this->validateData("drawFilledLineGraph",$Data);
-
-     $LayerWidth  = $this->GArea_X2-$this->GArea_X1;
-     $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $aPoints   = "";
-       $aPoints[] = $this->GAreaXOffset;
-       $aPoints[] = $LayerHeight;
-
-       $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-       $C_White         = $this->AllocateColor($this->Layers[0],255,255,255);
-       imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-       imagecolortransparent($this->Layers[0],$C_White);
-
-       $XPos  = $this->GAreaXOffset;
-       $XLast = -1; $PointsCount = 2;
-       $YZero = $LayerHeight - ((0-$this->VMin) * $this->DivisionRatio);
-       if ( $YZero > $LayerHeight ) { $YZero = $LayerHeight; }
-
-       $YLast = $Empty;
-       foreach ( $Data as $Key => $Values )
-        {
-         $Value = $Data[$Key][$ColName];
-         $YPos = $LayerHeight - (($Value-$this->VMin) * $this->DivisionRatio);
-
-         /* Save point into the image map if option activated */
-         if ( $this->BuildMap )
-          $this->addToImageMap($XPos-3,$YPos-3,$XPos+3,$YPos+3,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"FLine");
-
-         if ( !is_numeric($Value) )
-          {
-           $PointsCount++;
-           $aPoints[] = $XLast;
-           $aPoints[] = $LayerHeight;
-
-           $YLast = $Empty;
-          }
-         else
-          {
-           $PointsCount++;
-           if ( $YLast <> $Empty )
-            { $aPoints[] = $XPos; $aPoints[] = $YPos; }
-           else
-            { $PointsCount++; $aPoints[] = $XPos; $aPoints[] = $LayerHeight; $aPoints[] = $XPos; $aPoints[] = $YPos; }
-
-           if ($YLast <> $Empty && $AroundZero)
-            {
-             $Points   = "";
-             $Points[] = $XLast; $Points[] = $YLast;
-             $Points[] = $XPos;
-             $Points[] = $YPos;
-             $Points[] = $XPos;
-             $Points[] = $YZero;
-             $Points[] = $XLast;
-             $Points[] = $YZero;
-
-             $C_Graph = $this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-             imagefilledpolygon($this->Layers[0],$Points,4,$C_Graph);
-            }
-           $YLast = $YPos;
-          }
-
-         $XLast = $XPos;
-         $XPos  = $XPos + $this->DivisionWidth;
-        }
-       $aPoints[] = $LayerWidth - $this->GAreaXOffset;
-       $aPoints[] = $LayerHeight;
-
-       if ( $AroundZero == FALSE )
-        {
-         $C_Graph = $this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-         imagefilledpolygon($this->Layers[0],$aPoints,$PointsCount,$C_Graph);
-        }
-
-       imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
-       imagedestroy($this->Layers[0]);
-       $GraphID++;
-       $this->drawLineGraph($Data,$DataDescription,$ColName);
-      }
-    }
-
-   /* This function draw a bar graph */
-   function drawOverlayBarGraph($Data,$DataDescription,$Alpha=50)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawOverlayBarGraph",$DataDescription);
-     $this->validateData("drawOverlayBarGraph",$Data);
-
-     $LayerWidth  = $this->GArea_X2-$this->GArea_X1;
-     $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $this->Layers[$GraphID] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-       $C_White                = $this->AllocateColor($this->Layers[$GraphID],255,255,255);
-       $C_Graph                = $this->AllocateColor($this->Layers[$GraphID],$this->Palette[$GraphID]["R"],$this->Palette[$GraphID]["G"],$this->Palette[$GraphID]["B"]);
-       imagefilledrectangle($this->Layers[$GraphID],0,0,$LayerWidth,$LayerHeight,$C_White);
-       imagecolortransparent($this->Layers[$GraphID],$C_White);
-
-       $XWidth = $this->DivisionWidth / 4;
-       $XPos   = $this->GAreaXOffset;
-       $YZero  = $LayerHeight - ((0-$this->VMin) * $this->DivisionRatio);
-       $XLast  = -1; $PointsCount = 2;
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$ColName]) )
-          {
-           $Value = $Data[$Key][$ColName];
-           if ( is_numeric($Value) )
-            {
-             $YPos  = $LayerHeight - (($Value-$this->VMin) * $this->DivisionRatio);
-
-             imagefilledrectangle($this->Layers[$GraphID],$XPos-$XWidth,$YPos,$XPos+$XWidth,$YZero,$C_Graph);
-
-             $X1 = floor($XPos - $XWidth + $this->GArea_X1); $Y1 = floor($YPos+$this->GArea_Y1) + .2;
-             $X2 = floor($XPos + $XWidth + $this->GArea_X1); $Y2 = $this->GArea_Y2 - ((0-$this->VMin) * $this->DivisionRatio);
-             if ( $X1 <= $this->GArea_X1 ) { $X1 = $this->GArea_X1 + 1; }
-             if ( $X2 >= $this->GArea_X2 ) { $X2 = $this->GArea_X2 - 1; }
-
-             /* Save point into the image map if option activated */
-             if ( $this->BuildMap )
-              $this->addToImageMap($X1,min($Y1,$Y2),$X2,max($Y1,$Y2),$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"oBar");
-
-             $this->drawLine($X1,$Y1,$X2,$Y1,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
-            }
-          }
-         $XPos = $XPos + $this->DivisionWidth;
-        }
-
-       $GraphID++;
-      }
-
-     for($i=0;$i<=($GraphID-1);$i++)
-      {
-       imagecopymerge($this->Picture,$this->Layers[$i],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
-       imagedestroy($this->Layers[$i]);
-      }
-    }
-
-   /* This function draw a bar graph */
-   function drawHorizontalBarGraph($Data,$DataDescription,$Shadow=FALSE,$Alpha=100)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawHorizontalBarGraph",$DataDescription);
-     $this->validateData("drawHorizontalBarGraph",$Data);
-
-     $GraphID      = 0;
-     $Series       = count($DataDescription["Values"]);
-     $SeriesWidth  = $this->DivisionWidth / ($Series+1);
-     $SerieXOffset = $this->DivisionWidth / 2 - $SeriesWidth / 2;
-
-     $YZero  = $this->GArea_Y2 - ((0-$this->VMin) * $this->DivisionRatio);
-     if ( $YZero > $this->GArea_Y2 ) { $YZero = $this->GArea_Y2; }
-
-     $SerieID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $XPos  = $this->GArea_X1 + $this->GAreaXOffset - $SerieXOffset + $SeriesWidth * $SerieID;
-       $XLast = -1;
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$ColName]))
-          {
-           if ( is_numeric($Data[$Key][$ColName]) )
-            {
-             $Value = $Data[$Key][$ColName];
-             $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-
-             /* Save point into the image map if option activated */
-             if ( $this->BuildMap )
-              {
-               $this->addToImageMap($XPos+1,min($YZero,$YPos),$XPos+$SeriesWidth-1,max($YZero,$YPos),$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Bar");
-              }
-
-             if ( $Shadow && $Alpha == 100 )
-                          	
-              $X1 = $YZero;
-			  $Y1 = $XPos+1;
-			  $X2 = $YPos;
-			  $Y2 =	$XPos+$SeriesWidth-1;
-             
-             $this->drawRectangle($XPos+1,$YZero,$XPos+$SeriesWidth-1,$YPos,25,25,25,TRUE,$Alpha);
-             $this->drawFilledRectangle($XPos+1,$YZero,$XPos+$SeriesWidth-1,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha);
-             //$this->drawRectangle($X1,$Y1,$X2,$Y2,$YPos,25,25,25,TRUE,$Alpha);
-             //$this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha);
-             
-             
-            }
-          }
-         $XPos = $XPos + $this->DivisionWidth;
-        }
-       $SerieID++;
-      }
-    }
-   
-
-
-   /* This function draw a bar graph */
-   function drawBarGraph($Data,$DataDescription,$Shadow=FALSE,$Alpha=100)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawBarGraph",$DataDescription);
-     $this->validateData("drawBarGraph",$Data);
-
-     $GraphID      = 0;
-     $Series       = count($DataDescription["Values"]);
-     $SeriesWidth  = $this->DivisionWidth / ($Series+1);
-     $SerieXOffset = $this->DivisionWidth / 2 - $SeriesWidth / 2;
-
-     $YZero  = $this->GArea_Y2 - ((0-$this->VMin) * $this->DivisionRatio);
-     if ( $YZero > $this->GArea_Y2 ) { $YZero = $this->GArea_Y2; }
-
-     $SerieID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $XPos  = $this->GArea_X1 + $this->GAreaXOffset - $SerieXOffset + $SeriesWidth * $SerieID;
-       $XLast = -1;
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$ColName]))
-          {
-           if ( is_numeric($Data[$Key][$ColName]) )
-            {
-             $Value = $Data[$Key][$ColName];
-             $ValueWidth = strlen("$Value") * 6;
-             $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-
-             /* Save point into the image map if option activated */
-             if ( $this->BuildMap )
-              {
-               $this->addToImageMap($XPos+1,min($YZero,$YPos),$XPos+$SeriesWidth-1,max($YZero,$YPos),$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Bar");
-              }
-
-             if ( $Shadow && $Alpha == 100 )
-              $this->drawRectangle($XPos+1,$YZero,$XPos+$SeriesWidth-1,$YPos,25,25,25,TRUE,$Alpha);
-             $this->drawFilledRectangle($XPos+1,$YZero,$XPos+$SeriesWidth-1,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha);
-              imagettftext($this->Picture, $this->FontSize, 0, $XPos + ($SeriesWidth / 2) - ($ValueWidth / 2), $YPos - 2, $ColorID, $this->FontName, $Value);
-            }
-          }
-         $XPos = $XPos + $this->DivisionWidth;
-        }
-       $SerieID++;
-      }
-    }
-
-
-
-
-   /* This function draw a stacked bar graph */
-   function drawStackedBarGraph($Data,$DataDescription,$Alpha=50,$Contiguous=FALSE)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawBarGraph",$DataDescription);
-     $this->validateData("drawBarGraph",$Data);
-
-     $GraphID      = 0;
-     $Series       = count($DataDescription["Values"]);
-     if ( $Contiguous )
-      $SeriesWidth  = $this->DivisionWidth;
-     else
-      $SeriesWidth  = $this->DivisionWidth * .8;
-
-     $YZero  = $this->GArea_Y2 - ((0-$this->VMin) * $this->DivisionRatio);
-     if ( $YZero > $this->GArea_Y2 ) { $YZero = $this->GArea_Y2; }
-
-     $SerieID = 0; $LastValue = "";
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $XPos  = $this->GArea_X1 + $this->GAreaXOffset - $SeriesWidth / 2;
-       $XLast = -1;
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$ColName]))
-          {
-           if ( is_numeric($Data[$Key][$ColName]) )
-            {
-             $Value = $Data[$Key][$ColName];
-
-             if ( isset($LastValue[$Key]) )
-              {
-               $YPos    = $this->GArea_Y2 - ((($Value+$LastValue[$Key])-$this->VMin) * $this->DivisionRatio);
-               $YBottom = $this->GArea_Y2 - (($LastValue[$Key]-$this->VMin) * $this->DivisionRatio);
-               $LastValue[$Key] += $Value;
-              }
-             else
-              {
-               $YPos    = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-               $YBottom = $YZero;
-               $LastValue[$Key] = $Value;
-              }
-
-             /* Save point into the image map if option activated */
-             if ( $this->BuildMap )
-              $this->addToImageMap($XPos+1,min($YBottom,$YPos),$XPos+$SeriesWidth-1,max($YBottom,$YPos),$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"sBar");
-
-             $this->drawFilledRectangle($XPos+1,$YBottom,$XPos+$SeriesWidth-1,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha);
-            }
-          }
-         $XPos = $XPos + $this->DivisionWidth;
-        }
-       $SerieID++;
-      }
-    }
-
-   /* This function draw a limits bar graphs */
-   function drawLimitsGraph($Data,$DataDescription,$R=0,$G=0,$B=0)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawLimitsGraph",$DataDescription);
-     $this->validateData("drawLimitsGraph",$Data);
-
-     $XWidth = $this->DivisionWidth / 4;
-     $XPos   = $this->GArea_X1 + $this->GAreaXOffset;
-
-     foreach ( $Data as $Key => $Values )
-      {
-       $Min     = $Data[$Key][$DataDescription["Values"][0]];
-       $Max     = $Data[$Key][$DataDescription["Values"][0]];
-       $GraphID = 0; $MaxID = 0; $MinID = 0;
-       foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-        {
-         if ( isset($Data[$Key][$ColName]) )
-          {
-           if ( $Data[$Key][$ColName] > $Max && is_numeric($Data[$Key][$ColName]))
-            { $Max = $Data[$Key][$ColName]; $MaxID = $GraphID; }
-          }
-         if ( isset($Data[$Key][$ColName]) && is_numeric($Data[$Key][$ColName]))
-          {
-           if ( $Data[$Key][$ColName] < $Min )
-            { $Min = $Data[$Key][$ColName]; $MinID = $GraphID; }
-           $GraphID++;
-          }
-        }
-
-       $YPos = $this->GArea_Y2 - (($Max-$this->VMin) * $this->DivisionRatio);
-       $X1 = floor($XPos - $XWidth); $Y1 = floor($YPos) - .2;
-       $X2 = floor($XPos + $XWidth);
-       if ( $X1 <= $this->GArea_X1 ) { $X1 = $this->GArea_X1 + 1; }
-       if ( $X2 >= $this->GArea_X2 ) { $X2 = $this->GArea_X2 - 1; }
-
-       $YPos = $this->GArea_Y2 - (($Min-$this->VMin) * $this->DivisionRatio);
-       $Y2 = floor($YPos) + .2;
-
-       $this->drawLine(floor($XPos)-.2,$Y1+1,floor($XPos)-.2,$Y2-1,$R,$G,$B,TRUE);
-       $this->drawLine(floor($XPos)+.2,$Y1+1,floor($XPos)+.2,$Y2-1,$R,$G,$B,TRUE);
-       $this->drawLine($X1,$Y1,$X2,$Y1,$this->Palette[$MaxID]["R"],$this->Palette[$MaxID]["G"],$this->Palette[$MaxID]["B"],FALSE);
-       $this->drawLine($X1,$Y2,$X2,$Y2,$this->Palette[$MinID]["R"],$this->Palette[$MinID]["G"],$this->Palette[$MinID]["B"],FALSE);
-
-       $XPos = $XPos + $this->DivisionWidth;
-      }
-    }
-
-   /* This function draw radar axis centered on the graph area */
-   function drawRadarAxis($Data,$DataDescription,$Mosaic=TRUE,$BorderOffset=10,$A_R=60,$A_G=60,$A_B=60,$S_R=200,$S_G=200,$S_B=200,$MaxValue=-1)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawRadarAxis",$DataDescription);
-     $this->validateData("drawRadarAxis",$Data);
-
-     $C_TextColor = $this->AllocateColor($this->Picture,$A_R,$A_G,$A_B);
-
-     /* Draw radar axis */
-     $Points  = count($Data);
-     $Radius  = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 - $BorderOffset;
-     $XCenter = ( $this->GArea_X2 - $this->GArea_X1 ) / 2 + $this->GArea_X1;
-     $YCenter = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 + $this->GArea_Y1;
-
-     /* Search for the max value */
-     if ( $MaxValue == -1 )
-      {
-       foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-        {
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]))
-            if ( $Data[$Key][$ColName] > $MaxValue ) { $MaxValue = $Data[$Key][$ColName]; }
-          }
-        }
-      }
-
-     /* Draw the mosaic */
-     if ( $Mosaic )
-      {
-       $RadiusScale = $Radius / $MaxValue;
-       for ( $t=1; $t<=$MaxValue-1; $t++)
-        {
-         $TRadius  = $RadiusScale * $t;
-         $LastX1   = -1;
-
-         for ( $i=0; $i<=$Points; $i++)
-          {
-           $Angle = -90 + $i * 360/$Points;
-           $X1 = cos($Angle * 3.1418 / 180 ) * $TRadius + $XCenter;
-           $Y1 = sin($Angle * 3.1418 / 180 ) * $TRadius + $YCenter;
-           $X2 = cos($Angle * 3.1418 / 180 ) * ($TRadius+$RadiusScale) + $XCenter;
-           $Y2 = sin($Angle * 3.1418 / 180 ) * ($TRadius+$RadiusScale) + $YCenter;
-
-           if ( $t % 2 == 1 && $LastX1 != -1)
-            {
-             $Plots   = "";
-             $Plots[] = $X1; $Plots[] = $Y1;
-             $Plots[] = $X2; $Plots[] = $Y2;
-             $Plots[] = $LastX2; $Plots[] = $LastY2;
-             $Plots[] = $LastX1; $Plots[] = $LastY1;
-
-             $C_Graph = $this->AllocateColor($this->Picture,250,250,250);
-             imagefilledpolygon($this->Picture,$Plots,(count($Plots)+1)/2,$C_Graph);
-            }
-
-           $LastX1 = $X1; $LastY1= $Y1;
-           $LastX2 = $X2; $LastY2= $Y2;
-          }
-        }
-      }
-
-
-     /* Draw the spider web */
-     for ( $t=1; $t<=$MaxValue; $t++)
-      {
-       $TRadius = ( $Radius / $MaxValue ) * $t;
-       $LastX   = -1;
-
-       for ( $i=0; $i<=$Points; $i++)
-        {
-         $Angle = -90 + $i * 360/$Points;
-         $X = cos($Angle * 3.1418 / 180 ) * $TRadius + $XCenter;
-         $Y = sin($Angle * 3.1418 / 180 ) * $TRadius + $YCenter;
-
-         if ( $LastX != -1 )
-          $this->drawDottedLine($LastX,$LastY,$X,$Y,4,$S_R,$S_G,$S_B);
-
-         $LastX = $X; $LastY= $Y;
-        }
-      }
-
-     /* Draw the axis */
-     for ( $i=0; $i<=$Points; $i++)
-      {
-       $Angle = -90 + $i * 360/$Points;
-       $X = cos($Angle * 3.1418 / 180 ) * $Radius + $XCenter;
-       $Y = sin($Angle * 3.1418 / 180 ) * $Radius + $YCenter;
-
-       $this->drawLine($XCenter,$YCenter,$X,$Y,$A_R,$A_G,$A_B);
-
-       $XOffset = 0; $YOffset = 0;
-       if (isset($Data[$i][$DataDescription["Position"]]))
-        {
-         $Label = $Data[$i][$DataDescription["Position"]];
-
-         $Positions = imagettfbbox($this->FontSize,0,$this->FontName,$Label);
-         $Width  = $Positions[2] - $Positions[6];
-         $Height = $Positions[3] - $Positions[7];
-
-         if ( $Angle >= 0 && $Angle <= 90 )
-          $YOffset = $Height;
-
-         if ( $Angle > 90 && $Angle <= 180 )
-          { $YOffset = $Height; $XOffset = -$Width; }
-
-         if ( $Angle > 180 && $Angle <= 270 )
-          { $XOffset = -$Width; }
-
-         imagettftext($this->Picture,$this->FontSize,0,$X+$XOffset,$Y+$YOffset,$C_TextColor,$this->FontName,$Label);
-        }
-      }
-
-     /* Write the values */
-     for ( $t=1; $t<=$MaxValue; $t++)
-      {
-       $TRadius = ( $Radius / $MaxValue ) * $t;
-
-       $Angle = -90 + 360 / $Points;
-       $X1 = $XCenter;
-       $Y1 = $YCenter - $TRadius;
-       $X2 = cos($Angle * 3.1418 / 180 ) * $TRadius + $XCenter;
-       $Y2 = sin($Angle * 3.1418 / 180 ) * $TRadius + $YCenter;
-
-       $XPos = floor(($X2-$X1)/2) + $X1;
-       $YPos = floor(($Y2-$Y1)/2) + $Y1;
-
-       $Positions = imagettfbbox($this->FontSize,0,$this->FontName,$t);
-       $X = $XPos - ( $X+$Positions[2] - $X+$Positions[6] ) / 2;
-       $Y = $YPos + $this->FontSize;
-
-       $this->drawFilledRoundedRectangle($X+$Positions[6]-2,$Y+$Positions[7]-1,$X+$Positions[2]+4,$Y+$Positions[3]+1,2,240,240,240);
-       $this->drawRoundedRectangle($X+$Positions[6]-2,$Y+$Positions[7]-1,$X+$Positions[2]+4,$Y+$Positions[3]+1,2,220,220,220);
-       imagettftext($this->Picture,$this->FontSize,0,$X,$Y,$C_TextColor,$this->FontName,$t);
-      }
-    }
-
-   /* This function draw a radar graph centered on the graph area */
-   function drawRadar($Data,$DataDescription,$BorderOffset=10,$MaxValue=-1)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawRadar",$DataDescription);
-     $this->validateData("drawRadar",$Data);
-
-     $Points  = count($Data);
-     $Radius  = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 - $BorderOffset;
-     $XCenter = ( $this->GArea_X2 - $this->GArea_X1 ) / 2 + $this->GArea_X1;
-     $YCenter = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 + $this->GArea_Y1;
-
-     /* Search for the max value */
-     if ( $MaxValue == -1 )
-      {
-       foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-        {
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]))
-            if ( $Data[$Key][$ColName] > $MaxValue ) { $MaxValue = $Data[$Key][$ColName]; }
-          }
-        }
-      }
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $Angle = -90;
-       $XLast = -1;
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$ColName]))
-          {
-           $Value    = $Data[$Key][$ColName];
-           $Strength = ( $Radius / $MaxValue ) * $Value;
-
-           $XPos = cos($Angle * 3.1418 / 180 ) * $Strength + $XCenter;
-           $YPos = sin($Angle * 3.1418 / 180 ) * $Strength + $YCenter;
-
-           if ( $XLast != -1 )
-            $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-
-           if ( $XLast == -1 )
-            { $FirstX = $XPos; $FirstY = $YPos; }
-
-           $Angle = $Angle + (360/$Points);
-           $XLast = $XPos;
-           $YLast = $YPos;
-          }
-        }
-       $this->drawLine($XPos,$YPos,$FirstX,$FirstY,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-       $GraphID++;
-      }
-    }
-
-   /* This function draw a radar graph centered on the graph area */
-   function drawFilledRadar($Data,$DataDescription,$Alpha=50,$BorderOffset=10,$MaxValue=-1)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawFilledRadar",$DataDescription);
-     $this->validateData("drawFilledRadar",$Data);
-
-     $Points      = count($Data);
-     $LayerWidth  = $this->GArea_X2-$this->GArea_X1;
-     $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
-     $Radius      = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 - $BorderOffset;
-     $XCenter     = ( $this->GArea_X2 - $this->GArea_X1 ) / 2;
-     $YCenter     = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2;
-
-     /* Search for the max value */
-     if ( $MaxValue == -1 )
-      {
-       foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-        {
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]))
-            if ( $Data[$Key][$ColName] > $MaxValue && is_numeric($Data[$Key][$ColName])) { $MaxValue = $Data[$Key][$ColName]; }
-          }
-        }
-      }
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $Angle = -90;
-       $XLast = -1;
-       $Plots = "";
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$ColName]))
-          {
-           $Value    = $Data[$Key][$ColName];
-           if ( !is_numeric($Value) ) { $Value = 0; }
-           $Strength = ( $Radius / $MaxValue ) * $Value;
-
-           $XPos = cos($Angle * 3.1418 / 180 ) * $Strength + $XCenter;
-           $YPos = sin($Angle * 3.1418 / 180 ) * $Strength + $YCenter;
-
-           $Plots[] = $XPos;
-           $Plots[] = $YPos;
-
-           $Angle = $Angle + (360/$Points);
-           $XLast = $XPos;
-           $YLast = $YPos;
-          }
-        }
-
-       if (isset($Plots[0]))
-        {
-         $Plots[] = $Plots[0];
-         $Plots[] = $Plots[1];
-
-         $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-         $C_White         = $this->AllocateColor($this->Layers[0],255,255,255);
-         imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-         imagecolortransparent($this->Layers[0],$C_White);
-
-         $C_Graph = $this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-         imagefilledpolygon($this->Layers[0],$Plots,(count($Plots)+1)/2,$C_Graph);
-
-         imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
-         imagedestroy($this->Layers[0]);
-
-         for($i=0;$i<=count($Plots)-4;$i=$i+2)
-          $this->drawLine($Plots[$i]+$this->GArea_X1,$Plots[$i+1]+$this->GArea_Y1,$Plots[$i+2]+$this->GArea_X1,$Plots[$i+3]+$this->GArea_Y1,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-        }
-
-       $GraphID++;
-      }
-    }
-
-   /* This function draw a flat pie chart */
-   function drawBasicPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$R=255,$G=255,$B=255,$Decimals=0)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawBasicPieGraph",$DataDescription,FALSE);
-     $this->validateData("drawBasicPieGraph",$Data);
-
-     /* Determine pie sum */
-     $Series = 0; $PieSum = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       if ( $ColName != $DataDescription["Position"] )
-        {
-         $Series++;
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]))
-            $PieSum = $PieSum + $Data[$Key][$ColName]; $iValues[] = $Data[$Key][$ColName]; $iLabels[] = $Data[$Key][$DataDescription["Position"]];
-          }
-        }
-      }
-
-     /* Validate serie */
-     if ( $Series != 1 )
-      RaiseFatal("Pie chart can only accept one serie of data.");
-
-     $SpliceRatio         = 360 / $PieSum;
-     $SplicePercent       = 100 / $PieSum;
-
-     /* Calculate all polygons */
-     $Angle    = 0; $TopPlots = "";
-     foreach($iValues as $Key => $Value)
-      {
-       $TopPlots[$Key][] = $XPos;
-       $TopPlots[$Key][] = $YPos;
-
-       /* Process labels position & size */
-       $Caption = "";
-       if ( !($DrawLabels == PIE_NOLABEL) )
-        {
-         $TAngle   = $Angle+($Value*$SpliceRatio/2);
-         if ($DrawLabels == PIE_PERCENTAGE)
-          $Caption  = (round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-         elseif ($DrawLabels == PIE_LABELS)
-          $Caption  = $iLabels[$Key];
-         elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
-          $Caption  = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-         elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
-          $Caption  = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-
-         $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Caption);
-         $TextWidth  = $Position[2]-$Position[0];
-         $TextHeight = abs($Position[1])+abs($Position[3]);
-
-         $TX = cos(($TAngle) * 3.1418 / 180 ) * ($Radius+10) + $XPos;
-
-         if ( $TAngle > 0 && $TAngle < 180 )
-          $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+10) + $YPos + 4;
-         else
-          $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+4) + $YPos - ($TextHeight/2);
-
-         if ( $TAngle > 90 && $TAngle < 270 )
-          $TX = $TX - $TextWidth;
-
-         $C_TextColor = $this->AllocateColor($this->Picture,70,70,70);
-         imagettftext($this->Picture,$this->FontSize,0,$TX,$TY,$C_TextColor,$this->FontName,$Caption);
-        }
-
-       /* Process pie slices */
-       for($iAngle=$Angle;$iAngle<=$Angle+$Value*$SpliceRatio;$iAngle=$iAngle+.5)
-        {
-         $TopX = cos($iAngle * 3.1418 / 180 ) * $Radius + $XPos;
-         $TopY = sin($iAngle * 3.1418 / 180 ) * $Radius + $YPos;
-
-         $TopPlots[$Key][] = $TopX;
-         $TopPlots[$Key][] = $TopY;
-        }
-
-       $TopPlots[$Key][] = $XPos;
-       $TopPlots[$Key][] = $YPos;
-
-       $Angle = $iAngle;
-      }
-     $PolyPlots = $TopPlots;
-
-     /* Set array values type to float --- PHP Bug with imagefilledpolygon casting to integer */
-     foreach ($TopPlots as $Key => $Value)
-      { foreach ($TopPlots[$Key] as $Key2 => $Value2) { settype($TopPlots[$Key][$Key2],"float"); } }
-
-     /* Draw Top polygons */
-     foreach ($PolyPlots as $Key => $Value)
-      {
-       $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"]);
-       imagefilledpolygon($this->Picture,$PolyPlots[$Key],(count($PolyPlots[$Key])+1)/2,$C_GraphLo);
-      }
-
-     $this->drawCircle($XPos-.5,$YPos-.5,$Radius,$R,$G,$B);
-     $this->drawCircle($XPos-.5,$YPos-.5,$Radius+.5,$R,$G,$B);
-
-     /* Draw Top polygons */
-     foreach ($TopPlots as $Key => $Value)
-      {
-       for($j=0;$j<=count($TopPlots[$Key])-4;$j=$j+2)
-        $this->drawLine($TopPlots[$Key][$j],$TopPlots[$Key][$j+1],$TopPlots[$Key][$j+2],$TopPlots[$Key][$j+3],$R,$G,$B);
-      }
-    }
-
-   function drawFlatPieGraphWithShadow($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals=0)
-    {
-     $this->drawFlatPieGraph($Data,$DataDescription,$XPos+$this->ShadowXDistance,$YPos+$this->ShadowYDistance,$Radius,PIE_NOLABEL,$SpliceDistance,$Decimals,TRUE);
-     $this->drawFlatPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius,$DrawLabels,$SpliceDistance,$Decimals,FALSE);
-    }
-
-   /* This function draw a flat pie chart */
-   function drawFlatPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals=0,$AllBlack=FALSE)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawFlatPieGraph",$DataDescription,FALSE);
-     $this->validateData("drawFlatPieGraph",$Data);
-
-     $ShadowStatus = $this->ShadowActive ; $this->ShadowActive = FALSE;
-
-     /* Determine pie sum */
-     $Series = 0; $PieSum = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       if ( $ColName != $DataDescription["Position"] )
-        {
-         $Series++;
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]))
-            $PieSum = $PieSum + $Data[$Key][$ColName]; $iValues[] = $Data[$Key][$ColName]; $iLabels[] = $Data[$Key][$DataDescription["Position"]];
-          }
-        }
-      }
-
-     /* Validate serie */
-     if ( $Series != 1 )
-      {
-       RaiseFatal("Pie chart can only accept one serie of data.");
-       return(0);
-      }
-
-     $SpliceRatio   = 360 / $PieSum;
-     $SplicePercent = 100 / $PieSum;
-
-     /* Calculate all polygons */
-     $Angle = 0; $TopPlots = "";
-     foreach($iValues as $Key => $Value)
-      {
-       $XOffset = cos(($Angle+($Value/2*$SpliceRatio)) * 3.1418 / 180 ) * $SpliceDistance;
-       $YOffset = sin(($Angle+($Value/2*$SpliceRatio)) * 3.1418 / 180 ) * $SpliceDistance;
-
-       $TopPlots[$Key][] = round($XPos + $XOffset);
-       $TopPlots[$Key][] = round($YPos + $YOffset);
-
-       if ( $AllBlack )
-        { $Rc = $this->ShadowRColor; $Gc = $this->ShadowGColor; $Bc = $this->ShadowBColor; }
-       else
-        { $Rc = $this->Palette[$Key]["R"]; $Gc = $this->Palette[$Key]["G"]; $Bc = $this->Palette[$Key]["B"]; }
-
-       $XLineLast = ""; $YLineLast = "";
-
-       /* Process labels position & size */
-       $Caption = "";
-       if ( !($DrawLabels == PIE_NOLABEL) )
-        {
-         $TAngle   = $Angle+($Value*$SpliceRatio/2);
-         if ($DrawLabels == PIE_PERCENTAGE)
-          $Caption  = (round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-         elseif ($DrawLabels == PIE_LABELS)
-          $Caption  = $iLabels[$Key];
-         elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
-          $Caption  = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-         elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
-          $Caption  = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-
-         $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Caption);
-         $TextWidth  = $Position[2]-$Position[0];
-         $TextHeight = abs($Position[1])+abs($Position[3]);
-
-         $TX = cos(($TAngle) * 3.1418 / 180 ) * ($Radius+10+$SpliceDistance) + $XPos;
-
-         if ( $TAngle > 0 && $TAngle < 180 )
-          $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+10+$SpliceDistance) + $YPos + 4;
-         else
-          $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+$SpliceDistance+4) + $YPos - ($TextHeight/2);
-
-         if ( $TAngle > 90 && $TAngle < 270 )
-          $TX = $TX - $TextWidth;
-
-         $C_TextColor = $this->AllocateColor($this->Picture,70,70,70);
-         imagettftext($this->Picture,$this->FontSize,0,$TX,$TY,$C_TextColor,$this->FontName,$Caption);
-        }
-
-       /* Process pie slices */
-       if ( !$AllBlack )
-        $LineColor = $this->AllocateColor($this->Picture,$Rc,$Gc,$Bc);
-       else
-        $LineColor = $this->AllocateColor($this->Picture,$Rc,$Gc,$Bc);
-
-       $XLineLast = ""; $YLineLast = "";
-       for($iAngle=$Angle;$iAngle<=$Angle+$Value*$SpliceRatio;$iAngle=$iAngle+.5)
-        {
-         $PosX = cos($iAngle * 3.1418 / 180 ) * $Radius + $XPos + $XOffset;
-         $PosY = sin($iAngle * 3.1418 / 180 ) * $Radius + $YPos + $YOffset;
-
-         $TopPlots[$Key][] = round($PosX); $TopPlots[$Key][] = round($PosY);
-
-         if ( $iAngle == $Angle || $iAngle == $Angle+$Value*$SpliceRatio || $iAngle +.5 > $Angle+$Value*$SpliceRatio)
-          $this->drawLine($XPos+$XOffset,$YPos+$YOffset,$PosX,$PosY,$Rc,$Gc,$Bc);
-
-         if ( $XLineLast != "" )
-          $this->drawLine($XLineLast,$YLineLast,$PosX,$PosY,$Rc,$Gc,$Bc);
-
-         $XLineLast = $PosX; $YLineLast = $PosY;
-        }
-
-       $TopPlots[$Key][] = round($XPos + $XOffset);  $TopPlots[$Key][] = round($YPos + $YOffset);
-
-       $Angle = $iAngle;
-      }
-     $PolyPlots = $TopPlots;
-
-     /* Draw Top polygons */
-     foreach ($PolyPlots as $Key => $Value)
-      {
-       if ( !$AllBlack )
-        $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"]);
-       else
-        $C_GraphLo = $this->AllocateColor($this->Picture,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor);
-
-       imagefilledpolygon($this->Picture,$PolyPlots[$Key],(count($PolyPlots[$Key])+1)/2,$C_GraphLo);
-      }
-     $this->ShadowActive = $ShadowStatus;
-    }
-
-   /* This function draw a pseudo-3D pie chart */
-   function drawPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$EnhanceColors=TRUE,$Skew=60,$SpliceHeight=20,$SpliceDistance=0,$Decimals=0)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawPieGraph",$DataDescription,FALSE);
-     $this->validateData("drawPieGraph",$Data);
-
-     /* Determine pie sum */
-     $Series = 0; $PieSum = 0; $rPieSum = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       if ( $ColName != $DataDescription["Position"] )
-        {
-         $Series++;
-         foreach ( $Data as $Key => $Values )
-          if ( isset($Data[$Key][$ColName]))
-           {
-            if ( $Data[$Key][$ColName] == 0 )
-             { $iValues[] = 0; $rValues[] = 0; $iLabels[] = $Data[$Key][$DataDescription["Position"]]; }
-              // Removed : $PieSum++; $rValues[] = 1;
-            else
-             { $PieSum += $Data[$Key][$ColName]; $iValues[] = $Data[$Key][$ColName]; $iLabels[] = $Data[$Key][$DataDescription["Position"]]; $rValues[] = $Data[$Key][$ColName]; $rPieSum += $Data[$Key][$ColName];}
-           }
-        }
-      }
-
-     /* Validate serie */
-     if ( $Series != 1 )
-      RaiseFatal("Pie chart can only accept one serie of data.");
-
-     $SpliceDistanceRatio = $SpliceDistance;
-     $SkewHeight          = ($Radius * $Skew) / 100;
-     $SpliceRatio         = (360 - $SpliceDistanceRatio * count($iValues) ) / $PieSum;
-     $SplicePercent       = 100 / $PieSum;
-     $rSplicePercent      = 100 / $rPieSum;
-
-     /* Calculate all polygons */
-     $Angle    = 0; $CDev = 5;
-     $TopPlots = ""; $BotPlots = "";
-     $aTopPlots = ""; $aBotPlots = "";
-     foreach($iValues as $Key => $Value)
-      {
-       $XCenterPos = cos(($Angle-$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $XPos;
-       $YCenterPos = sin(($Angle-$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $YPos;
-       $XCenterPos2 = cos(($Angle+$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $XPos;
-       $YCenterPos2 = sin(($Angle+$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $YPos;
-
-       $TopPlots[$Key][] = round($XCenterPos); $BotPlots[$Key][] = round($XCenterPos);
-       $TopPlots[$Key][] = round($YCenterPos); $BotPlots[$Key][] = round($YCenterPos + $SpliceHeight);
-       $aTopPlots[$Key][] = $XCenterPos; $aBotPlots[$Key][] = $XCenterPos;
-       $aTopPlots[$Key][] = $YCenterPos; $aBotPlots[$Key][] = $YCenterPos + $SpliceHeight;
-
-       /* Process labels position & size */
-       $Caption = "";
-       if ( !($DrawLabels == PIE_NOLABEL) )
-        {
-         $TAngle   = $Angle+($Value*$SpliceRatio/2);
-         if ($DrawLabels == PIE_PERCENTAGE)
-          $Caption  = (round($rValues[$Key] * pow(10,$Decimals) * $rSplicePercent)/pow(10,$Decimals))."%";
-         elseif ($DrawLabels == PIE_LABELS)
-          $Caption  = $iLabels[$Key];
-         elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
-          $Caption  = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-
-         $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Caption);
-         $TextWidth  = $Position[2]-$Position[0];
-         $TextHeight = abs($Position[1])+abs($Position[3]);
-
-         $TX = cos(($TAngle) * 3.1418 / 180 ) * ($Radius + 10)+ $XPos;
-
-         if ( $TAngle > 0 && $TAngle < 180 )
-          $TY = sin(($TAngle) * 3.1418 / 180 ) * ($SkewHeight + 10) + $YPos + $SpliceHeight + 4;
-         else
-          $TY = sin(($TAngle) * 3.1418 / 180 ) * ($SkewHeight + 4) + $YPos - ($TextHeight/2);
-
-         if ( $TAngle > 90 && $TAngle < 270 )
-          $TX = $TX - $TextWidth;
-
-         $C_TextColor = $this->AllocateColor($this->Picture,70,70,70);
-         imagettftext($this->Picture,$this->FontSize,0,$TX,$TY,$C_TextColor,$this->FontName,$Caption);
-        }
-
-       /* Process pie slices */
-       for($iAngle=$Angle;$iAngle<=$Angle+$Value*$SpliceRatio;$iAngle=$iAngle+.5)
-        {
-         $TopX = cos($iAngle * 3.1418 / 180 ) * $Radius + $XPos;
-         $TopY = sin($iAngle * 3.1418 / 180 ) * $SkewHeight + $YPos;
-
-         $TopPlots[$Key][] = round($TopX); $BotPlots[$Key][] = round($TopX);
-         $TopPlots[$Key][] = round($TopY); $BotPlots[$Key][] = round($TopY + $SpliceHeight);
-         $aTopPlots[$Key][] = $TopX; $aBotPlots[$Key][] = $TopX;
-         $aTopPlots[$Key][] = $TopY; $aBotPlots[$Key][] = $TopY + $SpliceHeight;
-        }
-
-       $TopPlots[$Key][] = round($XCenterPos2); $BotPlots[$Key][] = round($XCenterPos2);
-       $TopPlots[$Key][] = round($YCenterPos2); $BotPlots[$Key][] = round($YCenterPos2 + $SpliceHeight);
-       $aTopPlots[$Key][] = $XCenterPos2; $aBotPlots[$Key][] = $XCenterPos2;
-       $aTopPlots[$Key][] = $YCenterPos2; $aBotPlots[$Key][] = $YCenterPos2 + $SpliceHeight;
-
-       $Angle = $iAngle + $SpliceDistanceRatio;
-      }
-
-     /* Draw Bottom polygons */
-     foreach($iValues as $Key => $Value)
-      {
-       $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"],-20);
-       imagefilledpolygon($this->Picture,$BotPlots[$Key],(count($BotPlots[$Key])+1)/2,$C_GraphLo);
-
-       if ( $EnhanceColors ) { $En = -10; } else { $En = 0; }
-
-       for($j=0;$j<=count($aBotPlots[$Key])-4;$j=$j+2)
-        $this->drawLine($aBotPlots[$Key][$j],$aBotPlots[$Key][$j+1],$aBotPlots[$Key][$j+2],$aBotPlots[$Key][$j+3],$this->Palette[$Key]["R"]+$En,$this->Palette[$Key]["G"]+$En,$this->Palette[$Key]["B"]+$En);
-      }
-
-     /* Draw pie layers */
-     if ( $EnhanceColors ) { $ColorRatio = 30 / $SpliceHeight; } else { $ColorRatio = 25 / $SpliceHeight; }
-     for($i=$SpliceHeight-1;$i>=1;$i--)
-      {
-       foreach($iValues as $Key => $Value)
-        {
-         $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"],-10);
-         $Plots = ""; $Plot = 0;
-         foreach($TopPlots[$Key] as $Key2 => $Value2)
-          {
-           $Plot++;
-           if ( $Plot % 2 == 1 )
-            $Plots[] = $Value2;
-           else
-            $Plots[] = $Value2+$i;
-          }
-         imagefilledpolygon($this->Picture,$Plots,(count($Plots)+1)/2,$C_GraphLo);
-
-         $Index       = count($Plots);
-         if ($EnhanceColors ) {$ColorFactor = -20 + ($SpliceHeight - $i) * $ColorRatio; } else { $ColorFactor = 0; }
-
-         $this->drawAntialiasPixel($Plots[0],$Plots[1],$this->Palette[$Key]["R"]+$ColorFactor,$this->Palette[$Key]["G"]+$ColorFactor,$this->Palette[$Key]["B"]+$ColorFactor);
-         $this->drawAntialiasPixel($Plots[2],$Plots[3],$this->Palette[$Key]["R"]+$ColorFactor,$this->Palette[$Key]["G"]+$ColorFactor,$this->Palette[$Key]["B"]+$ColorFactor);
-         $this->drawAntialiasPixel($Plots[$Index-4],$Plots[$Index-3],$this->Palette[$Key]["R"]+$ColorFactor,$this->Palette[$Key]["G"]+$ColorFactor,$this->Palette[$Key]["B"]+$ColorFactor);
-        }
-      }
-
-     /* Draw Top polygons */
-     for($Key=count($iValues)-1;$Key>=0;$Key--)
-      {
-       $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"]);
-       imagefilledpolygon($this->Picture,$TopPlots[$Key],(count($TopPlots[$Key])+1)/2,$C_GraphLo);
-
-       if ( $EnhanceColors ) { $En = 10; } else { $En = 0; }
-       for($j=0;$j<=count($aTopPlots[$Key])-4;$j=$j+2)
-        $this->drawLine($aTopPlots[$Key][$j],$aTopPlots[$Key][$j+1],$aTopPlots[$Key][$j+2],$aTopPlots[$Key][$j+3],$this->Palette[$Key]["R"]+$En,$this->Palette[$Key]["G"]+$En,$this->Palette[$Key]["B"]+$En);
-      }
-    }
-
-   /* This function can be used to set the background color */
-   function drawBackground($R,$G,$B)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_Background = $this->AllocateColor($this->Picture,$R,$G,$B);
-     imagefilledrectangle($this->Picture,0,0,$this->XSize,$this->YSize,$C_Background);
-    }
-
-   /* This function can be used to set the background color */
-   function drawGraphAreaGradient($R,$G,$B,$Decay,$Target=TARGET_GRAPHAREA)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     if ( $Target == TARGET_GRAPHAREA )  { $X1 = $this->GArea_X1+1; $X2 = $this->GArea_X2-1; $Y1 = $this->GArea_Y1+1; $Y2 = $this->GArea_Y2; }
-     if ( $Target == TARGET_BACKGROUND ) { $X1 = 0; $X2 = $this->XSize; $Y1 = 0; $Y2 = $this->YSize; }
-
-     /* Positive gradient */
-     if ( $Decay > 0 )
-      {
-       $YStep = ($Y2 - $Y1 - 2) / $Decay;
-       for($i=0;$i<=$Decay;$i++)
-        {
-         $R-=1;$G-=1;$B-=1;
-         $Yi1 = $Y1 + ( $i * $YStep );
-         $Yi2 = ceil( $Yi1 + ( $i * $YStep ) + $YStep );
-         if ( $Yi2 >= $Yi2 ) { $Yi2 = $Y2-1; }
-
-         $C_Background = $this->AllocateColor($this->Picture,$R,$G,$B);
-         imagefilledrectangle($this->Picture,$X1,$Yi1,$X2,$Yi2,$C_Background);
-        }
-      }
-
-     /* Negative gradient */
-     if ( $Decay < 0 )
-      {
-       $YStep = ($Y2 - $Y1 - 2) / -$Decay;
-       $Yi1   = $Y1; $Yi2   = $Y1+$YStep;
-       for($i=-$Decay;$i>=0;$i--)
-        {
-         $R+=1;$G+=1;$B+=1;
-         $C_Background = $this->AllocateColor($this->Picture,$R,$G,$B);
-         imagefilledrectangle($this->Picture,$X1,$Yi1,$X2,$Yi2,$C_Background);
-
-         $Yi1+= $YStep;
-         $Yi2+= $YStep;
-         if ( $Yi2 >= $Yi2 ) { $Yi2 = $Y2-1; }
-        }
-      }
-    }
-
-   /* This function create a rectangle with antialias */
-   function drawRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
-
-     $X1=$X1-.2;$Y1=$Y1-.2;
-     $X2=$X2+.2;$Y2=$Y2+.2;
-     
-     $this->drawLine($X1,$Y1,$X2,$Y1,$R,$G,$B);
-     $this->drawLine($X2,$Y1,$X2,$Y2,$R,$G,$B);
-     $this->drawLine($X2,$Y2,$X1,$Y2,$R,$G,$B);
-     $this->drawLine($X1,$Y2,$X1,$Y1,$R,$G,$B);
-     
-     
-    }
-
-   /* This function create a filled rectangle with antialias */
-   function drawFilledRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B,$DrawBorder=TRUE,$Alpha=100,$NoFallBack=FALSE)
-    {
-     if ( $X2 < $X1 ) { list($X1, $X2) = array($X2, $X1); }
-     if ( $Y2 < $Y1 ) { list($Y1, $Y2) = array($Y2, $Y1); }
-
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     if ( $Alpha == 100 )
-      {
-       /* Process shadows */
-       if ( $this->ShadowActive && !$NoFallBack )
-        {
-         $this->drawFilledRectangle($X1+$this->ShadowXDistance,$Y1+$this->ShadowYDistance,$X2+$this->ShadowXDistance,$Y2+$this->ShadowYDistance,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha,TRUE);
-         if ( $this->ShadowBlur != 0 )
-          {
-           $AlphaDecay = ($this->ShadowAlpha / $this->ShadowBlur);
-
-           for($i=1; $i<=$this->ShadowBlur; $i++)
-            $this->drawFilledRectangle($X1+$this->ShadowXDistance-$i/2,$Y1+$this->ShadowYDistance-$i/2,$X2+$this->ShadowXDistance-$i/2,$Y2+$this->ShadowYDistance-$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha-$AlphaDecay*$i,TRUE);
-           for($i=1; $i<=$this->ShadowBlur; $i++)
-            $this->drawFilledRectangle($X1+$this->ShadowXDistance+$i/2,$Y1+$this->ShadowYDistance+$i/2,$X2+$this->ShadowXDistance+$i/2,$Y2+$this->ShadowYDistance+$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha-$AlphaDecay*$i,TRUE);
-          }
-        }
-
-       $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
-       imagefilledrectangle($this->Picture,round($X1),round($Y1),round($X2),round($Y2),$C_Rectangle);
-      }
-     else
-      {
-       $LayerWidth  = abs($X2-$X1)+2;
-       $LayerHeight = abs($Y2-$Y1)+2;
-
-       $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-       $C_White         = $this->AllocateColor($this->Layers[0],255,255,255);
-       imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-       imagecolortransparent($this->Layers[0],$C_White);
-
-       $C_Rectangle = $this->AllocateColor($this->Layers[0],$R,$G,$B);
-       imagefilledrectangle($this->Layers[0],round(1),round(1),round($LayerWidth-1),round($LayerHeight-1),$C_Rectangle);
-
-       imagecopymerge($this->Picture,$this->Layers[0],round(min($X1,$X2)-1),round(min($Y1,$Y2)-1),0,0,$LayerWidth,$LayerHeight,$Alpha);
-       imagedestroy($this->Layers[0]);
-      }
-
-     if ( $DrawBorder )
-      {
-       $ShadowSettings = $this->ShadowActive; $this->ShadowActive = FALSE;
-       $this->drawRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B);
-       $this->ShadowActive = $ShadowSettings;
-      }
-    }
-
-   /* This function create a rectangle with rounded corners and antialias */
-   function drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
-
-     $Step = 90 / ((3.1418 * $Radius)/2);
-
-     for($i=0;$i<=90;$i=$i+$Step)
-      {
-       $X = cos(($i+180)*3.1418/180) * $Radius + $X1 + $Radius;
-       $Y = sin(($i+180)*3.1418/180) * $Radius + $Y1 + $Radius;
-       $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
-
-       $X = cos(($i-90)*3.1418/180) * $Radius + $X2 - $Radius;
-       $Y = sin(($i-90)*3.1418/180) * $Radius + $Y1 + $Radius;
-       $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
-
-       $X = cos(($i)*3.1418/180) * $Radius + $X2 - $Radius;
-       $Y = sin(($i)*3.1418/180) * $Radius + $Y2 - $Radius;
-       $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
-
-       $X = cos(($i+90)*3.1418/180) * $Radius + $X1 + $Radius;
-       $Y = sin(($i+90)*3.1418/180) * $Radius + $Y2 - $Radius;
-       $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
-      }
-
-     $X1=$X1-.2;$Y1=$Y1-.2;
-     $X2=$X2+.2;$Y2=$Y2+.2;
-     $this->drawLine($X1+$Radius,$Y1,$X2-$Radius,$Y1,$R,$G,$B);
-     $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$R,$G,$B);
-     $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$R,$G,$B);
-     $this->drawLine($X1,$Y2-$Radius,$X1,$Y1+$Radius,$R,$G,$B);
-    }
-
-   /* This function create a filled rectangle with rounded corners and antialias */
-   function drawFilledRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-
-
-     $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
-
-
-     $Step = 90 / ((3.1418 * $Radius)/2);
-
-     for($i=0;$i<=90;$i=$i+$Step)
-      {
-       $Xi1 = cos(($i+180)*3.1418/180) * $Radius + $X1 + $Radius;
-       $Yi1 = sin(($i+180)*3.1418/180) * $Radius + $Y1 + $Radius;
-
-       $Xi2 = cos(($i-90)*3.1418/180) * $Radius + $X2 - $Radius;
-       $Yi2 = sin(($i-90)*3.1418/180) * $Radius + $Y1 + $Radius;
-
-       $Xi3 = cos(($i)*3.1418/180) * $Radius + $X2 - $Radius;
-       $Yi3 = sin(($i)*3.1418/180) * $Radius + $Y2 - $Radius;
-
-       $Xi4 = cos(($i+90)*3.1418/180) * $Radius + $X1 + $Radius;
-       $Yi4 = sin(($i+90)*3.1418/180) * $Radius + $Y2 - $Radius;
-
-       imageline($this->Picture,$Xi1,$Yi1,$X1+$Radius,$Yi1,$C_Rectangle);
-       imageline($this->Picture,$X2-$Radius,$Yi2,$Xi2,$Yi2,$C_Rectangle);
-       imageline($this->Picture,$X2-$Radius,$Yi3,$Xi3,$Yi3,$C_Rectangle);
-       imageline($this->Picture,$Xi4,$Yi4,$X1+$Radius,$Yi4,$C_Rectangle);
-
-       $this->drawAntialiasPixel($Xi1,$Yi1,$R,$G,$B);
-       $this->drawAntialiasPixel($Xi2,$Yi2,$R,$G,$B);
-       $this->drawAntialiasPixel($Xi3,$Yi3,$R,$G,$B);
-       $this->drawAntialiasPixel($Xi4,$Yi4,$R,$G,$B);
-      }
-
-     imagefilledrectangle($this->Picture,$X1,$Y1+$Radius,$X2,$Y2-$Radius,$C_Rectangle);
-     imagefilledrectangle($this->Picture,$X1+$Radius,$Y1,$X2-$Radius,$Y2,$C_Rectangle);
-
-     $X1=$X1-.2;$Y1=$Y1-.2;
-     $X2=$X2+.2;$Y2=$Y2+.2;
-     $this->drawLine($X1+$Radius,$Y1,$X2-$Radius,$Y1,$R,$G,$B);
-     $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$R,$G,$B);
-     $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$R,$G,$B);
-     $this->drawLine($X1,$Y2-$Radius,$X1,$Y1+$Radius,$R,$G,$B);
-    }
-    
-    
-    
-    
-
-   /* This function create a circle with antialias */
-   function drawCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0)
-    {
-     if ( $Width == 0 ) { $Width = $Height; }
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_Circle = $this->AllocateColor($this->Picture,$R,$G,$B);
-     $Step     = 360 / (2 * 3.1418 * max($Width,$Height));
-
-     for($i=0;$i<=360;$i=$i+$Step)
-      {
-       $X = cos($i*3.1418/180) * $Height + $Xc;
-       $Y = sin($i*3.1418/180) * $Width + $Yc;
-       $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
-      }
-    }
-
-   /* This function create a filled circle/ellipse with antialias */
-   function drawFilledCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0)
-    {
-     if ( $Width == 0 ) { $Width = $Height; }
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_Circle = $this->AllocateColor($this->Picture,$R,$G,$B);
-     $Step     = 360 / (2 * 3.1418 * max($Width,$Height));
-
-     for($i=90;$i<=270;$i=$i+$Step)
-      {
-       $X1 = cos($i*3.1418/180) * $Height + $Xc;
-       $Y1 = sin($i*3.1418/180) * $Width + $Yc;
-       $X2 = cos((180-$i)*3.1418/180) * $Height + $Xc;
-       $Y2 = sin((180-$i)*3.1418/180) * $Width + $Yc;
-
-       $this->drawAntialiasPixel($X1-1,$Y1-1,$R,$G,$B);
-       $this->drawAntialiasPixel($X2-1,$Y2-1,$R,$G,$B);
-
-       if ( ($Y1-1) > $Yc - max($Width,$Height) )
-        imageline($this->Picture,$X1,$Y1-1,$X2-1,$Y2-1,$C_Circle);
-      }
-    }
-
-   /* This function will draw a filled ellipse */
-   function drawEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B)
-    { $this->drawCircle($Xc,$Yc,$Height,$R,$G,$B,$Width); }
-
-   /* This function will draw an ellipse */
-   function drawFilledEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B)
-    { $this->drawFilledCircle($Xc,$Yc,$Height,$R,$G,$B,$Width); }
-
-   /* This function create a line with antialias */
-   function drawLine($X1,$Y1,$X2,$Y2,$R,$G,$B,$GraphFunction=FALSE)
-    {
-     if ( $this->LineDotSize > 1 ) { $this->drawDottedLine($X1,$Y1,$X2,$Y2,$this->LineDotSize,$R,$G,$B,$GraphFunction); return(0); }
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $Distance = sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1));
-     if ( $Distance == 0 )
-      return(-1);
-     $XStep = ($X2-$X1) / $Distance;
-     $YStep = ($Y2-$Y1) / $Distance;
-
-     for($i=0;$i<=$Distance;$i++)
-      {
-       $X = $i * $XStep + $X1;
-       $Y = $i * $YStep + $Y1;
-
-       if ( ($X >= $this->GArea_X1 && $X <= $this->GArea_X2 && $Y >= $this->GArea_Y1 && $Y <= $this->GArea_Y2) || !$GraphFunction )
-        {
-         if ( $this->LineWidth == 1 )
-          $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
-         else
-          {
-           $StartOffset = -($this->LineWidth/2); $EndOffset = ($this->LineWidth/2);
-           for($j=$StartOffset;$j<=$EndOffset;$j++)
-            $this->drawAntialiasPixel($X+$j,$Y+$j,$R,$G,$B);
-          }
-        }
-      }
-    }
-
-   /* This function create a line with antialias */
-   function drawDottedLine($X1,$Y1,$X2,$Y2,$DotSize,$R,$G,$B,$GraphFunction=FALSE)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $Distance = sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1));
-
-     $XStep = ($X2-$X1) / $Distance;
-     $YStep = ($Y2-$Y1) / $Distance;
-
-     $DotIndex = 0;
-     for($i=0;$i<=$Distance;$i++)
-      {
-       $X = $i * $XStep + $X1;
-       $Y = $i * $YStep + $Y1;
-
-       if ( $DotIndex <= $DotSize)
-        {
-         if ( ($X >= $this->GArea_X1 && $X <= $this->GArea_X2 && $Y >= $this->GArea_Y1 && $Y <= $this->GArea_Y2) || !$GraphFunction )
-          {
-           if ( $this->LineWidth == 1 )
-            $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
-           else
-            {
-             $StartOffset = -($this->LineWidth/2); $EndOffset = ($this->LineWidth/2);
-             for($j=$StartOffset;$j<=$EndOffset;$j++)
-              $this->drawAntialiasPixel($X+$j,$Y+$j,$R,$G,$B);
-            }
-          }
-        }
-
-       $DotIndex++;
-       if ( $DotIndex == $DotSize * 2 )
-        $DotIndex = 0;
-      }
-    }
-
-   /* Load a PNG file and draw it over the chart */
-   function drawFromPNG($FileName,$X,$Y,$Alpha=100)
-    { $this->drawFromPicture(1,$FileName,$X,$Y,$Alpha); }
-
-   /* Load a GIF file and draw it over the chart */
-   function drawFromGIF($FileName,$X,$Y,$Alpha=100)
-    { $this->drawFromPicture(2,$FileName,$X,$Y,$Alpha); }
-
-   /* Load a JPEG file and draw it over the chart */
-   function drawFromJPG($FileName,$X,$Y,$Alpha=100)
-    { $this->drawFromPicture(3,$FileName,$X,$Y,$Alpha); }
-
-   /* Generic loader function for external pictures */
-   function drawFromPicture($PicType,$FileName,$X,$Y,$Alpha=100)
-    {
-     if ( file_exists($FileName))
-      {
-       $Infos  = getimagesize($FileName);
-       $Width  = $Infos[0];
-       $Height = $Infos[1];
-       if ( $PicType == 1 ) { $Raster = imagecreatefrompng($FileName); }
-       if ( $PicType == 2 ) { $Raster = imagecreatefromgif($FileName); }
-       if ( $PicType == 3 ) { $Raster = imagecreatefromjpeg($FileName); }
-
-       imagecopymerge($this->Picture,$Raster,$X,$Y,0,0,$Width,$Height,$Alpha);
-       imagedestroy($Raster);
-      }
-    }
-
-   /* Draw an alpha pixel */
-   function drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
-      return(-1);
-
-     $RGB2 = imagecolorat($this->Picture, $X, $Y);
-     $R2   = ($RGB2 >> 16) & 0xFF;
-     $G2   = ($RGB2 >> 8) & 0xFF;
-     $B2   = $RGB2 & 0xFF;
-
-     $iAlpha = (100 - $Alpha)/100;
-     $Alpha  = $Alpha / 100;
-
-     $Ra   = floor($R*$Alpha+$R2*$iAlpha);
-     $Ga   = floor($G*$Alpha+$G2*$iAlpha);
-     $Ba   = floor($B*$Alpha+$B2*$iAlpha);
-
-     $C_Aliased = $this->AllocateColor($this->Picture,$Ra,$Ga,$Ba);
-     imagesetpixel($this->Picture,$X,$Y,$C_Aliased);
-    }
-
-   /* Color helper */
-   function AllocateColor($Picture,$R,$G,$B,$Factor=0)
-    {
-     $R = $R + $Factor;
-     $G = $G + $Factor;
-     $B = $B + $Factor;
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     return(imagecolorallocate($Picture,$R,$G,$B));
-    }
-
-   /* Add a border to the picture */
-   function addBorder($Size=3,$R=0,$G=0,$B=0)
-    {
-     $Width  = $this->XSize+2*$Size;
-     $Height = $this->YSize+2*$Size;
-
-     $Resampled    = imagecreatetruecolor($Width,$Height);
-     $C_Background = $this->AllocateColor($Resampled,$R,$G,$B);
-     imagefilledrectangle($Resampled,0,0,$Width,$Height,$C_Background);
-
-     imagecopy($Resampled,$this->Picture,$Size,$Size,0,0,$this->XSize,$this->YSize);
-     imagedestroy($this->Picture);
-
-     $this->XSize = $Width;
-     $this->YSize = $Height;
-
-     $this->Picture = imagecreatetruecolor($this->XSize,$this->YSize);
-     $C_White = $this->AllocateColor($this->Picture,255,255,255);
-     imagefilledrectangle($this->Picture,0,0,$this->XSize,$this->YSize,$C_White);
-     imagecolortransparent($this->Picture,$C_White);
-     imagecopy($this->Picture,$Resampled,0,0,0,0,$this->XSize,$this->YSize);
-    }
-
-   /* Render the current picture to a file */
-   function Render($FileName)
-    {
-     if ( $this->ErrorReporting )
-      $this->printErrors($this->ErrorInterface);
-
-     /* Save image map if requested */
-     if ( $this->BuildMap )
-      $this->SaveImageMap();
-
-     imagepng($this->Picture,$FileName);
-    }
-
-   /* Render the current picture to STDOUT */
-   function Stroke()
-    {
-     if ( $this->ErrorReporting )
-      $this->printErrors("GD");
-
-     /* Save image map if requested */
-     if ( $this->BuildMap )
-      $this->SaveImageMap();
-
-     header('Content-type: image/png');
-     imagepng($this->Picture);
-    }
-
-   /* Private functions for internal processing */
-   function drawAntialiasPixel($X,$Y,$R,$G,$B,$Alpha=100,$NoFallBack=FALSE)
-    {
-     /* Process shadows */
-     if ( $this->ShadowActive && !$NoFallBack )
-      {
-       $this->drawAntialiasPixel($X+$this->ShadowXDistance,$Y+$this->ShadowYDistance,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,$this->ShadowAlpha,TRUE);
-       if ( $this->ShadowBlur != 0 )
-        {
-         $AlphaDecay = ($this->ShadowAlpha / $this->ShadowBlur);
-
-         for($i=1; $i<=$this->ShadowBlur; $i++)
-          $this->drawAntialiasPixel($X+$this->ShadowXDistance-$i/2,$Y+$this->ShadowYDistance-$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,$this->ShadowAlpha-$AlphaDecay*$i,TRUE);
-         for($i=1; $i<=$this->ShadowBlur; $i++)
-          $this->drawAntialiasPixel($X+$this->ShadowXDistance+$i/2,$Y+$this->ShadowYDistance+$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,$this->ShadowAlpha-$AlphaDecay*$i,TRUE);
-        }
-      }
-
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $Plot = "";
-     $Xi   = floor($X);
-     $Yi   = floor($Y);
-
-     if ( $Xi == $X && $Yi == $Y)
-      {
-       if ( $Alpha == 100 )
-        {
-         $C_Aliased = $this->AllocateColor($this->Picture,$R,$G,$B);
-         imagesetpixel($this->Picture,$X,$Y,$C_Aliased);
-        }
-       else
-        $this->drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B);
-      }
-     else
-      {
-       $Alpha1 = (((1 - ($X - floor($X))) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
-       if ( $Alpha1 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi,$Alpha1,$R,$G,$B); }
-
-       $Alpha2 = ((($X - floor($X)) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
-       if ( $Alpha2 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi,$Alpha2,$R,$G,$B); }
-
-       $Alpha3 = (((1 - ($X - floor($X))) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
-       if ( $Alpha3 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi+1,$Alpha3,$R,$G,$B); }
-
-       $Alpha4 = ((($X - floor($X)) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
-       if ( $Alpha4 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi+1,$Alpha4,$R,$G,$B); }
-      }
-    }
-
-   /* Validate data contained in the description array */
-   function validateDataDescription($FunctionName,&$DataDescription,$DescriptionRequired=TRUE)
-    {
-     if (!isset($DataDescription["Position"]))
-      {
-       $this->Errors[] = "[Warning] ".$FunctionName." - Y Labels are not set.";
-       $DataDescription["Position"] = "Name";
-      }
-
-     if ( $DescriptionRequired )
-      {
-       if (!isset($DataDescription["Description"]))
-        {
-         $this->Errors[] = "[Warning] ".$FunctionName." - Series descriptions are not set.";
-         foreach($DataDescription["Values"] as $key => $Value)
-          {
-           $DataDescription["Description"][$Value] = $Value;
-          }
-        }
-
-       if (count($DataDescription["Description"]) < count($DataDescription["Values"]))
-        {
-         $this->Errors[] = "[Warning] ".$FunctionName." - Some series descriptions are not set.";
-         foreach($DataDescription["Values"] as $key => $Value)
-          {
-           if ( !isset($DataDescription["Description"][$Value]))
-            $DataDescription["Description"][$Value] = $Value;
-          }
-        }
-      }
-    }
-
-   /* Validate data contained in the data array */
-   function validateData($FunctionName,&$Data)
-    {
-     $DataSummary = array();
-
-     foreach($Data as $key => $Values)
-      {
-       foreach($Values as $key2 => $Value)
-        {
-         if (!isset($DataSummary[$key2]))
-          $DataSummary[$key2] = 1;
-         else
-          $DataSummary[$key2]++;
-        }
-      }
-
-     if ( max($DataSummary) == 0 )
-      $this->Errors[] = "[Warning] ".$FunctionName." - No data set.";
-
-     foreach($DataSummary as $key => $Value)
-      {
-       if ($Value < max($DataSummary))
-        {
-         $this->Errors[] = "[Warning] ".$FunctionName." - Missing data in serie ".$key.".";
-        }
-      }
-    }
-
-   /* Print all error messages on the CLI or graphically */
-   function printErrors($Mode="CLI")
-    {
-     if (count($this->Errors) == 0)
-      return(0);
-
-     if ( $Mode == "CLI" )
-      {
-       foreach($this->Errors as $key => $Value)
-        echo $Value."\r\n";
-      }
-     elseif ( $Mode == "GD" )
-      {
-       $this->setLineStyle($Width=1);
-       $MaxWidth = 0;
-       foreach($this->Errors as $key => $Value)
-        {
-         $Position  = imageftbbox($this->ErrorFontSize,0,$this->ErrorFontName,$Value);
-         $TextWidth = $Position[2]-$Position[0];
-         if ( $TextWidth > $MaxWidth ) { $MaxWidth = $TextWidth; }
-        }
-       $this->drawFilledRoundedRectangle($this->XSize-($MaxWidth+20),$this->YSize-(20+(($this->ErrorFontSize+4)*count($this->Errors))),$this->XSize-10,$this->YSize-10,6,233,185,185);
-       $this->drawRoundedRectangle($this->XSize-($MaxWidth+20),$this->YSize-(20+(($this->ErrorFontSize+4)*count($this->Errors))),$this->XSize-10,$this->YSize-10,6,193,145,145);
-
-       $C_TextColor = $this->AllocateColor($this->Picture,133,85,85);
-       $YPos        = $this->YSize - (18 + (count($this->Errors)-1) * ($this->ErrorFontSize + 4));
-       foreach($this->Errors as $key => $Value)
-        {
-         imagettftext($this->Picture,$this->ErrorFontSize,0,$this->XSize-($MaxWidth+15),$YPos,$C_TextColor,$this->ErrorFontName,$Value);
-         $YPos = $YPos + ($this->ErrorFontSize + 4);
-        }
-      }
-    }
-
-   /* Activate the image map creation process */
-   function setImageMap($Mode=TRUE,$GraphID="MyGraph")
-    {
-     $this->BuildMap = $Mode;
-     $this->MapID    = $GraphID;
-    }
-
-   /* Add a box into the image map */
-   function addToImageMap($X1,$Y1,$X2,$Y2,$SerieName,$Value,$CallerFunction)
-    {
-     if ( $this->MapFunction == NULL || $this->MapFunction == $CallerFunction )
-      {
-       $this->ImageMap[]  = round($X1).",".round($Y1).",".round($X2).",".round($Y2).",".$SerieName.",".$Value;
-       $this->MapFunction = $CallerFunction;
-      }
-    }
-
-   /* Load and cleanup the image map from disk */
-   function getImageMap($MapName,$Flush=TRUE)
-    {
-     /* Strip HTML query strings */
-     $Values   = $this->tmpFolder.$MapName;
-     $Value    = split("\?",$Values);
-     $FileName = $Value[0];
-
-     if ( file_exists($FileName) )
-      {
-       $Handle     = fopen($FileName, "r");
-       $MapContent = fread($Handle, filesize($FileName));
-       fclose($Handle);
-       echo $MapContent;
-
-       if ( $Flush )
-        unlink($FileName);
-
-       exit();
-      }
-     else
-      {
-       header("HTTP/1.0 404 Not Found");
-       exit();
-      }
-    }
-
-   /* Save the image map to the disk */
-   function SaveImageMap()
-    {
-     if ( !$this->BuildMap ) { return(-1); }
-
-     if ( $this->ImageMap == NULL )
-      {
-       $this->Errors[] = "[Warning] SaveImageMap - Image map is empty.";
-       return(-1);
-      }
-
-     $Handle = fopen($this->tmpFolder.$this->MapID, 'w');
-     if ( !$Handle )
-      {
-       $this->Errors[] = "[Warning] SaveImageMap - Cannot save the image map.";
-       return(-1);
-      }
-     else
-      {
-       foreach($this->ImageMap as $Key => $Value)
-        fwrite($Handle, htmlentities($Value)."\r");
-      }
-     fclose ($Handle);
-    }
-
-   /* Convert seconds to a time format string */
-   function ToTime($Value)
-    {
-     $Hour   = floor($Value/3600);
-     $Minute = floor(($Value - $Hour*3600)/60);
-     $Second = floor($Value - $Hour*3600 - $Minute*60);
-
-     if (strlen($Hour) == 1 )   { $Hour = "0".$Hour; }
-     if (strlen($Minute) == 1 ) { $Minute = "0".$Minute; }
-     if (strlen($Second) == 1 ) { $Second = "0".$Second; }
-
-     return($Hour.":".$Minute.":".$Second);
-    }
-
-   /* Convert to metric system */
-   function ToMetric($Value)
-    {
-     $Go = floor($Value/1000000000);
-     $Mo = floor(($Value - $Go*1000000000)/1000000);
-     $Ko = floor(($Value - $Go*1000000000 - $Mo*1000000)/1000);
-     $o  = floor($Value - $Go*1000000000 - $Mo*1000000 - $Ko*1000);
-
-     if ($Go != 0)   { return($Go.".".$Mo."g"); }
-     if ($Mo != 0)   { return($Mo.".".$ko."m"); }
-     if ($Ko != 0)   { return($Ko.".".$o)."k"; }
-     return($o);
-    }
-
-   /* Convert to curency */
-   function ToCurrency($Value)
-    {
-     $Go = floor($Value/1000000000);
-     $Mo = floor(($Value - $Go*1000000000)/1000000);
-     $Ko = floor(($Value - $Go*1000000000 - $Mo*1000000)/1000);
-     $o  = floor($Value - $Go*1000000000 - $Mo*1000000 - $Ko*1000);
-
-     if ( strlen($o) == 1 ) { $o = "00".$o; }
-     if ( strlen($o) == 2 ) { $o = "0".$o; }
-
-     $ResultString = $o;
-     if ( $Ko != 0 ) { $ResultString = $Ko.".".$ResultString; }
-     if ( $Mo != 0 ) { $ResultString = $Mo.".".$ResultString; }
-     if ( $Go != 0 ) { $ResultString = $Go.".".$ResultString; }
-
-     $ResultString = $this->Currency.$ResultString;
-     return($ResultString);
-    }
-
-   /* Set date format for axis labels */
-   function setDateFormat($Format)
-    {
-     $this->DateFormat = $Format;
-    }
-
-   /* Convert TS to a date format string */
-   function ToDate($Value)
-    {
-     return(date($this->DateFormat,$Value));
-    }
-
-   /* Check if a number is a full integer (for scaling) */
-   function isRealInt($Value)
-    {
-     if ($Value == floor($Value))
-      return(TRUE);
-     return(FALSE);
-    }
-
-     /**
-      * Return a new pChart object fixing its height by legend rotations
-      * Must be set fonts before call this method
-      * @param array $data
-      * @param array $dataDescription
-      * @param float $angle
-      * @return pChart
-      */
-     function fixHeightByRotation ($data, $dataDescription, $angle)
-     {
-         $maxTextHeight = 0;
-         foreach ($data as $key => $values) {
-             // Get legend value
-             $value = $data[$key][$dataDescription["Position"]];
-             if ($dataDescription["Format"]["X"] == "number") {
-                 $value = $value.$dataDescription["Unit"]["X"];
-             } elseif ($dataDescription["Format"]["X"] == "time") {
-                 $value = $this->ToTime($value);
-             } elseif ($dataDescription["Format"]["X"] == "date") {
-                 $value = $this->ToDate($value);
-             } elseif ($dataDescription["Format"]["X"] == "metric") {
-                 $value = $this->ToMetric($value);
-             } elseif ($dataDescription["Format"]["X"] == "currency") {
-                 $value = $this->ToCurrency($value);
-             }
-             // Get positions array from label generated
-             $Position = imageftbbox($this->FontSize, $angle, $this->FontName, $value);
-             $TextHeight = abs($Position[1]) + abs($Position[3]);
-             // Save max height
-             if ($maxTextHeight < $TextHeight) {
-                 $maxTextHeight = $TextHeight;
-             }
-         }
-         $this->YSize += $maxTextHeight;
-         $pChart = new pChart($this->XSize, $this->YSize);
-         // set font of the axes
-         $pChart->setFontProperties($this->FontName, $this->FontSize);
-
-         return $pChart;
-     }
-  }
-
- function RaiseFatal($Message)
-  {
-   echo "[FATAL] ".$Message."\r\n";
-   exit();
-  }
-?>

+ 0 - 262
main/inc/lib/pchart/pData.class.php

@@ -1,262 +0,0 @@
-<?php
- /*
-     pData - Simplifying data population for pChart
-     Copyright (C) 2008 Jean-Damien POGOLOTTI
-     Version  1.13 last updated on 08/17/08
-
-     http://pchart.sourceforge.net
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation, either version 1,2,3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     Class initialisation :
-      pData()
-     Data populating methods :
-      ImportFromCSV($FileName,$Delimiter=",",$DataColumns=-1,$HasHeader=FALSE,$DataName=-1)
-      AddPoint($Value,$Serie="Serie1",$Description="")
-     Series manipulation methods :
-      AddSerie($SerieName="Serie1")
-      AddAllSeries()
-      RemoveSerie($SerieName="Serie1")
-      SetAbsciseLabelSerie($SerieName = "Name")
-      SetSerieName($Name,$SerieName="Serie1")
-  +   SetSerieSymbol($Name,$Symbol)
-      SetXAxisName($Name="X Axis")
-      SetYAxisName($Name="Y Axis")
-      SetXAxisFormat($Format="number")
-      SetYAxisFormat($Format="number")
-      SetXAxisUnit($Unit="")
-      SetYAxisUnit($Unit="")
-      removeSerieName($SerieName)
-      removeAllSeries()
-     Data retrieval methods :
-      GetData()
-      GetDataDescription()
- */
-
- /* pData class definition */
- class pData
-  {
-   var $Data;
-   var $DataDescription;
-
-   function pData()
-    {
-     $this->Data                           = "";
-     $this->DataDescription                = "";
-     $this->DataDescription["Position"]    = "Name";
-     $this->DataDescription["Format"]["X"] = "number";
-     $this->DataDescription["Format"]["Y"] = "number";
-     $this->DataDescription["Unit"]["X"]   = NULL;
-     $this->DataDescription["Unit"]["Y"]   = NULL;
-    }
-
-   function ImportFromCSV($FileName,$Delimiter=",",$DataColumns=-1,$HasHeader=FALSE,$DataName=-1)
-    {
-     $handle = @fopen($FileName,"r");
-     if ($handle)
-      {
-       $HeaderParsed = FALSE;
-       while (!feof($handle))
-        {
-         $buffer = fgets($handle, 4096);
-         $buffer = str_replace(chr(10),"",$buffer);
-         $buffer = str_replace(chr(13),"",$buffer);
-         $Values = split($Delimiter,$buffer);
-
-         if ( $buffer != "" )
-          {
-           if ( $HasHeader == TRUE && $HeaderParsed == FALSE )
-            {
-             if ( $DataColumns == -1 )
-              {
-               $ID = 1;
-               foreach($Values as $key => $Value)
-                { $this->SetSerieName($Value,"Serie".$ID); $ID++; }
-              }
-             else
-              {
-               $SerieName = "";
-
-               foreach($DataColumns as $key => $Value)
-                $this->SetSerieName($Values[$Value],"Serie".$Value);
-              }
-             $HeaderParsed = TRUE;
-            }
-           else
-            {
-             if ( $DataColumns == -1 )
-              {
-               $ID = 1;
-               foreach($Values as $key => $Value)
-                { $this->AddPoint(intval($Value),"Serie".$ID); $ID++; }
-              }
-             else
-              {
-               $SerieName = "";
-               if ( $DataName != -1 )
-                $SerieName = $Values[$DataName];
-
-               foreach($DataColumns as $key => $Value)
-                $this->AddPoint($Values[$Value],"Serie".$Value,$SerieName);
-              }
-            }
-          }
-        }
-       fclose($handle);
-      }
-    }
-
-   function AddPoint($Value,$Serie="Serie1",$Description="") {
-
-     if (is_array($Value) && count($Value) == 1)
-      $Value = $Value[0];
-
-     $ID = 0;          
-     for ($i=0;$i<=count($this->Data);$i++) {
-     	if(isset($this->Data[$i][$Serie])) { $ID = $i+1; } 
-     }
-     
-     if ( count($Value) == 1 ) {
-       $this->Data[$ID][$Serie] = $Value;
-       if ( $Description != "" ) $this->Data[$ID]["Name"] = $Description;
-       elseif (!isset($this->Data[$ID]["Name"])) $this->Data[$ID]["Name"] = $ID;
-     } else {
-       foreach ($Value as $key => $Val) {
-         $this->Data[$ID][$Serie] = $Val;
-         if (!isset($this->Data[$ID]["Name"]))
-          $this->Data[$ID]["Name"] = $ID;
-         $ID++;
-        }
-      }
-      
-      
-      
-      
-    }
-
-
-   function AddSerie($SerieName="Serie1")
-    {
-     if ( !isset($this->DataDescription["Values"]) )
-      {
-       $this->DataDescription["Values"][] = $SerieName;
-      }
-     else
-      {
-       $Found = FALSE;
-       foreach($this->DataDescription["Values"] as $key => $Value )
-        if ( $Value == $SerieName ) { $Found = TRUE; }
-
-       if ( !$Found )
-        $this->DataDescription["Values"][] = $SerieName;
-      }
-    }
-
-   function AddAllSeries()
-    {    	
-     unset($this->DataDescription["Values"]);
-     if ( isset($this->Data[0]) )
-      {
-       foreach($this->Data[0] as $Key => $Value)
-        {
-         if ( $Key != "Name" )
-          $this->DataDescription["Values"][] = $Key;
-        }
-      }
-      
-    }
-
-
-
-   function RemoveSerie($SerieName="Serie1")
-    {
-     if ( !isset($this->DataDescription["Values"]) )
-      return(0);
-
-     $Found = FALSE;
-     foreach($this->DataDescription["Values"] as $key => $Value )
-      {
-       if ( $Value == $SerieName )
-        unset($this->DataDescription["Values"][$key]);
-      }
-    }
-
-   function SetAbsciseLabelSerie($SerieName = "Name")
-    {
-     $this->DataDescription["Position"] = $SerieName;
-    }
-
-   function SetSerieName($Name,$SerieName="Serie1")
-    {
-     $this->DataDescription["Description"][$SerieName] = $Name;
-    }
-
-   function SetXAxisName($Name="X Axis")
-    {
-     $this->DataDescription["Axis"]["X"] = $Name;
-    }
-
-   function SetYAxisName($Name="Y Axis")
-    {
-     $this->DataDescription["Axis"]["Y"] = $Name;
-    }
-
-   function SetXAxisFormat($Format="number")
-    {
-     $this->DataDescription["Format"]["X"] = $Format;
-    }
-
-   function SetYAxisFormat($Format="number")
-    {
-     $this->DataDescription["Format"]["Y"] = $Format;
-    }
-
-   function SetXAxisUnit($Unit="")
-    {
-     $this->DataDescription["Unit"]["X"] = $Unit;
-    }
-
-   function SetYAxisUnit($Unit="")
-    {
-     $this->DataDescription["Unit"]["Y"] = $Unit;
-    }
-
-   function SetSerieSymbol($Name,$Symbol)
-    {
-     $this->DataDescription["Symbol"][$Name] = $Symbol;
-    }
-
-   function removeSerieName($SerieName)
-    {
-     if ( isset($this->DataDescription["Description"][$SerieName]) )
-      unset($this->DataDescription["Description"][$SerieName]);
-    }
-
-   function removeAllSeries()
-    {
-     foreach($this->DataDescription["Values"] as $Key => $Value)
-      unset($this->DataDescription["Values"][$Key]);
-    }
-
-   function GetData()
-    {
-     return($this->Data);
-    }
-
-   function GetDataDescription()
-    {
-     return($this->DataDescription);
-    }
-  }
-?>

+ 0 - 17
main/inc/lib/pchart/palette/blue_tones.txt

@@ -1,17 +0,0 @@
-65, 105,  	225
-72, 118 ,	255
-67, 110 ,	238
-58 , 95 ,	205
-39 , 64 ,	139
-100 , 149, 	237
-176 , 196, 	222
-202 , 225, 	255
-188 ,	210, 	238
-162 ,	181,	205
-110 ,	123, 	139
-119 ,	136 ,	153
-112 ,	128 ,	144
-198 ,	226 ,	255
-185 ,	211 ,	238
-159 ,	182 ,	205
-108, 	123 ,	139 	

+ 0 - 14
main/inc/lib/pchart/palette/default.txt

@@ -1,14 +0,0 @@
-50,124,148
-82,124,148
-97,152,183
-115,173,207
-144,196,226
-174,216,240
-105,210,231
-167,219,216
-224,228,204
-168,188,56
-188,208,76
-208,228,96
-228,245,116
-248,255,136

+ 0 - 8
main/inc/lib/pchart/palette/hard_blue.txt

@@ -1,8 +0,0 @@
-39,10,43
-20,67,93
-0,124,143
-114,176,180
-227,227,216
-
-
-

+ 0 - 6
main/inc/lib/pchart/palette/index.html

@@ -1,6 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-</body>
-</html>

+ 0 - 13
main/inc/lib/pchart/palette/pastel.txt

@@ -1,13 +0,0 @@
-188,224,46
-224,100,46
-224,214,46
-46,151,224
-250,91,73
-250,203,50
-126,183,18
-255,153,0
-254,204,128
-254,230,128
-128,200,254
-191,254,191
-189,183,107

+ 0 - 7
main/inc/lib/pchart/palette/reduced.txt

@@ -1,7 +0,0 @@
-189,250,75
-204,203,81
-220,155,87
-235,108,92
-250,60,98
-176,46,224
-46,151,224

+ 0 - 5
main/inc/lib/pchart/palette/soft_tones.txt

@@ -1,5 +0,0 @@
-168,188,56
-188,208,76
-208,228,96
-228,245,116
-248,255,136

+ 137 - 0
main/inc/lib/sessionmanager.lib.php

@@ -5399,4 +5399,141 @@ class SessionManager
 
         return false;
     }
+
+    /**
+     * Get the list of course coaches
+     * @return array The list
+     */
+    public static function getAllCourseCoaches()
+    {
+        $coaches = array();
+
+        $scuTable = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+        $userTable = Database::get_main_table(TABLE_MAIN_USER);
+
+        $idResult = Database::select('DISTINCT id_user', $scuTable, array(
+            'where' => array(
+                'status = ?' => 2
+            )
+        ));
+
+        if ($idResult != false) {
+            foreach ($idResult as $idData) {
+                $userResult = Database::select('user_id, lastname, firstname, username', $userTable, array(
+                    'where' => array(
+                        'user_id = ?' => $idData['id_user']
+                    )
+                ), 'first');
+
+                if ($userResult != false) {
+                    $coaches[] = array(
+                        'id' => $userResult['user_id'],
+                        'lastname' => $userResult['lastname'],
+                        'firstname' => $userResult['firstname'],
+                        'username' => $userResult['username'],
+                        'completeName' => api_get_person_name($userResult['firstname'], $userResult['lastname'])
+                    );
+                }
+            }
+        }
+
+        return $coaches;
+    }
+
+    /**
+     * Calculate the total user time in the platform 
+     * @param int $userId The user id
+     * @param string $from Optional. From date
+     * @param string $until Optional. Until date
+     * @return string The time (hh:mm:ss)
+     */
+    public static function getTotalUserTimeInPlatform($userId, $from = '', $until = '')
+    {
+        $userId = intval($userId);
+
+        $trackLoginTable = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);
+
+        $whereConditions = array(
+            'login_user_id = ? ' => $userId
+        );
+
+        if (!empty($from) && !empty($until)) {
+            $whereConditions["AND (login_date >= '?' "] = $from;
+            $whereConditions["AND logout_date <= DATE_ADD('?', INTERVAL 1 DAY)) "] = $until;
+        }
+
+        $trackResult = Database::select(
+            'SEC_TO_TIME(SUM(UNIX_TIMESTAMP(logout_date) - UNIX_TIMESTAMP(login_date))) as total_time',
+            $trackLoginTable,
+            array(
+                'where' => $whereConditions
+            ), 'first'
+        );
+
+        if ($trackResult != false) {
+            return $trackResult['total_time'] ? $trackResult['total_time'] : '00:00:00';
+        }
+
+        return '00:00:00';
+    }
+
+    /**
+     * Calc the expended time (hh::mm:ss) by a user in a course
+     * @param int $userId The user id
+     * @param string $courseCode The course id
+     * @param int $sessionId Optional. The session id
+     * @param string $from Optional. From date
+     * @param string $until Optional. Until date
+     * @return string The time
+     */
+    public static function getUserTimeInCourse($userId, $courseCode, $sessionId = 0, $from = '', $until = '')
+    {
+        $userId = intval($userId);
+        $sessionId = intval($sessionId);
+
+        $trackCourseAccessTable = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+
+        $whereConditions = array(
+            'user_id = ? ' => $userId,
+            "AND course_code = '?' " => $courseCode,
+            'AND session_id = ? ' => $sessionId
+        );
+
+        if (!empty($from) && !empty($until)) {
+            $whereConditions["AND (login_course_date >= '?' "] = $from;
+            $whereConditions["AND logout_course_date <= DATE_ADD('?', INTERVAL 1 DAY)) "] = $until;
+        }
+
+        $trackResult = Database::select(
+            'SEC_TO_TIME(SUM(UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date))) as total_time',
+            $trackCourseAccessTable,
+            array(
+                'where' => $whereConditions
+            ), 'first'
+        );
+
+        if ($trackResult != false) {
+            return $trackResult['total_time'] ? $trackResult['total_time'] : '00:00:00';
+        }
+
+        return '00:00:00';
+    }
+
+    /**
+     * Get the courses list by a course coach
+     * @param int $coachId The coach id
+     * @return array
+     */
+    public static function getCoursesListByCourseCoach($coachId)
+    {
+        $srcruTable = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+
+        return  Database::select('*', $srcruTable, array(
+            'where' => array(
+                'id_user = ? AND ' => $coachId,
+                'status = ?' => 2
+            )
+        ));
+    }
+
 }

+ 4 - 2
main/inc/lib/sortable_table.class.php

@@ -244,7 +244,7 @@ class SortableTable extends HTML_Table
     public function return_table()
     {
         $empty_table = false;
-        $this->processHeaders();
+
         $content = $this->get_table_html();
 
         if ($this->get_total_number_of_items() == 0) {
@@ -574,6 +574,8 @@ class SortableTable extends HTML_Table
 
         $table_data = $this->get_table_data($from);
 
+        $this->processHeaders();
+
         if (is_array($table_data)) {
             $count = 1;
             foreach ($table_data as & $row) {
@@ -697,6 +699,7 @@ class SortableTable extends HTML_Table
     public function processHeaders()
     {
         $counter = 0;
+
         foreach ($this->headers as $column => $columnInfo) {
             $label = $columnInfo['label'];
             $sortable = $columnInfo['sortable'];
@@ -743,7 +746,6 @@ class SortableTable extends HTML_Table
 
             $counter++;
         }
-
     }
 
     /**

+ 348 - 180
main/inc/lib/tracking.lib.php

@@ -4,6 +4,10 @@
 require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
 
+use CpChart\Classes\pData as pData;
+use CpChart\Classes\pImage as pImage;
+use CpChart\Classes\pCache as pCache;
+
 /**
  *  Class Tracking
  *
@@ -4572,86 +4576,163 @@ class Tracking
 
     /**
      * Generates an histogram
-     *
-     * @param 	array	list of exercise names
-     * @param 	array	my results 0 to 100
-     * @param 	array	average scores 0-100
+     * @param    array    list of exercise names
+     * @param    array    my results 0 to 100
+     * @param    array    average scores 0-100
+     * @return string
      */
     static function generate_session_exercise_graph($names, $my_results, $average)
     {
-        require_once api_get_path(LIBRARY_PATH).'pchart/pData.class.php';
-        require_once api_get_path(LIBRARY_PATH).'pchart/pChart.class.php';
-        require_once api_get_path(LIBRARY_PATH).'pchart/pCache.class.php';
+        /* Create and populate the pData object */
+        $myData = new pData();
+        $myData->addPoints($names, 'Labels');
+        $myData->addPoints($my_results, 'Serie1');
+        $myData->addPoints($average, 'Serie2');
+        $myData->setSerieWeight('Serie1', 1);
+        $myData->setSerieTicks('Serie2', 4);
+        $myData->setSerieDescription('Labels', 'Months');
+        $myData->setAbscissa('Labels');
+        $myData->setSerieDescription('Serie1', get_lang('MyResults'));
+        $myData->setSerieDescription('Serie2', get_lang('AverageScore'));
+        $myData->setAxisUnit(0, '%');
+        $myData->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
+        // Cache definition
+        $cachePath = api_get_path(SYS_ARCHIVE_PATH);
+        $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
+        $chartHash = $myCache->getHash($myData);
+
+        if ($myCache->isInCache($chartHash)) {
+            //if we already created the img
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $myCache->saveFromCache($chartHash, $imgPath);
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+        } else {
+            /* Define width, height and angle */
+            $mainWidth = 860;
+            $mainHeight = 500;
+            $angle = 50;
+
+            /* Create the pChart object */
+            $myPicture = new pImage($mainWidth, $mainHeight, $myData);
+
+            /* Turn of Antialiasing */
+            $myPicture->Antialias = false;
+
+            /* Draw the background */
+            $settings = array('R' => 255, 'G' => 255, 'B' => 255);
+            $myPicture->drawFilledRectangle(0, 0, $mainWidth, $mainHeight, $settings);
+
+            /* Add a border to the picture */
+            $myPicture->drawRectangle(
+                0,
+                0,
+                $mainWidth - 1,
+                $mainHeight - 1,
+                array('R' => 0, 'G' => 0, 'B' => 0)
+            );
 
-        $cache = new pCache();
+            /* Set the default font */
+            $myPicture->setFontProperties(
+                array(
+                    'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    'FontSize' => 10)
+            );
+            /* Write the chart title */
+            $myPicture->drawText(
+                $mainWidth / 2,
+                30,
+                get_lang('ExercisesInTimeProgressChart'),
+                array(
+                    'FontSize' => 12,
+                    'Align' => TEXT_ALIGN_BOTTOMMIDDLE
+                )
+            );
 
-        // Dataset definition
-        $data_set = new pData();
+            /* Set the default font */
+            $myPicture->setFontProperties(
+                array(
+                    'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    'FontSize' => 6
+                )
+            );
 
-        // Dataset definition
-        $data_set->AddPoint($average,	 "Serie1");
-        $data_set->AddPoint($my_results, "Serie2");
-        $data_set->AddPoint($names,		 "Serie3");
-        $data_set->AddAllSeries();
-        $data_set->SetAbsciseLabelSerie('Serie3');
-        $data_set->SetSerieName(get_lang('AverageScore'),"Serie1");
-        $data_set->SetSerieName(get_lang('MyResults'),	 "Serie2");
-
-        //$data_set->SetYAxisName(get_lang("Percentage"));
-
-        $data_set->SetYAxisUnit("%");
-
-        // Initialise the graph
-        $main_width    = 860;
-        $main_height   = 500;
-        $y_label_angle = 50;
-        $data_set->RemoveSerie("Serie3");
-        $graph = new pChart($main_width, $main_height);
-        //See 3.2 BT#2797
-        $graph->setFixedScale(0,100);
-
-        $graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8);
-        $graph->setGraphArea(65,50,$main_width-20, $main_height-140);
-
-        $graph->drawFilledRoundedRectangle(7,7,$main_width-7,$main_height-7,5,240,240,240);
-        $graph->drawRoundedRectangle(5,5,$main_width-5,$main_height -5,5,230,230,230);
-        $graph->drawGraphArea(255,255,255,TRUE);
-
-        //SCALE_NORMAL, SCALE_START0, SCALE_ADDALLSTART0, SCALE_ADDALL
-        $graph->drawScale($data_set->GetData(),$data_set->GetDataDescription(),SCALE_NORMAL ,150,150,150,TRUE,$y_label_angle,1, TRUE);
-        $graph->drawGrid(4,TRUE,230,230,230,70);
-
-        // Draw the 0 line
-        $graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',6);
-        $graph->drawTreshold(0,143,55,72,TRUE,TRUE);
-
-        // Draw the cubic curve graph
-        $graph->drawLineGraph($data_set->GetData(),$data_set->GetDataDescription());
-        $graph->drawPlotGraph($data_set->GetData(),$data_set->GetDataDescription(),1,1,230,255,255);
-
-        // Finish the graph
-        $graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',10);
-        $graph->drawLegend($main_width - 150,70,$data_set->GetDataDescription(),255,255,255);
-
-        $graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',11);
-        $graph->drawTitle(50, 30, get_lang('ExercisesInTimeProgressChart'), 50,50,50,$main_width-110, true);
-
-        // $main_graph = new pChart($main_width,$main_height);
-        $courseCode = isset($_GET['course']) ? Security::remove_XSS($_GET['course']) : null;
-        $graph_id = 'generate_session_exercise_graph'.$courseCode.'-'.intval($_GET['session_id']).'-'.api_get_user_id();
-        if ($cache->IsInCache($graph_id, $data_set->GetData())) {
-        //if (0) {
-            //if we already created the img
-            //echo 'in cache';
-            $img_file = $cache->GetHash($graph_id,$data_set->GetData());
-        } else {
-            $cache->WriteToCache($graph_id, $data_set->GetData(), $graph);
-            ob_start();
-            $graph->Stroke();
-            ob_end_clean();
-            $img_file = $cache->GetHash($graph_id, $data_set->GetData());
+            /* Define the chart area */
+            $myPicture->setGraphArea(60, 60, $mainWidth - 60, $mainHeight - 150);
+
+            /* Draw the scale */
+            $scaleSettings = array(
+                'XMargin' => 10,
+                'YMargin' => 10,
+                'Floating' => true,
+                'GridR' => 200,
+                'GridG' => 200,
+                'GridB' => 200,
+                'DrawSubTicks' => true,
+                'CycleBackground' => true,
+                'LabelRotation' => $angle,
+                'Mode' => SCALE_MODE_ADDALL_START0,
+            );
+            $myPicture->drawScale($scaleSettings);
+
+            /* Turn on Antialiasing */
+            $myPicture->Antialias = true;
+
+            /* Enable shadow computing */
+            $myPicture->setShadow(
+                true,
+                array(
+                    'X' => 1,
+                    'Y' => 1,
+                    'R' => 0,
+                    'G' => 0,
+                    'B' => 0,
+                    'Alpha' => 10
+                )
+            );
+
+            /* Draw the line chart */
+            $myPicture->setFontProperties(
+                array(
+                    'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    'FontSize' => 10
+                )
+            );
+            $myPicture->drawSplineChart();
+            $myPicture->drawPlotChart(
+                array(
+                    'DisplayValues' => true,
+                    'PlotBorder' => true,
+                    'BorderSize' => 1,
+                    'Surrounding' => -60,
+                    'BorderAlpha' => 80
+                )
+            );
+
+            /* Write the chart legend */
+            $myPicture->drawLegend(
+                $mainWidth / 2 + 50,
+                50,
+                array(
+                    'Style' => LEGEND_BOX,
+                    'Mode' => LEGEND_HORIZONTAL,
+                    'FontR' => 0,
+                    'FontG' => 0,
+                    'FontB' => 0,
+                    'R' => 220,
+                    'G' => 220,
+                    'B' => 220,
+                    'Alpha' => 100
+                )
+            );
+
+            $myCache->writeToCache($chartHash, $myPicture);
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $myCache->saveFromCache($chartHash, $imgPath);
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
         }
-        $html = '<img src="'.api_get_path(WEB_ARCHIVE_PATH).$img_file.'">';
+
+        $html = '<img src="' . $imgPath . '">';
+
         return $html;
     }
 
@@ -4662,10 +4743,6 @@ class Tracking
      */
     static function generate_exercise_result_thumbnail_graph($attempts)
     {
-        require_once api_get_path(LIBRARY_PATH).'pchart/pData.class.php';
-        require_once api_get_path(LIBRARY_PATH).'pchart/pChart.class.php';
-        require_once api_get_path(LIBRARY_PATH).'pchart/pCache.class.php';
-
         $exercise_title = $attempts['title'];
         $attempts       = $attempts['data'];
         $my_exercise_result_array = $exercise_result = array();
@@ -4734,49 +4811,106 @@ class Tracking
             }
         }
 
-        $cache = new pCache();
-
         // Dataset definition
-        $data_set = new pData();
-        $data_set->AddPoint($final_array,"Serie1");
-        $data_set->AddPoint($my_final_array,"Serie2");
-        //$data_set->AddPoint($x_axis,"Serie3");
-        $data_set->AddAllSeries();
-
-        // Initialise the graph
-
-        $main_width  = 80;
-        $main_height = 35;
-
-        $thumbnail_graph = new pChart($main_width, $main_height);
-
-        $thumbnail_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8);
-        //$thumbnail_graph->setGraphArea(50,30,680,200);
-        $thumbnail_graph->drawFilledRoundedRectangle(2,2,$main_width-2,$main_height-2,2,230,230,230);
-        $thumbnail_graph->setGraphArea(5,5,$main_width-5,$main_height-5);
-        $thumbnail_graph->drawGraphArea(255,255,255);
-
-        //SCALE_NORMAL, SCALE_START0, SCALE_ADDALLSTART0
-        $thumbnail_graph->drawScale($data_set->GetData(),$data_set->GetDataDescription(),SCALE_ADDALLSTART0, 150,150,150,FALSE,0,1,TRUE);
-
-        $thumbnail_graph->drawOverlayBarGraph($data_set->GetData(),$data_set->GetDataDescription(), 100);
+        $dataSet = new pData();
+        $dataSet->addPoints($final_array, 'Serie1');
+        $dataSet->addPoints($my_final_array, 'Serie2');
+        $dataSet->normalize(100, "%");
+        $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
+
+        // Cache definition
+        $cachePath = api_get_path(SYS_ARCHIVE_PATH);
+        $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
+        $chartHash = $myCache->getHash($dataSet);
+        if ($myCache->isInCache($chartHash)) {
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $myCache->saveFromCache($chartHash, $imgPath);
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+        } else {
+            /* Create the pChart object */
+            $widthSize = 80;
+            $heightSize = 35;
+            $fontSize = 2;
+
+            $myPicture = new pImage($widthSize, $heightSize, $dataSet);
+
+            /* Turn of Antialiasing */
+            $myPicture->Antialias = false;
+
+            /* Add a border to the picture */
+            $myPicture->drawRectangle(0, 0, $widthSize - 1, $heightSize - 1, array('R' => 0, 'G' => 0, 'B' => 0));
+
+            /* Set the default font */
+            $myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', 'FontSize' => $fontSize));
+
+            /* Do not write the chart title */
+
+            /* Define the chart area */
+            $myPicture->setGraphArea(5, 5, $widthSize - 5, $heightSize - 5);
+
+            /* Draw the scale */
+            $scaleSettings = array(
+                'GridR' => 200,
+                'GridG' => 200,
+                'GridB' => 200,
+                'DrawSubTicks' => true,
+                'CycleBackground' => true,
+                'Mode' => SCALE_MODE_MANUAL,
+                'ManualScale' => array(
+                    '0' => array(
+                        'Min' => 0,
+                        'Max' => 100
+                    )
+                )
+            );
+            $myPicture->drawScale($scaleSettings);
+
+            /* Turn on shadow computing */
+            $myPicture->setShadow(
+                true,
+                array(
+                    'X' => 1,
+                    'Y' => 1,
+                    'R' => 0,
+                    'G' => 0,
+                    'B' => 0,
+                    'Alpha' => 10
+                )
+            );
 
-        // Finish the graph
-        $graph_id = 'thumbnail_exercise_result_graph_'.Security::remove_XSS($_GET['course']).'-'.intval($_GET['session_id']).'-'.api_get_user_id();
+            /* Draw the chart */
+            $myPicture->setShadow(
+                true,
+                array(
+                    'X' => 1,
+                    'Y' => 1,
+                    'R' => 0,
+                    'G' => 0,
+                    'B' => 0,
+                    'Alpha' => 10
+                )
+            );
+            $settings = array(
+                'DisplayValues' => true,
+                'DisplaySize' => $fontSize,
+                'DisplayR' => 0,
+                'DisplayG' => 0,
+                'DisplayB' => 0,
+                'DisplayOrientation' => ORIENTATION_HORIZONTAL,
+                'Gradient' => false,
+                'Surrounding' => 5,
+                'InnerSurrounding' => 5
+            );
+            $myPicture->drawStackedBarChart($settings);
 
-        if ($cache->IsInCache($graph_id, $data_set->GetData())) {
-            //if (0) {
-            //if we already created the img
-            //echo 'in cache';
-            $img_file = $cache->GetHash($graph_id,$data_set->GetData());
-        } else {
-            $cache->WriteToCache($graph_id, $data_set->GetData(), $thumbnail_graph);
-            ob_start();
-            $thumbnail_graph->Stroke();
-            ob_end_clean();
-            $img_file = $cache->GetHash($graph_id, $data_set->GetData());
+            /* Save and write in cache */
+            $myCache->writeToCache($chartHash, $myPicture);
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $myCache->saveFromCache($chartHash, $imgPath);
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
         }
-        $html = '<img src="'.api_get_path(WEB_ARCHIVE_PATH).$img_file.'">';
+        $html = '<img src="' . $imgPath . '" >';
+
         return $html;
     }
 
@@ -4786,10 +4920,6 @@ class Tracking
      */
     static function generate_exercise_result_graph($attempts)
     {
-        require_once api_get_path(LIBRARY_PATH).'pchart/pData.class.php';
-        require_once api_get_path(LIBRARY_PATH).'pchart/pChart.class.php';
-        require_once api_get_path(LIBRARY_PATH).'pchart/pCache.class.php';
-
         $exercise_title = strip_tags($attempts['title']);
         $attempts       = $attempts['data'];
         $my_exercise_result_array = $exercise_result = array();
@@ -4858,71 +4988,109 @@ class Tracking
             }
         }
 
-        $cache = new pCache();
-
         // Dataset definition
-        $data_set = new pData();
-        $data_set->AddPoint($final_array,"Serie1");
-        $data_set->AddPoint($my_final_array,"Serie2");
-        $data_set->AddPoint($x_axis,"Serie3");
-        $data_set->AddAllSeries();
-
-        $data_set->SetAbsciseLabelSerie('Serie3');
-        $data_set->SetSerieName(get_lang('Score'),"Serie1");
-        $data_set->SetSerieName(get_lang('MyResults'),"Serie2");
-
-        $data_set->SetXAxisName(get_lang("Score"));
-
-        // Initialise the graph
-        $main_width  = 500;
-        $main_height = 250;
-
-        $main_graph = new pChart($main_width,$main_height);
-
-        $main_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8);
-        $main_graph->setGraphArea(50,30, $main_width -20,$main_height -50);
-
-        $main_graph->drawFilledRoundedRectangle(10,10, $main_width- 10,$main_height -10,5,240,240,240);
-        $main_graph->drawRoundedRectangle(7,7,$main_width - 7,$main_height  - 7,5,230,230,230);
-
-        $main_graph->drawGraphArea(255,255,255,TRUE);
-
-        //SCALE_NORMAL, SCALE_START0, SCALE_ADDALLSTART0
-        $main_graph->drawScale($data_set->GetData(),$data_set->GetDataDescription(),SCALE_ADDALLSTART0, 150,150,150,TRUE,0,1,TRUE);
-
-        $main_graph->drawGrid(4,TRUE,230,230,230,50);
-
-        // Draw the 0 line
-        $main_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',6);
-        //  $main_graph->drawTreshold(0,143,55,72,TRUE,TRUE);
-
-        // Draw the bar graph
-        $data_set->RemoveSerie("Serie3");
+        $dataSet = new pData();
+        $dataSet->addPoints($final_array, 'Serie1');
+        $dataSet->addPoints($my_final_array, 'Serie2');
+        $dataSet->addPoints($x_axis, 'Serie3');
+
+        $dataSet->setSerieDescription('Serie1', get_lang('Score'));
+        $dataSet->setSerieDescription('Serie2', get_lang('MyResults'));
+        $dataSet->setAbscissa('Serie3');
+
+        $dataSet->setXAxisName(get_lang('Score'));
+        $dataSet->normalize(100, "%");
+
+        $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
+
+        // Cache definition
+        $cachePath = api_get_path(SYS_ARCHIVE_PATH);
+        $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
+        $chartHash = $myCache->getHash($dataSet);
+        if ($myCache->isInCache($chartHash)) {
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $myCache->saveFromCache($chartHash, $imgPath);
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+        } else {
+            /* Create the pChart object */
+            $widthSize = 480;
+            $heightSize = 250;
+            $fontSize = 8;
+
+            $myPicture = new pImage($widthSize, $heightSize, $dataSet);
+
+            /* Turn of Antialiasing */
+            $myPicture->Antialias = false;
+
+            /* Add a border to the picture */
+            $myPicture->drawRectangle(0, 0, $widthSize - 1, $heightSize - 1, array('R' => 0, 'G' => 0, 'B' => 0));
+
+            /* Set the default font */
+            $myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', 'FontSize' => 10));
+
+            /* Write the chart title */
+            $myPicture->drawText(
+                250,
+                20,
+                $exercise_title,
+                array(
+                    'FontSize' => 12,
+                    'Align' => TEXT_ALIGN_BOTTOMMIDDLE
+                )
+            );
 
-        //$main_graph->drawBarGraph($data_set->GetData(),$data_set->GetDataDescription(),TRUE);
+            /* Define the chart area */
+            $myPicture->setGraphArea(50, 50, $widthSize - 20, $heightSize - 30);
+
+            /* Draw the scale */
+            $scaleSettings = array(
+                'GridR' => 200,
+                'GridG' => 200,
+                'GridB' => 200,
+                'DrawSubTicks' => true,
+                'CycleBackground' => true,
+                'Mode' => SCALE_MODE_MANUAL,
+                'ManualScale' => array(
+                    '0' => array(
+                        'Min' => 0,
+                        'Max' => 100
+                    )
+                )
+            );
+            $myPicture->drawScale($scaleSettings);
+
+            /* Turn on shadow computing */
+            $myPicture->setShadow(true, array('X' => 1, 'Y' => 1, 'R' => 0, 'G' => 0, 'B' => 0, 'Alpha' => 10));
+
+            /* Draw the chart */
+            $myPicture->setShadow(true, array('X' => 1, 'Y' => 1, 'R' => 0, 'G' => 0, 'B' => 0, 'Alpha' => 10));
+            $settings = array(
+                'DisplayValues' => true,
+                'DisplaySize' => $fontSize,
+                'DisplayR' => 0,
+                'DisplayG' => 0,
+                'DisplayB' => 0,
+                'DisplayOrientation' => ORIENTATION_HORIZONTAL,
+                'Gradient' => false,
+                'Surrounding' => 30,
+                'InnerSurrounding' => 25
+            );
+            $myPicture->drawStackedBarChart($settings);
 
-        //$main_graph->drawStackedBarGraph($data_set->GetData(),$data_set->GetDataDescription(),TRUE);
-        $main_graph->drawOverlayBarGraph($data_set->GetData(),$data_set->GetDataDescription(), 100);
+            $legendSettings = array(
+                'Mode' => LEGEND_HORIZONTAL,
+                'Style' => LEGEND_NOBORDER,
+            );
+            $myPicture->drawLegend($widthSize / 2, 30, $legendSettings);
 
-        // Finish the graph
-        $main_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8);
-        $main_graph->drawLegend($main_width - 120,$main_height -100,$data_set->GetDataDescription(),255,255,255);
-        $main_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8);
-        $main_graph->drawTitle(180,22,$exercise_title,50,50,50);
-        $graph_id = 'exercise_result_graph'.Security::remove_XSS($_GET['course']).'-'.intval($_GET['session_id']).'-'.api_get_user_id();
-        if ($cache->IsInCache($graph_id, $data_set->GetData())) {
-            //if (0) {
-            //if we already created the img
-            //echo 'in cache';
-            $img_file = $cache->GetHash($graph_id,$data_set->GetData());
-        } else {
-            $cache->WriteToCache($graph_id, $data_set->GetData(), $main_graph);
-            ob_start();
-            $main_graph->Stroke();
-            ob_end_clean();
-            $img_file = $cache->GetHash($graph_id, $data_set->GetData());
+            /* Write and save into cache */
+            $myCache->writeToCache($chartHash, $myPicture);
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $myCache->saveFromCache($chartHash, $imgPath);
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
         }
-        $html = '<img src="'.api_get_path(WEB_ARCHIVE_PATH).$img_file.'">';
+        $html = '<img src="' . $imgPath . '" >';
+
         return $html;
     }
 

+ 54 - 0
main/inc/lib/usermanager.lib.php

@@ -3977,6 +3977,39 @@ class UserManager
         }
     }
 
+    /**
+     * @param int $userId
+     * @return array
+     */
+    public static function getDrhListFromUser($userId)
+    {
+        $tblUser = Database::get_main_table(TABLE_MAIN_USER);
+        $tblUserRelUser = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
+        $tblUserRelAccessUrl = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $userId = intval($userId);
+
+        $orderBy = null;
+        if (api_is_western_name_order()) {
+            $orderBy .= " ORDER BY firstname, lastname ";
+        } else {
+            $orderBy .= " ORDER BY lastname, firstname ";
+        }
+
+        $sql = "SELECT u.user_id, username, u.firstname, u.lastname
+                FROM $tblUser u
+                INNER JOIN $tblUserRelUser uru ON (uru.friend_user_id = u.user_id)
+                INNER JOIN $tblUserRelAccessUrl a ON (a.user_id = u.user_id)
+                WHERE
+                    access_url_id = ".api_get_current_access_url_id()." AND
+                    uru.user_id = '$userId' AND
+                    relation_type = '".USER_RELATION_TYPE_RRHH."'
+                $orderBy
+                ";
+        $result = Database::query($sql);
+
+        return Database::store_result($result);
+    }
+
     /**
      * get users followed by human resource manager
      * @param int $userId
@@ -4972,6 +5005,27 @@ EOF;
         );
     }
 
+    /**
+     * Get the teacher (users with COURSEMANGER status) list
+     * @return array The list
+     */
+    public static function getTeachersList()
+    {
+        $userTable = Database::get_main_table(TABLE_MAIN_USER);
+
+        $resultData = Database::select('user_id, lastname, firstname, username', $userTable, array(
+            'where' => array(
+                'status = ?' => COURSEMANAGER
+            )
+        ));
+
+        foreach ($resultData as &$teacherData) {
+            $teacherData['completeName'] = api_get_person_name($teacherData['firstname'], $teacherData['lastname']);
+        }
+
+        return $resultData;
+    }
+
     /**
      * @return array
      */

+ 2 - 2
main/inc/lib/userportal.lib.php

@@ -719,8 +719,8 @@ class IndexManager
                     'sessionVar'   => basename(__FILE__, '.php'),
                     'imageOptions' => array(
                         'font_size' => 20,
-                        'font_path' => api_get_path(LIBRARY_PATH).'pchart/fonts/',
-                        'font_file' => 'tahoma.ttf',
+                        'font_path' => api_get_path(SYS_FONTS_PATH) . 'opensans/',
+                        'font_file' => 'OpenSans-Regular.ttf',
                         //'output' => 'gif'
                     )
                 );

+ 96 - 106
main/lang/arabic/trad4all.inc.php

@@ -14,51 +14,49 @@ $Title = "العنوان";
 $By = "بواسطة";
 $UsersOnline = "الأعضاء المتصلون";
 $Remove = "إزالة";
-$langEnter = " الرجوع إلى قائمة مقرراتي";
+$Enter = " الرجوع إلى قائمة مقرراتي";
 $Description = "وصف";
 $Links = " روابط";
-$langWorks = " نشرات الطلاب";
+$Works = " نشرات الطلاب";
 $Forums = "منتديات";
-$langExercices = "اختبارات";
-$langCreateDir = "إنشاء مجلد";
+$Exercices = "اختبارات";
+$CreateDir = "إنشاء مجلد";
 $Name = "الإسم";
-$langComment = "تعليق";
-$langVisible = "ظاهر / مخفي";
-$langNewDir = "اسم المجلد الجديد (بالإنجليزي)";
-$langDirCr = "تم إنشاء مجلد";
+$Comment = "تعليق";
+$Visible = "ظاهر / مخفي";
+$NewDir = "اسم المجلد الجديد (بالإنجليزي)";
+$DirCr = "تم إنشاء مجلد";
 $Download = "تنزيل";
-$langGroup = "مجموعات";
-$langEdit = "تحرير";
-$langGroupForum = "منتدى المجموعة";
+$Group = "مجموعات";
+$Edit = "تحرير";
+$GroupForum = "منتدى المجموعة";
 $Language = "اللغة";
 $LoginName = " التسجيل";
 $AutostartMp3 = "اضغط على موافق إذا كنت ترغب في تشغيل الملف الصوتي تلقائياً";
 $Assignments = "نشرات الطلاب";
 $Forum = " المنتدي";
-$langDelImage = "إزالة صورة";
-$langCode = "رمز المقرر";
-$langUp = "أعلى";
-$Down = "أسفل";
+$DelImage = "إزالة صورة";
+$Code = "رمز المقرر";
 $Up = "أعلى";
+$Down = "أسفل";
 $Theme = "موضوع/شكل";
 $TheListIsEmpty = "القائمة فارغة";
-$langUniqueSelect = "( اختيارات متعددة (جواب واحد فقط";
+$UniqueSelect = "( اختيارات متعددة (جواب واحد فقط";
 $CreateCategory = "كون فئة";
-$langCourseCreate = " إنشاء مقرر";
-$langTodo = "مهام";
+$CourseCreate = " إنشاء مقرر";
+$Todo = "مهام";
 $UserName = "اسم المستخدم";
-$lang_show_hide = "إظهار / إخفاء";
-$langCategoryMod = "تعديل التصنيف";
+$CategoryMod = "تعديل التصنيف";
 $Hide = "إخفاء";
-$langDear = "عزيزي";
-$langArchive = "الأرشيف";
-$langCourseCode = "رمز المقرر";
-$langNoDescription = "لا يوجد وصف";
-$langOfficialCode = "الرمز الرسمي";
+$Dear = "عزيزي";
+$Archive = "الأرشيف";
+$CourseCode = "رمز المقرر";
+$NoDescription = "لا يوجد وصف";
+$OfficialCode = "الرمز الرسمي";
 $FirstName = "الإسم الأول";
 $LastName = "اللقب";
 $Status = "الحالة";
-$langEmail = "البريد الإلكتروني";
+$Email = "البريد الإلكتروني";
 $SlideshowConversion = "محول شرائح العرض";
 $UploadFile = "تحميل الملف";
 $AvailableFrom = "متوفر من";
@@ -68,7 +66,6 @@ $Type = "النوع";
 $EmailAddress = "عنوان البريد الإلكتروني";
 $Organisation = "المؤسسة";
 $Reporting = "التقرير";
-$Code = "الرمز";
 $Update = "تحديث";
 $CurrentCourse = "المقرر الحالي";
 $Back = "Back";
@@ -97,58 +94,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "نعم";
-$langNo = "لا";
+$Yes = "نعم";
+$No = "لا";
 $Next = "التالي";
-$langAllowed = "متاح";
-$langBackHome = "عودة إلى الصفحة الرئيسية لـ";
-$langPropositions = "اقتراحات من أجل تطوير الـ";
-$langMaj = "تحديث";
-$langModify = "تعديل";
-$langDelete = "حذف";
-$langInvisible = "إخفاء";
-$langSave = "حفظ";
-$langMove = "نقل";
+$Allowed = "متاح";
+$BackHome = "عودة إلى الصفحة الرئيسية لـ";
+$Propositions = "اقتراحات من أجل تطوير الـ";
+$Maj = "تحديث";
+$Modify = "تعديل";
+$Invisible = "إخفاء";
+$Save = "حفظ";
+$Move = "نقل";
 $Help = "مساعدة";
-$langOk = "موافق";
-$langAdd = "  أضف";
-$langAddIntro = "أضف نص توضيحي";
-$langBackList = "الرجوع للقائمة";
-$langText = "نص";
-$langEmpty = " لقد قمت بترك بعض الحقوق فارغة. <br /> استخدم <b> زر الرجوع </b> في المتصفح وحاول مرة أخرى. <br /> اذا قمت بتجاهل رمز المقرر , انظر الى برنامج المقرر";
-$langConfirmYourChoice = "فضلا أكد اختيارك";
-$langAnd = "و";
-$langChoice = "اختيارك";
-$langFinish = "إنتهاء";
-$langCancel = "إلغاء";
-$langNotAllowed = "غير مسموح";
-$langNotLogged = "لم تسجل دخولك لمقرر";
-$langManager = "المدير";
-$langOptional = "اختياري";
+$Ok = "موافق";
+$Add = "  أضف";
+$AddIntro = "أضف نص توضيحي";
+$BackList = "الرجوع للقائمة";
+$Text = "نص";
+$Empty = " لقد قمت بترك بعض الحقوق فارغة. <br /> استخدم <b> زر الرجوع </b> في المتصفح وحاول مرة أخرى. <br /> اذا قمت بتجاهل رمز المقرر , انظر الى برنامج المقرر";
+$ConfirmYourChoice = "فضلا أكد اختيارك";
+$And = "و";
+$Choice = "اختيارك";
+$Finish = "إنتهاء";
+$Cancel = "إلغاء";
+$NotAllowed = "غير مسموح";
+$NotLogged = "لم تسجل دخولك لمقرر";
+$Manager = "المدير";
+$Optional = "اختياري";
 $NextPage = "الصفحة التالية";
 $PreviousPage = "الصفحة السابقة";
-$langUse = "استخدم";
-$langTotal = "الإجمالي";
-$langTake = "خذ";
-$langOne = "واحد";
-$langSeveral = "بعض";
-$langNotice = "بلاغ";
-$langDate = "التاريخ";
-$langAmong = "من بين";
-$langShow = "أظهر";
-$langMyCourses = "مقرراتي";
-$langModifyProfile = "الملف الشخصي";
-$langMyStats = "معاينة إحصائياتي";
-$langLogout = "تسجيل خروج";
-$langMyAgenda = "أجندتي";
-$langCourseHomepage = "صفحة المقرر";
-$langCourseManagerview = "معاينة واجهة المدرب";
-$langStudentView = " معاينة واجهة الطلاب";
+$Use = "استخدم";
+$Total = "الإجمالي";
+$Take = "خذ";
+$One = "واحد";
+$Several = "بعض";
+$Notice = "بلاغ";
+$Date = "التاريخ";
+$Among = "من بين";
+$Show = "أظهر";
+$MyCourses = "مقرراتي";
+$ModifyProfile = "الملف الشخصي";
+$MyStats = "معاينة إحصائياتي";
+$Logout = "تسجيل خروج";
+$MyAgenda = "أجندتي";
+$CourseHomepage = "صفحة المقرر";
+$CourseManagerview = "معاينة واجهة المدرب";
+$StudentView = " معاينة واجهة الطلاب";
 $AddResource = "أضفه";
 $AddedResources = "مرفقات";
-$lang_modify_resource = "تعديل / إضافة مصادر";
-$lang_resource = "المصدر";
-$lang_resources = "المصادر";
 $langNameOfLang['arabic'] = "العربية";
 $langNameOfLang['brazilian'] = "البرازيلية";
 $langNameOfLang['bulgarian'] = "البلغارية";
@@ -172,27 +165,27 @@ $langNameOfLang['russian'] = "الروسية";
 $langNameOfLang['simpl_chinese'] = "الصينية البسيطة";
 $langNameOfLang['spanish'] = "الاسبانية";
 $Close = "اغلق";
-$langPlatform = "النظام";
+$Platform = "النظام";
 $localLangName = "اللغة";
 $email = "البريد الإلكتروني";
-$langCourseCodeAlreadyExists = "عفوا ! رمز المقرر مستخدم مسبقا, فضلا اختر واحدا أخر.";
+$CourseCodeAlreadyExists = "عفوا ! رمز المقرر مستخدم مسبقا, فضلا اختر واحدا أخر.";
 $Statistics = "احصائيات";
-$langGrouplist = "قائمة المجموعات";
-$langPrevious = "السابق";
+$Grouplist = "قائمة المجموعات";
+$Previous = "السابق";
 $DestDirectoryDoesntExist = "المجلد المقصود غير موجود";
 $Courses = "مقررات";
 $In = "في";
-$langShowAll = "أظهر الجميع";
-$langPage = "الصفحة";
+$ShowAll = "أظهر الجميع";
+$Page = "الصفحة";
 $englishLangName = "English";
 $Home = "البداية";
-$langAreYouSureToDelete = "هل تريد الحذف حقا؟";
+$AreYouSureToDelete = "هل تريد الحذف حقا؟";
 $SelectAll = "تحديد الكل";
 $UnSelectAll = "إلغاء تحديد الكل";
 $WithSelected = "With selected";
-$langOnLine = "متصل";
-$langUsers = "المستخدمين";
-$langPlatformAdmin = "لوحة تحكم الإدارة";
+$OnLine = "متصل";
+$Users = "المستخدمين";
+$PlatformAdmin = "لوحة تحكم الإدارة";
 $langNameOfLang['hungarian'] = "الهنغارية";
 $langNameOfLang['indonesian'] = "الاندونيسية";
 $langNameOfLang['malay'] = "ملاوي";
@@ -203,21 +196,20 @@ $langNameOfLang['thai'] = "التايلاندية";
 $langNameOfLang['turkce'] = "التركية";
 $langNameOfLang['vietnamese'] = "الفتنامية";
 $UserInfo = "معلومات المستخدم";
-$langModifyQuestion = "تعديل السؤال";
-$langCheckAll = "اختر الجميع";
-$langNbAnnoucement = "إعلان";
-$lang_no_access_here = " لا يسمح بالوصول إلى هنا";
-$langOtherCourses = " مقررات أخرى";
+$ModifyQuestion = "تعديل السؤال";
+$CheckAll = "اختر الجميع";
+$NbAnnoucement = "إعلان";
+$OtherCourses = " مقررات أخرى";
 $Doc = "مسار التعلم";
 $PlataformAdmin = "مدير المنصة";
 $Groups = "مجموعات";
 $GroupManagement = "إدارة المجموعات";
 $All = "الكل";
 $None = "none";
-$langSorry = "اختر المقرر الأول";
-$langDenied = "غير متاح";
+$Sorry = "اختر المقرر الأول";
+$Denied = "غير متاح";
 $Today = "اليوم";
-$langCourseHomepageLink = "صفحة المقرر";
+$CourseHomepageLink = "صفحة المقرر";
 $Attachment = "مرفق";
 $User = "اسم المستخدم";
 $MondayInit = "M";
@@ -277,10 +269,10 @@ $SeptemberLong = "سبتمبر";
 $OctoberLong = "أكتوبر";
 $NovemberLong = "نوفمبر";
 $DecemberLong = "ديسمبر";
-$langMyCompetences = "قدراتي";
-$langMyDiplomas = "دبلوماتي";
-$langMyPersonalOpenArea = "مساحتي الشخصية المفتوحة";
-$langMyTeach = "ما أنا قادرة على تدريسه";
+$MyCompetences = "قدراتي";
+$MyDiplomas = "دبلوماتي";
+$MyPersonalOpenArea = "مساحتي الشخصية المفتوحة";
+$MyTeach = "ما أنا قادرة على تدريسه";
 $Agenda = "أجندة";
 $HourShort = "h";
 $PleaseTryAgain = "فضلا كرر المحاولة";
@@ -290,7 +282,7 @@ $UplNotAZip = "الملف الذي اخترته ليس ملف مضغوط zip";
 $UplUploadSucceeded = "تم تحميل الملف بنجاح";
 $ExportAsCSV = "تصدير كملف CSV";
 $ExportAsXLS = " تصدير كملف  XLS";
-$langOpenarea = "المنطقة الشخصية المفتوحة";
+$Openarea = "المنطقة الشخصية المفتوحة";
 $Done = "تم";
 $Documents = " مستندات";
 $DocumentAdded = "لقد تم إضافة المستند بنجاح";
@@ -304,7 +296,7 @@ $Link = "رابط";
 $Announcement = "الإعلانات";
 $Dropbox = "صندوق المشاركات";
 $Quiz = " تمارين";
-$langChat = "محادثة";
+$Chat = "محادثة";
 $Conference = "إجتماع";
 $Student_publication = "الواجبات";
 $Tracking = "التقرير";
@@ -317,8 +309,8 @@ $StartDate = "تاريخ البداية";
 $EndDate = "تاريخ النهاية";
 $StartTime = "وقت البداية";
 $EndTime = "وقت النهاية";
-$langYouWereCalled = "تم استدعاؤك للمحادثة مع";
-$langDoYouAccept = "هل توافق؟";
+$YouWereCalled = "تم استدعاؤك للمحادثة مع";
+$DoYouAccept = "هل توافق؟";
 $Everybody = "الجميع";
 $SentTo = "ظاهر ل";
 $Export = "تصدير";
@@ -342,7 +334,7 @@ $FormHasErrorsPleaseComplete = "النموذج يحتوي على أخطاء أو
 $StartDateShouldBeBeforeEndDate = "التاريخ الأول يجب أن يكون قبل تاريخ النهاية";
 $InvalidDate = "تاريخ غير صالح";
 $OnlyLettersAndNumbersAllowed = "مسموح فقط بالحروف والأرقام";
-$langBasicOverview = "قم بتنظيم";
+$BasicOverview = "قم بتنظيم";
 $CourseAdminRole = "مدير المقرر";
 $UserRole = "الدور";
 $OnlyImagesAllowed = "فقط PNG, JPG or GIF الصور المسموح بها هي";
@@ -352,16 +344,14 @@ $DeleteRight = "حذف";
 $OverviewCourseRights = "نظرة عامة عن الأدوار و الحقوق";
 $SeeAllRightsAllLocationsForSpecificRole = "التركيز على الدور";
 $SeeAllRolesAllLocationsForSpecificRight = " تركيز على الصلاحيات";
-$langAdvanced = "قم ببناء";
+$Advanced = "قم ببناء";
 $RightValueModified = " تم تعدبل القيمة";
 $course_rights = "نظرة عامة على الأدوار و الحقوق";
 $Visio_conference = "إجتماع افتراضي (تخيلي)";
 $CourseAdminRoleDescription = "مدير المقرر";
-$Move = "حرك";
 $MoveTo = "انقل إلى";
 $Delete = "حذف";
 $MoveFileTo = "حرك الملف إلى";
-$Save = "حفظ";
 $Error = "Error";
 $Anonymous = "مجهول";
 $h = "h";
@@ -377,9 +367,9 @@ $YouHaveNewMessage = "لديك رسالة جديدة";
 $myActiveSessions = "جلساتي النشطة";
 $myInactiveSessions = "جلساتي غير النشطة";
 $FileUpload = "تحميل ملف";
-$langMyActiveSessions = "جلساتي النشطة";
-$langMyInActiveSessions = "جلساتي غير النشطة";
-$langMySpace = "التقرير";
+$MyActiveSessions = "جلساتي النشطة";
+$MyInActiveSessions = "جلساتي غير النشطة";
+$MySpace = "التقرير";
 $ExtensionActivedButNotYetOperational = "لقد تم تنشيط الإمتداد لكن لا يمكن تشغيله حاليا";
 $MyStudents = "طلابي";
 $Progress = "الإجراء";

+ 97 - 107
main/lang/asturian/trad4all.inc.php

@@ -9,55 +9,53 @@ $Title = "Títulu";
 $By = "Espublizáu por";
 $UsersOnline = "Usuarios coneutaos";
 $Remove = "Esborrar";
-$langEnter = "Tornar al mio llistáu de cursos";
+$Enter = "Tornar al mio llistáu de cursos";
 $Description = "Descripción";
 $Links = "Enllaces";
-$langWorks = "Trabayos";
+$Works = "Trabayos";
 $Forums = "Foros";
-$langExercices = "Exercicios";
-$langCreateDir = "Crear un direutoriu";
+$Exercices = "Exercicios";
+$CreateDir = "Crear un direutoriu";
 $Name = "Nome";
-$langComment = "Comentarios";
-$langVisible = "Visible";
-$langNewDir = "Nome del direutoriu nuevu";
-$langDirCr = "Direutoriu creau";
+$Comment = "Comentarios";
+$Visible = "Visible";
+$NewDir = "Nome del direutoriu nuevu";
+$DirCr = "Direutoriu creau";
 $Download = "Descargar";
-$langGroup = "Grupos";
-$langEdit = "Editar";
-$langGroupForum = "Foru del grupu";
+$Group = "Grupos";
+$Edit = "Editar";
+$GroupForum = "Foru del grupu";
 $Language = "Llingua";
 $LoginName = "Usuariu/a";
 $AutostartMp3 = "Calque Aceutar si quier que l'archivu d'audiu eche andar automáticamente";
 $Assignments = "Trabayos";
 $Forum = "Foros";
-$langDelImage = "Esborrar foto";
-$langCode = "Códigu del cursu";
-$langUp = "Enriba";
+$DelImage = "Esborrar foto";
+$Code = "Códigu del cursu";
+$Up = "Enriba";
 $Down = "Baxar";
-$Up = "Pa enriba";
 $Theme = "Tema";
 $TheListIsEmpty = "El llistáu ta vacíu";
-$langUniqueSelect = "Eleición múltiple (Retruque únicu)";
+$UniqueSelect = "Eleición múltiple (Retruque únicu)";
 $CreateCategory = "Criar categoría";
 $SendFile = "Unviar ficheru";
 $SaveChanges = "Guardar cambeos";
 $SearchTerm = "Palabra pa buscar";
 $TooShort = "Percurtiu";
-$langCourseCreate = "Crear un cursu";
-$langTodo = "Deberes por facer";
+$CourseCreate = "Crear un cursu";
+$Todo = "Deberes por facer";
 $UserName = "Nome d'usuariu";
-$lang_show_hide = "Amosar / esconder";
-$langCategoryMod = "Modificar categoría";
+$CategoryMod = "Modificar categoría";
 $Hide = "Esconder";
-$langDear = "Estimáu/ada";
-$langArchive = "archivu";
-$langCourseCode = "Códigu del cursu";
-$langNoDescription = "Ensin descripción";
-$langOfficialCode = "Códigu oficial";
+$Dear = "Estimáu/ada";
+$Archive = "archivu";
+$CourseCode = "Códigu del cursu";
+$NoDescription = "Ensin descripción";
+$OfficialCode = "Códigu oficial";
 $FirstName = "Nome";
 $LastName = "Apellíos";
 $Status = "Estatus";
-$langEmail = "Corréu electrónicu";
+$Email = "Corréu electrónicu";
 $SlideshowConversion = "Conversión de la presentación";
 $UploadFile = "Unviar archivu";
 $AvailableFrom = "A dispsición dende";
@@ -67,7 +65,6 @@ $Type = "Tipu";
 $EmailAddress = "Direición de corréu electrónicu";
 $Organisation = "Organización";
 $Reporting = "Informes";
-$Code = "Códigu";
 $Update = "Actualizar";
 $SelectQuestionType = "Seleicionar triba";
 $CurrentCourse = "Cursu actual";
@@ -97,58 +94,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %d %B %Y";
 $dateTimeFormatLong = "%A, %d de %B del %Y a les %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "Sí";
-$langNo = "Non";
+$Yes = "Sí";
+$No = "Non";
 $Next = "Siguiente";
-$langAllowed = "Tien permisu";
-$langBackHome = "Tornar a la páxina d'entamu de";
-$langPropositions = "Recomendaciones de meyora";
-$langMaj = "Actualizar";
-$langModify = "cambiar";
-$langDelete = "Esborrar";
-$langInvisible = "Tornar invisible";
-$langSave = "Guardar";
-$langMove = "Mover";
+$Allowed = "Tien permisu";
+$BackHome = "Tornar a la páxina d'entamu de";
+$Propositions = "Recomendaciones de meyora";
+$Maj = "Actualizar";
+$Modify = "cambiar";
+$Invisible = "Tornar invisible";
+$Save = "Guardar";
+$Move = "Mover";
 $Help = "Ayuda";
-$langOk = "Aceutar";
-$langAdd = "Amestar";
-$langAddIntro = "Amestar un testu d'entamu";
-$langBackList = "Tornar al llistáu";
-$langText = "Testu";
-$langEmpty = "Nun enllenó tolos camps. <br>Use'l botón de retornu del so navegador y vuelva entamar. <br>Si nun sabe'l códigu del so cursu, mire'l programa del mesmu.";
-$langConfirmYourChoice = "Por favor, confirme la so eleición";
-$langAnd = "y";
-$langChoice = "La so seleición";
-$langFinish = "Acabar";
-$langCancel = "Cancelar";
-$langNotAllowed = "Nun ta identificáu como responsable d'esti cursu";
-$langNotLogged = "Nun entró como usuariu d'un cursu";
-$langManager = "Responsable";
-$langOptional = "Opcional";
+$Ok = "Aceutar";
+$Add = "Amestar";
+$AddIntro = "Amestar un testu d'entamu";
+$BackList = "Tornar al llistáu";
+$Text = "Testu";
+$Empty = "Nun enllenó tolos camps. <br>Use'l botón de retornu del so navegador y vuelva entamar. <br>Si nun sabe'l códigu del so cursu, mire'l programa del mesmu.";
+$ConfirmYourChoice = "Por favor, confirme la so eleición";
+$And = "y";
+$Choice = "La so seleición";
+$Finish = "Acabar";
+$Cancel = "Cancelar";
+$NotAllowed = "Nun ta identificáu como responsable d'esti cursu";
+$NotLogged = "Nun entró como usuariu d'un cursu";
+$Manager = "Responsable";
+$Optional = "Opcional";
 $NextPage = "Siguiente páxina";
 $PreviousPage = "Páxina anterior";
-$langUse = "Usar";
-$langTotal = "Total";
-$langTake = "Garrar";
-$langOne = "Ún";
-$langSeveral = "Dellos";
-$langNotice = "Anuncia";
-$langDate = "Fecha";
-$langAmong = "ente";
-$langShow = "Amosar";
-$langMyCourses = "Los mios cursos";
-$langModifyProfile = "El mio perfil";
-$langMyStats = "Ver les mios estadístiques";
-$langLogout = "Colar";
-$langMyAgenda = "La mio axenda";
-$langCourseHomepage = "Páxina d'entamu del cursu";
-$langCourseManagerview = "Dir a vista del profesor";
-$langStudentView = "Vista d'estudiante";
+$Use = "Usar";
+$Total = "Total";
+$Take = "Garrar";
+$One = "Ún";
+$Several = "Dellos";
+$Notice = "Anuncia";
+$Date = "Fecha";
+$Among = "ente";
+$Show = "Amosar";
+$MyCourses = "Los mios cursos";
+$ModifyProfile = "El mio perfil";
+$MyStats = "Ver les mios estadístiques";
+$Logout = "Colar";
+$MyAgenda = "La mio axenda";
+$CourseHomepage = "Páxina d'entamu del cursu";
+$CourseManagerview = "Dir a vista del profesor";
+$StudentView = "Vista d'estudiante";
 $AddResource = "Amestar recursu";
 $AddedResources = "Recursos amestaos";
-$lang_modify_resource = "Modificar / Amestar recursos";
-$lang_resource = "Recursu";
-$lang_resources = "Recursos";
 $langNameOfLang['arabic'] = "árabe";
 $langNameOfLang['brazilian'] = "brasileñu";
 $langNameOfLang['bulgarian'] = "búlgaru";
@@ -172,27 +165,27 @@ $langNameOfLang['russian'] = "rusu";
 $langNameOfLang['simpl_chinese'] = "chinu simplificáu";
 $langNameOfLang['spanish'] = "castellanu";
 $Close = "zarrar";
-$langPlatform = "Plataforma";
+$Platform = "Plataforma";
 $localLangName = "llingua";
 $email = "e-maill";
-$langCourseCodeAlreadyExists = "Perdón, pero esti códigu yá esiste. Escueya otru, por favor.";
+$CourseCodeAlreadyExists = "Perdón, pero esti códigu yá esiste. Escueya otru, por favor.";
 $Statistics = "Estadístiques";
-$langGrouplist = "llistáu de grupos";
-$langPrevious = "Anterior";
+$Grouplist = "llistáu de grupos";
+$Previous = "Anterior";
 $DestDirectoryDoesntExist = "El direutoriu de destín nun esiste";
 $Courses = "cursos";
 $In = "nel";
-$langShowAll = "Amosar toos";
-$langPage = "Páxina";
+$ShowAll = "Amosar toos";
+$Page = "Páxina";
 $englishLangName = "Inglés";
 $Home = "Páxina d'entamu";
-$langAreYouSureToDelete = "¿ Ta seguru de que quier esborrar";
+$AreYouSureToDelete = "¿ Ta seguru de que quier esborrar";
 $SelectAll = "Seleicionar too";
 $UnSelectAll = "Anular escoyer toos";
 $WithSelected = "Colos seleicionaos";
-$langOnLine = "coneutáu/os";
-$langUsers = "Usuarios";
-$langPlatformAdmin = "Alministración de la plataforma";
+$OnLine = "coneutáu/os";
+$Users = "Usuarios";
+$PlatformAdmin = "Alministración de la plataforma";
 $langNameOfLang['hungarian'] = "húngaru";
 $langNameOfLang['indonesian'] = "indonesiu";
 $langNameOfLang['malay'] = "malayu";
@@ -203,21 +196,20 @@ $langNameOfLang['thai'] = "tailandés";
 $langNameOfLang['turkce'] = "turcu";
 $langNameOfLang['vietnamese'] = "vietnamita";
 $UserInfo = "información del usuariu";
-$langModifyQuestion = "Modificar la entruga";
-$langCheckAll = "comprobar";
-$langNbAnnoucement = "Anuncies";
-$lang_no_access_here = "Nun tien permisu pa entrar equí";
-$langOtherCourses = "otros cursos";
+$ModifyQuestion = "Modificar la entruga";
+$CheckAll = "comprobar";
+$NbAnnoucement = "Anuncies";
+$OtherCourses = "otros cursos";
 $Doc = "documentu";
 $PlataformAdmin = "Alministración de la plataforma";
 $Groups = "Grupos";
 $GroupManagement = "Xestión de grupos";
 $All = "Too";
 $None = "Nada";
-$langSorry = "Escueya primero un cursu";
-$langDenied = "Esta función namás ta disponible pa los alministradores del cursu";
+$Sorry = "Escueya primero un cursu";
+$Denied = "Esta función namás ta disponible pa los alministradores del cursu";
 $Today = "Güei";
-$langCourseHomepageLink = "Páxina d'entamu del cursu";
+$CourseHomepageLink = "Páxina d'entamu del cursu";
 $Attachment = "Axuntar";
 $User = "Usuariu";
 $MondayInit = "Ll";
@@ -277,10 +269,10 @@ $SeptemberLong = "Setiembre";
 $OctoberLong = "Ochobre";
 $NovemberLong = "Payares";
 $DecemberLong = "Avientu";
-$langMyCompetences = "Les mios competencies";
-$langMyDiplomas = "Los mios títulos";
-$langMyPersonalOpenArea = "La mio área personal pública";
-$langMyTeach = "¿ Qué puedo aprender a otros ?";
+$MyCompetences = "Les mios competencies";
+$MyDiplomas = "Los mios títulos";
+$MyPersonalOpenArea = "La mio área personal pública";
+$MyTeach = "¿ Qué puedo aprender a otros ?";
 $Agenda = "Axenda";
 $HourShort = "h";
 $PleaseTryAgain = "Por favor, inténtelo otra vez";
@@ -290,7 +282,7 @@ $UplNotAZip = "L'archivu escoyíu nun ye un archivu ZIP.";
 $UplUploadSucceeded = "L'archivu unvióse";
 $ExportAsCSV = "Esportar a ficheru CSV";
 $ExportAsXLS = "Esportar a ficheru XLS";
-$langOpenarea = "Area personal pública";
+$Openarea = "Area personal pública";
 $Done = "Fecho";
 $Documents = "Documentos";
 $DocumentAdded = "Documentu amestáu";
@@ -303,7 +295,7 @@ $Link = "Enllaz";
 $Announcement = "Anuncies";
 $Dropbox = "Compartir documentos";
 $Quiz = "Exercicios";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Conferencia online";
 $Student_publication = "Trabayos";
 $Tracking = "Informes";
@@ -316,8 +308,8 @@ $StartDate = "Fecha d'entamu";
 $EndDate = "Fecha d'acabu";
 $StartTime = "Hora d'entamu";
 $EndTime = "Hora d'acabu";
-$langYouWereCalled = "Ta llamándolu pa chatear";
-$langDoYouAccept = "¿ Quier ?";
+$YouWereCalled = "Ta llamándolu pa chatear";
+$DoYouAccept = "¿ Quier ?";
 $Everybody = "tolos usuarios del cursu";
 $SentTo = "Unviar a";
 $Export = "Esportar";
@@ -341,7 +333,7 @@ $FormHasErrorsPleaseComplete = "Esti formulariu tien datos incorreutos o incompl
 $StartDateShouldBeBeforeEndDate = "La fecha d'entamu tien de ser anterior a la fecha d'acabu";
 $InvalidDate = "Fecha inválida";
 $OnlyLettersAndNumbersAllowed = "Namás se permiten lletres y númberos";
-$langBasicOverview = "Organizar";
+$BasicOverview = "Organizar";
 $CourseAdminRole = "Alministrador del cursu";
 $UserRole = "Función";
 $OnlyImagesAllowed = "Namás tán permitíes imáxenes PNG, JPG y GIF";
@@ -351,16 +343,14 @@ $DeleteRight = "Esborrar";
 $OverviewCourseRights = "Descripción de funciones y permisos";
 $SeeAllRightsAllLocationsForSpecificRole = "Función";
 $SeeAllRolesAllLocationsForSpecificRight = "Ver tolos perfiles y llugares pa un permisu específicu";
-$langAdvanced = "Avanzáu";
+$Advanced = "Avanzáu";
 $RightValueModified = "Esti valor cambióse";
 $course_rights = "Configuración de funciones y permisos";
 $Visio_conference = "Reunión por videoconferencia";
 $CourseAdminRoleDescription = "Alministrador del cursu";
-$Move = "Mover";
 $MoveTo = "Mover a";
 $Delete = "Esborrar";
 $MoveFileTo = "Mover archivu a";
-$Save = "Guardar";
 $Error = "Erru";
 $Anonymous = "Anónimu";
 $h = "h";
@@ -376,9 +366,9 @@ $YouHaveNewMessage = "Tien un mensaxe nuevu";
 $myActiveSessions = "Les mios sesiones actives";
 $myInactiveSessions = "Les mios sesiones inactives";
 $FileUpload = "Unvíu d'archivu";
-$langMyActiveSessions = "Les mios sesiones actives";
-$langMyInActiveSessions = "Les mios sesiones inactives";
-$langMySpace = "Informes";
+$MyActiveSessions = "Les mios sesiones actives";
+$MyInActiveSessions = "Les mios sesiones inactives";
+$MySpace = "Informes";
 $ExtensionActivedButNotYetOperational = "Esta estensión activóse, pero de momentu nun pue ponese a funcionar.";
 $MyStudents = "Los mios estudiantes";
 $Progress = "Progresu";
@@ -782,7 +772,7 @@ $InvitationDenied = "Invitación non aceptada";
 $UserAdded = "Añadióse l'usuariu";
 $UpdatedIn = "Anováu";
 $Metadata = "Metadatos";
-$langAddMetadata = "Ver / Editar metadatos";
+$AddMetadata = "Ver / Editar metadatos";
 $SendMessage = "Unviar mensax";
 $SeeForum = "Ver foru";
 $SeeMore = "Ver más";

+ 97 - 107
main/lang/basque/trad4all.inc.php

@@ -16,55 +16,53 @@ $Title = "Titulua";
 $By = "Egilea:";
 $UsersOnline = "Erabiltzaileak online";
 $Remove = "Kendu";
-$langEnter = "Itzuli ikastaro zerrendara";
+$Enter = "Itzuli ikastaro zerrendara";
 $Description = "Deskripzioa";
 $Links = "Loturak";
-$langWorks = "Egin beharreko lanak";
+$Works = "Egin beharreko lanak";
 $Forums = "Foroak";
-$langExercices = "Azterketak";
-$langCreateDir = "Sortu karpeta";
+$Exercices = "Azterketak";
+$CreateDir = "Sortu karpeta";
 $Name = "Izena";
-$langComment = "Iruzkinak";
-$langVisible = "Ikusgai";
-$langNewDir = "Karpeta berriaren izena";
-$langDirCr = "Karpeta sortu da";
+$Comment = "Iruzkinak";
+$Visible = "Ikusgai";
+$NewDir = "Karpeta berriaren izena";
+$DirCr = "Karpeta sortu da";
 $Download = "Deskargatu";
-$langGroup = "Taldeak";
-$langEdit = "Editatu";
-$langGroupForum = "Taldearen foroa";
+$Group = "Taldeak";
+$Edit = "Editatu";
+$GroupForum = "Taldearen foroa";
 $Language = "Hizkuntza";
 $LoginName = "Konektatzeko izena";
 $AutostartMp3 = "Klikatu Onartzea, audio fitxategia automatikoki hastea nahi baduzu?";
 $Assignments = "Egin beharreko lanak";
 $Forum = "Foroa";
-$langDelImage = "Kendu irudia";
-$langCode = "Ikastaroaren kodea";
-$langUp = "Gora";
+$DelImage = "Kendu irudia";
+$Code = "Ikastaroaren kodea";
+$Up = "Gora";
 $Down = "Behera";
-$Up = "Eraman gora";
 $Theme = "Estilo grafikoa";
 $TheListIsEmpty = "Zerrenda hutsik";
-$langUniqueSelect = "Aukera anitz (erantzun bakarra)";
+$UniqueSelect = "Aukera anitz (erantzun bakarra)";
 $CreateCategory = "Sortu kategoria";
 $SendFile = "Kargatu dokumentua";
 $SaveChanges = "Gorde aldaketak";
 $SearchTerm = "Bilatu beharreko terminoa";
 $TooShort = "Laburregia";
-$langCourseCreate = "Sortu ikastaro bat";
-$langTodo = "Proposamenak";
+$CourseCreate = "Sortu ikastaro bat";
+$Todo = "Proposamenak";
 $UserName = "Erabiltzailearen izena";
-$lang_show_hide = "Erakutsi / ezkutatu";
-$langCategoryMod = "Editatu kategoria";
+$CategoryMod = "Editatu kategoria";
 $Hide = "Ezkutatu";
-$langDear = "Estimatua";
-$langArchive = "artxiboa";
-$langCourseCode = "Ikastaroaren kodea";
-$langNoDescription = "Deskripziorik gabe";
-$langOfficialCode = "Kode ofiziala";
+$Dear = "Estimatua";
+$Archive = "artxiboa";
+$CourseCode = "Ikastaroaren kodea";
+$NoDescription = "Deskripziorik gabe";
+$OfficialCode = "Kode ofiziala";
 $FirstName = "Izena";
 $LastName = "Deitura";
 $Status = "Egoera";
-$langEmail = "Posta elektronikoa";
+$Email = "Posta elektronikoa";
 $SlideshowConversion = "Irudi aurkezpenaren bihurketa";
 $UploadFile = "Kargatu fitxategia";
 $AvailableFrom = "Noiztik erabilgarri:";
@@ -74,7 +72,6 @@ $Type = "Mota";
 $EmailAddress = "Posta elektronikoaren helbidea";
 $Organisation = "Erakundea";
 $Reporting = "Txostenak";
-$Code = "Kodea";
 $Update = "Eguneratu";
 $SelectQuestionType = "Hautatu galdera mota";
 $CurrentCourse = "Uneko ikastaroa";
@@ -104,60 +101,56 @@ $dateFormatShort = "%b %d, %Y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "Bai";
-$langNo = "Ez";
+$Yes = "Bai";
+$No = "Ez";
 $Next = "Hurrengoa";
-$langAllowed = "Baimenduta";
-$langBackHome = "Itzuli honakoaren orri nagusira";
-$langPropositions = "Proposamenak honakoaren hobekuntzarako:";
-$langMaj = "Eguneratu";
-$langModify = "Editatu";
-$langDelete = "ezabatu";
-$langInvisible = "ikusezina";
-$langSave = "Gorde";
-$langMove = "Aldatu lekuz";
+$Allowed = "Baimenduta";
+$BackHome = "Itzuli honakoaren orri nagusira";
+$Propositions = "Proposamenak honakoaren hobekuntzarako:";
+$Maj = "Eguneratu";
+$Modify = "Editatu";
+$Invisible = "ikusezina";
+$Save = "Gorde";
+$Move = "Aldatu lekuz";
 $Help = "Laguntza";
-$langOk = "Balidatu";
-$langAdd = "Gehitu";
-$langAddIntro = "Gehitu sarrerako testua";
-$langBackList = "Itzuli zerrendara";
-$langText = "Testua";
-$langEmpty = "Eremu batzuk bete gabe utzi dituzu.
+$Ok = "Balidatu";
+$Add = "Gehitu";
+$AddIntro = "Gehitu sarrerako testua";
+$BackList = "Itzuli zerrendara";
+$Text = "Testua";
+$Empty = "Eremu batzuk bete gabe utzi dituzu.
 Erabili Atzera joateko botoia zure nabigatzailean eta saiatu berriro ere.
 Zure ikastaroaren kodea ez badakizu, ikusi Ikastaroaren programa.";
-$langConfirmYourChoice = "Mesedez, baieztatu zuk hautatakoa";
-$langAnd = "eta";
-$langChoice = "Zuk hautatutakoa";
-$langFinish = "Amaitu";
-$langCancel = "Utzi";
-$langNotAllowed = "Ez daukazu orri hau ikusteko baimenik. Edo zure konexioak iraungi du edo ez daukazu pribilegio nahikorik orri honetan sartzen saiatzeko.";
-$langNotLogged = "Ez duzu ikastaroan sartzeko identifikaziorik";
-$langManager = "Kudeatzailea";
-$langOptional = "Aukerakoa";
+$ConfirmYourChoice = "Mesedez, baieztatu zuk hautatakoa";
+$And = "eta";
+$Choice = "Zuk hautatutakoa";
+$Finish = "Amaitu";
+$Cancel = "Utzi";
+$NotAllowed = "Ez daukazu orri hau ikusteko baimenik. Edo zure konexioak iraungi du edo ez daukazu pribilegio nahikorik orri honetan sartzen saiatzeko.";
+$NotLogged = "Ez duzu ikastaroan sartzeko identifikaziorik";
+$Manager = "Kudeatzailea";
+$Optional = "Aukerakoa";
 $NextPage = "Hurrengo orria";
 $PreviousPage = "Aurreko orria";
-$langUse = "Erabili";
-$langTotal = "Guztira";
-$langTake = "hartu";
-$langOne = "Bat";
-$langSeveral = "Anitz";
-$langNotice = "Oharra";
-$langDate = "Data";
-$langAmong = "artean";
-$langShow = "Erakutsi";
-$langMyCourses = "Nire ikastaroak";
-$langModifyProfile = "Profila";
-$langMyStats = "Ikusi nire estatistikak";
-$langLogout = "Saiotik atera";
-$langMyAgenda = "Agenda pertsonala";
-$langCourseHomepage = "Ikastaroaren orri nagusia";
-$langCourseManagerview = "Irakaslearen ikuspegia";
-$langStudentView = "Ikaslearen ikuspegia";
+$Use = "Erabili";
+$Total = "Guztira";
+$Take = "hartu";
+$One = "Bat";
+$Several = "Anitz";
+$Notice = "Oharra";
+$Date = "Data";
+$Among = "artean";
+$Show = "Erakutsi";
+$MyCourses = "Nire ikastaroak";
+$ModifyProfile = "Profila";
+$MyStats = "Ikusi nire estatistikak";
+$Logout = "Saiotik atera";
+$MyAgenda = "Agenda pertsonala";
+$CourseHomepage = "Ikastaroaren orri nagusia";
+$CourseManagerview = "Irakaslearen ikuspegia";
+$StudentView = "Ikaslearen ikuspegia";
 $AddResource = "Gehitu baliabidea";
 $AddedResources = "Baliabide erantsiak";
-$lang_modify_resource = "Editatu / Gehitu baliabideak";
-$lang_resource = "Baliabidea";
-$lang_resources = "Baliabideak";
 $langNameOfLang['arabic'] = "arabiera";
 $langNameOfLang['brazilian'] = "brasilera";
 $langNameOfLang['bulgarian'] = "bulgariera";
@@ -181,27 +174,27 @@ $langNameOfLang['russian'] = "errusiera";
 $langNameOfLang['simpl_chinese'] = "txinera erraztua";
 $langNameOfLang['spanish'] = "gaztelania";
 $Close = "itxi";
-$langPlatform = "Plataforma";
+$Platform = "Plataforma";
 $localLangName = "hizkuntza";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Sentitzen dugu, baina kode hau badago lehendik. Mesedez, hautatu beste bat.";
+$CourseCodeAlreadyExists = "Sentitzen dugu, baina kode hau badago lehendik. Mesedez, hautatu beste bat.";
 $Statistics = "Estatistikak";
-$langGrouplist = "Talde zerrenda";
-$langPrevious = "Aurrekoa";
+$Grouplist = "Talde zerrenda";
+$Previous = "Aurrekoa";
 $DestDirectoryDoesntExist = "Ez da helburuko karpetarik";
 $Courses = "Ikastaroak";
 $In = "non";
-$langShowAll = "Erakutsi guztiak";
-$langPage = "Orria";
+$ShowAll = "Erakutsi guztiak";
+$Page = "Orria";
 $englishLangName = "Ingelesa";
 $Home = "Hasierakoa";
-$langAreYouSureToDelete = "Ziur al zaude ezabatu nahi duzula?";
+$AreYouSureToDelete = "Ziur al zaude ezabatu nahi duzula?";
 $SelectAll = "Hautatu dena";
 $UnSelectAll = "Desautatu dena";
 $WithSelected = "Hautatukoarekin";
-$langOnLine = "Online";
-$langUsers = "Erabiltzaileak";
-$langPlatformAdmin = "Kudeaketa";
+$OnLine = "Online";
+$Users = "Erabiltzaileak";
+$PlatformAdmin = "Kudeaketa";
 $langNameOfLang['hungarian'] = "hungariera";
 $langNameOfLang['indonesian'] = "indonesiera";
 $langNameOfLang['malay'] = "malaysiera";
@@ -212,22 +205,21 @@ $langNameOfLang['thai'] = "thaiera";
 $langNameOfLang['turkce'] = "turkiera";
 $langNameOfLang['vietnamese'] = "vietnamera";
 $UserInfo = "erabiltzailearen informazioa";
-$langModifyQuestion = "Aldatu galdera";
+$ModifyQuestion = "Aldatu galdera";
 $Example = "Adibidea";
-$langCheckAll = "Markatu dena";
-$langNbAnnoucement = "Abisua";
-$lang_no_access_here = "Ez duzu hemen sartzeko baimenik";
-$langOtherCourses = "beste ikastaro batzuk";
+$CheckAll = "Markatu dena";
+$NbAnnoucement = "Abisua";
+$OtherCourses = "beste ikastaro batzuk";
 $Doc = "dokumentua";
 $PlataformAdmin = "Plataformaren kudeaketa";
 $Groups = "Taldeak";
 $GroupManagement = "Taldeen kudeaketa";
 $All = "Dena";
 $None = "bat ere ez";
-$langSorry = "Lehehenego, hautatu ikastaro bat";
-$langDenied = "Gaitasun hau irakasleentzat soilik dago erabilgarri";
+$Sorry = "Lehehenego, hautatu ikastaro bat";
+$Denied = "Gaitasun hau irakasleentzat soilik dago erabilgarri";
 $Today = "Gaur";
-$langCourseHomepageLink = "Ikastaroaren orri nagusia";
+$CourseHomepageLink = "Ikastaroaren orri nagusia";
 $Attachment = "Erantsia";
 $User = "Erabiltzailea";
 $MondayInit = "Al";
@@ -287,10 +279,10 @@ $SeptemberLong = "Iraila";
 $OctoberLong = "Urria";
 $NovemberLong = "Azaroa";
 $DecemberLong = "Abendua";
-$langMyCompetences = "Nire gaitasunak";
-$langMyDiplomas = "Tituluak";
-$langMyPersonalOpenArea = "Espazio pertsonal irekia";
-$langMyTeach = "Zer irakatsi dezaket";
+$MyCompetences = "Nire gaitasunak";
+$MyDiplomas = "Tituluak";
+$MyPersonalOpenArea = "Espazio pertsonal irekia";
+$MyTeach = "Zer irakatsi dezaket";
 $Agenda = "Agenda";
 $HourShort = "o";
 $PleaseTryAgain = "Mesedez, saiatu berriro!";
@@ -300,7 +292,7 @@ $UplNotAZip = "Zuk hautatutako fitxategia ez da zip fitxategia.";
 $UplUploadSucceeded = "Fitxategiaren karga lortu da!";
 $ExportAsCSV = "CSV esportazioa";
 $ExportAsXLS = "XLS esportazioa";
-$langOpenarea = "Espazio pertsonal irekia";
+$Openarea = "Espazio pertsonal irekia";
 $Done = "Egin da";
 $Documents = "Dokumentuak";
 $DocumentAdded = "Dokumentua gehitu da";
@@ -314,7 +306,7 @@ $Link = "Loturak";
 $Announcement = "Abisuak";
 $Dropbox = "Dokumentuak partekatzeko kutxa";
 $Quiz = "Azterketak";
-$langChat = "Txata";
+$Chat = "Txata";
 $Conference = "Konferentzia online";
 $Student_publication = "Egin beharreko lanak";
 $Tracking = "Txostenak";
@@ -327,8 +319,8 @@ $StartDate = "Hasiera eguna";
 $EndDate = "Amaiera eguna";
 $StartTime = "Hasiera ordua";
 $EndTime = "Amaiera ordua";
-$langYouWereCalled = "Txateatzera gonbidatuta zaude honakoarekin:";
-$langDoYouAccept = "Onartzen duzu?";
+$YouWereCalled = "Txateatzera gonbidatuta zaude honakoarekin:";
+$DoYouAccept = "Onartzen duzu?";
 $Everybody = "Guztiak";
 $SentTo = "Ikusgai honakoentzat:";
 $Export = "Esportatu";
@@ -352,7 +344,7 @@ $FormHasErrorsPleaseComplete = "Datu orri honek datu ez-zuzenak edo bete gabe di
 $StartDateShouldBeBeforeEndDate = "Hasiera data amaiera data baino lehenagokoa izan beharko litzateke";
 $InvalidDate = "Data ez da baliogarria";
 $OnlyLettersAndNumbersAllowed = "Letrak eta zenbakiak soilik onartzen dira";
-$langBasicOverview = "Antolatu";
+$BasicOverview = "Antolatu";
 $CourseAdminRole = "Ikastaroaren kudeatzailea";
 $UserRole = "Rola";
 $OnlyImagesAllowed = "PNG, JPG edo GIF irudiak bakarrik onartzen dira";
@@ -362,16 +354,14 @@ $DeleteRight = "Ezabatu";
 $OverviewCourseRights = "Rolak eta eskubideak ikustea multzoan";
 $SeeAllRightsAllLocationsForSpecificRole = "Rola";
 $SeeAllRolesAllLocationsForSpecificRight = "Ikusi eskubide baterako rol eta posizio guztiak";
-$langAdvanced = "Editatze aurreratua";
+$Advanced = "Editatze aurreratua";
 $RightValueModified = "Balio hau aldatu da";
 $course_rights = "Rolak eta eskubideak ikustea multzoan";
 $Visio_conference = "Bideokonferentzia bidezko bilera";
 $CourseAdminRoleDescription = "Ikastaroaren kudeatzailea";
-$Move = "Eraman";
 $MoveTo = "Eraman hona:";
 $Delete = "Ezabatu";
 $MoveFileTo = "Eraman fitxategia hona:";
-$Save = "Gorde";
 $Error = "Errorea";
 $Anonymous = "Anonimoa";
 $h = "o";
@@ -387,9 +377,9 @@ $YouHaveNewMessage = "Mezu berri bat jaso duzu";
 $myActiveSessions = "Nire saio aktiboak";
 $myInactiveSessions = "Nire saio inaktiboak";
 $FileUpload = "Fitxategia kargatzea";
-$langMyActiveSessions = "Nire saio aktiboak";
-$langMyInActiveSessions = "Nire saio inaktiboak";
-$langMySpace = "Txostenak";
+$MyActiveSessions = "Nire saio aktiboak";
+$MyInActiveSessions = "Nire saio inaktiboak";
+$MySpace = "Txostenak";
 $ExtensionActivedButNotYetOperational = "Luzapen hau aktibatu da, baina, oraingoz, ez dago eragiteko moduan.";
 $MyStudents = "Nirekin diren ikasleak";
 $Progress = "Aurrerapena";
@@ -812,7 +802,7 @@ $InvitationDenied = "Gonbiteari uko egin dio";
 $UserAdded = "Erabiltzailea gehitu da";
 $UpdatedIn = "Eguneratu da";
 $Metadata = "Metadatuak";
-$langAddMetadata = "Ikusi/Editatu metadatuak";
+$AddMetadata = "Ikusi/Editatu metadatuak";
 $SendMessage = "Bidali mezua";
 $SeeForum = "Ikusi foroa";
 $SeeMore = "Ikusi gehiago";

+ 97 - 107
main/lang/brazilian/trad4all.inc.php

@@ -14,55 +14,53 @@ $Title = "Título";
 $By = "Por";
 $UsersOnline = "Usuários online";
 $Remove = "Remover";
-$langEnter = "Voltar para a lista de cursos";
+$Enter = "Voltar para a lista de cursos";
 $Description = "Descrição";
 $Links = "Links";
-$langWorks = "Publicações dos alunos";
+$Works = "Publicações dos alunos";
 $Forums = "Fóruns";
-$langExercices = "Exercícios";
-$langCreateDir = "Criar um diretório";
+$Exercices = "Exercícios";
+$CreateDir = "Criar um diretório";
 $Name = "Nome";
-$langComment = "Comentar";
-$langVisible = "Visível/invisível";
-$langNewDir = "Nome do novo diretório";
-$langDirCr = "Diretório criado";
+$Comment = "Comentar";
+$Visible = "Visível/invisível";
+$NewDir = "Nome do novo diretório";
+$DirCr = "Diretório criado";
 $Download = "Download";
-$langGroup = "Grupo";
-$langEdit = "editar";
-$langGroupForum = "Fóruns de grupo";
+$Group = "Grupo";
+$Edit = "editar";
+$GroupForum = "Fóruns de grupo";
 $Language = "Idioma";
 $LoginName = "Login";
 $AutostartMp3 = "Clique em OK se deseja que o arquivo de áudio toque automaticamente";
 $Assignments = "Trabalhos dos Estudantes";
 $Forum = "Fóruns";
-$langDelImage = "Remover foto";
-$langCode = "Código do curso";
-$langUp = "Acima";
+$DelImage = "Remover foto";
+$Code = "Código do curso";
+$Up = "Acima";
 $Down = "desce";
-$Up = "acima";
 $Theme = "Tema";
 $TheListIsEmpty = "A lista está vazia.";
-$langUniqueSelect = "Múltipla escolha (Resposta única)";
+$UniqueSelect = "Múltipla escolha (Resposta única)";
 $CreateCategory = "Criar categoria";
 $SendFile = "Enviar arquivo";
 $SaveChanges = "Salvar alterações";
 $SearchTerm = "Pesquisar palavra";
 $TooShort = "Muito curto";
-$langCourseCreate = "Criar um website de curso";
-$langTodo = "Afazeres";
+$CourseCreate = "Criar um website de curso";
+$Todo = "Afazeres";
 $UserName = "Nome de usuário";
-$lang_show_hide = "Exibir / ocultar";
-$langCategoryMod = "Modificar Categoria";
+$CategoryMod = "Modificar Categoria";
 $Hide = "Ocultar";
-$langDear = "Caro";
-$langArchive = "Arquivo";
-$langCourseCode = "Código do curso";
-$langNoDescription = "Sem descrição";
-$langOfficialCode = "Código Oficial";
+$Dear = "Caro";
+$Archive = "Arquivo";
+$CourseCode = "Código do curso";
+$NoDescription = "Sem descrição";
+$OfficialCode = "Código Oficial";
 $FirstName = "Nome";
 $LastName = "Sobrenome";
 $Status = "Situação";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $SlideshowConversion = "Conversão de apresentação de dispositivos";
 $UploadFile = "Enviar arquivo";
 $AvailableFrom = "Disponível de";
@@ -72,7 +70,6 @@ $Type = "Tipo";
 $EmailAddress = "Endereço de Email";
 $Organisation = "Organização";
 $Reporting = "Relatório";
-$Code = "Código";
 $Update = "Atualizar";
 $SelectQuestionType = "Selecionar tipo de questão";
 $CurrentCourse = "Curso atual";
@@ -102,58 +99,54 @@ $dateFormatShort = "%d %b, %y";
 $dateFormatLong = "%A %d %B, %Y";
 $dateTimeFormatLong = "%d %B, %Y às %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "sim";
-$langNo = "Não";
+$Yes = "sim";
+$No = "Não";
 $Next = "Próximo";
-$langAllowed = "Permitido";
-$langBackHome = "Voltar para a página inicial do";
-$langPropositions = "Propostas para uma melhoria do";
-$langMaj = "Atualizar";
-$langModify = "modificar";
-$langDelete = "excluir";
-$langInvisible = "Tornar invisível";
-$langSave = "Salvar";
-$langMove = "Mover";
+$Allowed = "Permitido";
+$BackHome = "Voltar para a página inicial do";
+$Propositions = "Propostas para uma melhoria do";
+$Maj = "Atualizar";
+$Modify = "modificar";
+$Invisible = "Tornar invisível";
+$Save = "Salvar";
+$Move = "Mover";
 $Help = "Ajuda";
-$langOk = "OK";
-$langAdd = "Adicionar";
-$langAddIntro = "Adicionar um texto de introdução";
-$langBackList = "Voltar para a lista";
-$langText = "Texto";
-$langEmpty = "Alguns campos estão em branco.<br>Use o botão <b>Voltar</b> do seu navegador e tente novamente.<br>Se você ignorar o código do curso, consulte o Programa do Curso";
-$langConfirmYourChoice = "Por favor confirme a sua escolha";
-$langAnd = "e";
-$langChoice = "Sua escolha";
-$langFinish = "Finalizar";
-$langCancel = "Cancelar";
-$langNotAllowed = "Não permitido";
-$langNotLogged = "Você não está autenticado no curso";
-$langManager = "Administrador";
-$langOptional = "Opcional";
+$Ok = "OK";
+$Add = "Adicionar";
+$AddIntro = "Adicionar um texto de introdução";
+$BackList = "Voltar para a lista";
+$Text = "Texto";
+$Empty = "Alguns campos estão em branco.<br>Use o botão <b>Voltar</b> do seu navegador e tente novamente.<br>Se você ignorar o código do curso, consulte o Programa do Curso";
+$ConfirmYourChoice = "Por favor confirme a sua escolha";
+$And = "e";
+$Choice = "Sua escolha";
+$Finish = "Finalizar";
+$Cancel = "Cancelar";
+$NotAllowed = "Não permitido";
+$NotLogged = "Você não está autenticado no curso";
+$Manager = "Administrador";
+$Optional = "Opcional";
 $NextPage = "Próxima página";
 $PreviousPage = "Página anterior";
-$langUse = "Uso";
-$langTotal = "Total";
-$langTake = "Escolher";
-$langOne = "Um";
-$langSeveral = "Muitos";
-$langNotice = "Aviso";
-$langDate = "Data";
-$langAmong = "entre";
-$langShow = "Mostrar";
-$langMyCourses = "Minha lista de cursos";
-$langModifyProfile = "Meu perfil";
-$langMyStats = "Visualizar minhas estatísticas";
-$langLogout = "Logout";
-$langMyAgenda = "Minha agenda";
-$langCourseHomepage = "Homepage do Curso";
-$langCourseManagerview = "Visão do Professor";
-$langStudentView = "Visão do Estudante";
+$Use = "Uso";
+$Total = "Total";
+$Take = "Escolher";
+$One = "Um";
+$Several = "Muitos";
+$Notice = "Aviso";
+$Date = "Data";
+$Among = "entre";
+$Show = "Mostrar";
+$MyCourses = "Minha lista de cursos";
+$ModifyProfile = "Meu perfil";
+$MyStats = "Visualizar minhas estatísticas";
+$Logout = "Logout";
+$MyAgenda = "Minha agenda";
+$CourseHomepage = "Homepage do Curso";
+$CourseManagerview = "Visão do Professor";
+$StudentView = "Visão do Estudante";
 $AddResource = "Adicioná-lo";
 $AddedResources = "Recursos adicionados";
-$lang_modify_resource = "Modificar / Adicionar recursos";
-$lang_resource = "Recurso";
-$lang_resources = "Recursos";
 $langNameOfLang['arabic'] = "árabe";
 $langNameOfLang['brazilian'] = "português do brasil";
 $langNameOfLang['bulgarian'] = "bulgaro";
@@ -177,27 +170,27 @@ $langNameOfLang['russian'] = "russo";
 $langNameOfLang['simpl_chinese'] = "chinês_simpl";
 $langNameOfLang['spanish'] = "espanhol";
 $Close = "fechar";
-$langPlatform = "Plataforma";
+$Platform = "Plataforma";
 $localLangName = "Idioma";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Perdão, mas o código do curso já existe. Por favor escolha outro.";
+$CourseCodeAlreadyExists = "Perdão, mas o código do curso já existe. Por favor escolha outro.";
 $Statistics = "Estatísticas";
-$langGrouplist = "lista de grupos";
-$langPrevious = "prever";
+$Grouplist = "lista de grupos";
+$Previous = "prever";
 $DestDirectoryDoesntExist = "Diretório de destino inexistente";
 $Courses = "cursos";
 $In = "no";
-$langShowAll = "Exibir todos";
-$langPage = "Página";
+$ShowAll = "Exibir todos";
+$Page = "Página";
 $englishLangName = "Inglês";
 $Home = "Principal";
-$langAreYouSureToDelete = "Tem a certeza que desja excluir";
+$AreYouSureToDelete = "Tem a certeza que desja excluir";
 $SelectAll = "Selecionar tudo";
 $UnSelectAll = "desmarcar todos";
 $WithSelected = "Com os selecionados";
-$langOnLine = "Online";
-$langUsers = "usuários";
-$langPlatformAdmin = "Plataforma Administrativa";
+$OnLine = "Online";
+$Users = "usuários";
+$PlatformAdmin = "Plataforma Administrativa";
 $langNameOfLang['hungarian'] = "hungaro";
 $langNameOfLang['indonesian'] = "indonesia";
 $langNameOfLang['malay'] = "Malasia";
@@ -208,21 +201,20 @@ $langNameOfLang['thai'] = "tailandês";
 $langNameOfLang['turkce'] = "Turco";
 $langNameOfLang['vietnamese'] = "vietnamita";
 $UserInfo = "informações do usuário";
-$langModifyQuestion = "Modificar a questão";
-$langCheckAll = "Verificar tudo";
-$langNbAnnoucement = "Anúncio";
-$lang_no_access_here = "Você não tem permissão para acessar esta área";
-$langOtherCourses = "outros cursos";
+$ModifyQuestion = "Modificar a questão";
+$CheckAll = "Verificar tudo";
+$NbAnnoucement = "Anúncio";
+$OtherCourses = "outros cursos";
 $Doc = "Documentos";
 $PlataformAdmin = "Administrador da Plataforma";
 $Groups = "Grupos";
 $GroupManagement = "Gerenciamento de Grupo";
 $All = "Tudo";
 $None = "Nome";
-$langSorry = "Selecione um curso primeiro";
-$langDenied = "Esta função esta disponível somente para administradores de curso";
+$Sorry = "Selecione um curso primeiro";
+$Denied = "Esta função esta disponível somente para administradores de curso";
 $Today = "hoje";
-$langCourseHomepageLink = "curso atual";
+$CourseHomepageLink = "curso atual";
 $Attachment = "anexo";
 $User = "Usuário";
 $MondayInit = "S";
@@ -282,10 +274,10 @@ $SeptemberLong = "Setembro";
 $OctoberLong = "Outubro";
 $NovemberLong = "Novembro";
 $DecemberLong = "Dezembro";
-$langMyCompetences = "Minhas competências";
-$langMyDiplomas = "Meus diplomas";
-$langMyPersonalOpenArea = "Minha área pessoal aberta";
-$langMyTeach = "O que eu sou capaz de ensinar";
+$MyCompetences = "Minhas competências";
+$MyDiplomas = "Meus diplomas";
+$MyPersonalOpenArea = "Minha área pessoal aberta";
+$MyTeach = "O que eu sou capaz de ensinar";
 $Agenda = "Agenda";
 $HourShort = "h";
 $PleaseTryAgain = "Por favor tente novamente!";
@@ -295,7 +287,7 @@ $UplNotAZip = "O arquivo que você selecionou não é um arquivo zip.";
 $UplUploadSucceeded = "Arquivo enviado com sucesso!";
 $ExportAsCSV = "Exportar como arquivo CSV";
 $ExportAsXLS = "Exportar como arquivo XLS";
-$langOpenarea = "Área pessoal aberta";
+$Openarea = "Área pessoal aberta";
 $Done = "Concluido";
 $Documents = "Documentos";
 $DocumentAdded = "Documento adicionado";
@@ -309,7 +301,7 @@ $Link = "Link";
 $Announcement = "Anúncios";
 $Dropbox = "Caixa de entrega";
 $Quiz = "Exercícios";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Conferência";
 $Student_publication = "Publicações de Estudantes";
 $Tracking = "Acompanhamento";
@@ -322,8 +314,8 @@ $StartDate = "Data inicial";
 $EndDate = "Data final";
 $StartTime = "Horário inicial";
 $EndTime = "Horário final";
-$langYouWereCalled = "Você foi chamado para um chat com";
-$langDoYouAccept = "Você aceita?";
+$YouWereCalled = "Você foi chamado para um chat com";
+$DoYouAccept = "Você aceita?";
 $Everybody = "Todo mundo";
 $SentTo = "Enviar para";
 $Export = "Exportar";
@@ -347,7 +339,7 @@ $FormHasErrorsPleaseComplete = "O formulário contém dados incorretos ou incomp
 $StartDateShouldBeBeforeEndDate = "A data de início deve ser anterior a data final";
 $InvalidDate = "Data inválida";
 $OnlyLettersAndNumbersAllowed = "Somente letras e números são permitidos";
-$langBasicOverview = "Visualização básica";
+$BasicOverview = "Visualização básica";
 $CourseAdminRole = "Administrador do curso";
 $UserRole = "Função";
 $OnlyImagesAllowed = "Somente imagens PNG, JPG ou GIF são permitidas.";
@@ -357,16 +349,14 @@ $DeleteRight = "Apagar";
 $OverviewCourseRights = "Visão geral das funções e permissões";
 $SeeAllRightsAllLocationsForSpecificRole = "Função";
 $SeeAllRolesAllLocationsForSpecificRight = "Ver todas as funções e localizações para uma permissão específica";
-$langAdvanced = "Avançado";
+$Advanced = "Avançado";
 $RightValueModified = "O valor foi modificado com sucesso";
 $course_rights = "Visão geral das funções e permissões";
 $Visio_conference = "Vídeo-Conferência";
 $CourseAdminRoleDescription = "O Administrador do Curso";
-$Move = "Mover";
 $MoveTo = "Mover para";
 $Delete = "Apagar";
 $MoveFileTo = "Mover arquivo para";
-$Save = "Salvar";
 $Error = "Erro";
 $Anonymous = "Anônimo";
 $h = "h";
@@ -382,9 +372,9 @@ $YouHaveNewMessage = "Você possui uma nova mensagem!";
 $myActiveSessions = "Minhas sessões ativas";
 $myInactiveSessions = "Minhas sessões inativas";
 $FileUpload = "Arquivo enviado";
-$langMyActiveSessions = "Minhas sessões ativas";
-$langMyInActiveSessions = "Minhas sessões inativas";
-$langMySpace = "Meu espaço";
+$MyActiveSessions = "Minhas sessões ativas";
+$MyInActiveSessions = "Minhas sessões inativas";
+$MySpace = "Meu espaço";
 $ExtensionActivedButNotYetOperational = "Esta extensão foi ativada mas não se encontra operacional neste momento.";
 $MyStudents = "Meus alunos";
 $Progress = "Progresso";
@@ -801,7 +791,7 @@ $InvitationDenied = "Convite recusado";
 $UserAdded = "O usuário foi adicionado";
 $UpdatedIn = "Atualizado em";
 $Metadata = "Metadados";
-$langAddMetadata = "Visualizar/Editar metadados";
+$AddMetadata = "Visualizar/Editar metadados";
 $SendMessage = "Enviar uma mensagem";
 $SeeForum = "Ver fórum";
 $SeeMore = "Veja mais";

+ 97 - 107
main/lang/bulgarian/trad4all.inc.php

@@ -10,55 +10,53 @@ $Title = "Заглавие";
 $By = "От";
 $UsersOnline = "Посетители";
 $Remove = "Премахване";
-$langEnter = "Обратно към списъка с курсовете";
+$Enter = "Обратно към списъка с курсовете";
 $Description = "Описание";
 $Links = "Връзки";
-$langWorks = "Задачи";
+$Works = "Задачи";
 $Forums = "Форуми";
-$langExercices = "Тестове";
-$langCreateDir = "Създаване на папка";
+$Exercices = "Тестове";
+$CreateDir = "Създаване на папка";
 $Name = "Име";
-$langComment = "Коментар";
-$langVisible = "Видимост";
-$langNewDir = "Име на папката";
-$langDirCr = "Папката е създадена.";
+$Comment = "Коментар";
+$Visible = "Видимост";
+$NewDir = "Име на папката";
+$DirCr = "Папката е създадена.";
 $Download = "Сваляне";
-$langGroup = "Групи";
-$langEdit = "Редактиране";
-$langGroupForum = "Форум на групата";
+$Group = "Групи";
+$Edit = "Редактиране";
+$GroupForum = "Форум на групата";
 $Language = "Език";
 $LoginName = "Потребителско име";
 $AutostartMp3 = "Искате ли аудио-файлът да стартира автоматично?";
 $Assignments = "Задачи";
 $Forum = "Форуми";
-$langDelImage = "Премахване на снимката";
-$langCode = "Код на курса";
-$langUp = "Нагоре";
-$Down = "Надолу";
+$DelImage = "Премахване на снимката";
+$Code = "Код на курса";
 $Up = "Нагоре";
+$Down = "Надолу";
 $Theme = "Визуален стил";
 $TheListIsEmpty = "Списъкът е празен.";
-$langUniqueSelect = "Само един верен отговор";
+$UniqueSelect = "Само един верен отговор";
 $CreateCategory = "Създаване на категория";
 $SendFile = "Качване на документа";
 $SaveChanges = "Запис на промените";
 $SearchTerm = "Израз за търсене";
 $TooShort = "Изразът за търсене е твърде кратък или липсва.";
-$langCourseCreate = "Създаване на нов курс";
-$langTodo = "Предложения";
+$CourseCreate = "Създаване на нов курс";
+$Todo = "Предложения";
 $UserName = "Потребителско име";
-$lang_show_hide = "Показване/скриване";
-$langCategoryMod = "Редактиране на категория";
+$CategoryMod = "Редактиране на категория";
 $Hide = "Скриване";
-$langDear = "Уважаеми/Уважаема";
-$langArchive = "Архив";
-$langCourseCode = "Код на курса";
-$langNoDescription = "Няма описание.";
-$langOfficialCode = "Служебен код";
+$Dear = "Уважаеми/Уважаема";
+$Archive = "Архив";
+$CourseCode = "Код на курса";
+$NoDescription = "Няма описание.";
+$OfficialCode = "Служебен код";
 $FirstName = "Име";
 $LastName = "Фамилия";
 $Status = "Статус";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $SlideshowConversion = "Конвертиране на презентация";
 $UploadFile = "Качване на файла";
 $AvailableFrom = "Достъпен от";
@@ -68,7 +66,6 @@ $Type = "Тип";
 $EmailAddress = "E-mail адрес";
 $Organisation = "Организация";
 $Reporting = "Справки";
-$Code = "Код";
 $Update = "Обновяване";
 $SelectQuestionType = "Избор на тип въпрос";
 $CurrentCourse = "Текущ курс";
@@ -98,58 +95,54 @@ $dateFormatShort = "%d.%m.%Y";
 $dateFormatLong = "%A, %d %B %Y";
 $dateTimeFormatLong = "%d.%m.%Y, %H:%M";
 $timeNoSecFormat = "%H:%M";
-$langYes = "Да";
-$langNo = "Не";
+$Yes = "Да";
+$No = "Не";
 $Next = "Следващ";
-$langAllowed = "Разрешено";
-$langBackHome = "Обратно към главната страница";
-$langPropositions = "Предложения за подобряване на";
-$langMaj = "Обновяване";
-$langModify = "Промяна";
-$langDelete = "Изтриване";
-$langInvisible = "Скриване";
-$langSave = "Запиши";
-$langMove = "Преместване";
+$Allowed = "Разрешено";
+$BackHome = "Обратно към главната страница";
+$Propositions = "Предложения за подобряване на";
+$Maj = "Обновяване";
+$Modify = "Промяна";
+$Invisible = "Скриване";
+$Save = "Запиши";
+$Move = "Преместване";
 $Help = "Помощ";
-$langOk = "Добре (OK)";
-$langAdd = "Добави";
-$langAddIntro = "Добавяне на въведение";
-$langBackList = "Връщане към списъка";
-$langText = "Текст";
-$langEmpty = "Оставили сте някои полета празни.<br/>Използвайте бутона <b>\"Назад\"</b> на вашия браузър и опитайте отново.";
-$langConfirmYourChoice = "Моля, потвърдете действието.";
-$langAnd = "и";
-$langChoice = "Вашият избор";
-$langFinish = "Край";
-$langCancel = "Отказ";
-$langNotAllowed = "Нямате права.";
-$langNotLogged = "Вие не сте влезли в курса.";
-$langManager = "Администратор";
-$langOptional = "Незадължително";
+$Ok = "Добре (OK)";
+$Add = "Добави";
+$AddIntro = "Добавяне на въведение";
+$BackList = "Връщане към списъка";
+$Text = "Текст";
+$Empty = "Оставили сте някои полета празни.<br/>Използвайте бутона <b>\"Назад\"</b> на вашия браузър и опитайте отново.";
+$ConfirmYourChoice = "Моля, потвърдете действието.";
+$And = "и";
+$Choice = "Вашият избор";
+$Finish = "Край";
+$Cancel = "Отказ";
+$NotAllowed = "Нямате права.";
+$NotLogged = "Вие не сте влезли в курса.";
+$Manager = "Администратор";
+$Optional = "Незадължително";
 $NextPage = "Следваща страница";
 $PreviousPage = "Предишна страница";
-$langUse = "Използване";
-$langTotal = "Общо";
-$langTake = "вземи";
-$langOne = "Един";
-$langSeveral = "Няколко";
-$langNotice = "Забележка";
-$langDate = "Дата";
-$langAmong = "измежду";
-$langShow = "Показване";
-$langMyCourses = "Моите курсове";
-$langModifyProfile = "Моят профил";
-$langMyStats = "Преглед на моите посещения";
-$langLogout = "Напускане";
-$langMyAgenda = "Моята програма";
-$langCourseHomepage = "Страница на курса";
-$langCourseManagerview = "Изглед за преподавателя";
-$langStudentView = "Изглед за курсиста";
+$Use = "Използване";
+$Total = "Общо";
+$Take = "вземи";
+$One = "Един";
+$Several = "Няколко";
+$Notice = "Забележка";
+$Date = "Дата";
+$Among = "измежду";
+$Show = "Показване";
+$MyCourses = "Моите курсове";
+$ModifyProfile = "Моят профил";
+$MyStats = "Преглед на моите посещения";
+$Logout = "Напускане";
+$MyAgenda = "Моята програма";
+$CourseHomepage = "Страница на курса";
+$CourseManagerview = "Изглед за преподавателя";
+$StudentView = "Изглед за курсиста";
 $AddResource = "Добавяне";
 $AddedResources = "Прикрепени ресурси";
-$lang_modify_resource = "Промяна/добавяне на ресурс";
-$lang_resource = "Ресурс";
-$lang_resources = "Ресурси";
 $langNameOfLang['arabic'] = "арабски";
 $langNameOfLang['brazilian'] = "бразилски португалски";
 $langNameOfLang['bulgarian'] = "български";
@@ -173,27 +166,27 @@ $langNameOfLang['russian'] = "руски";
 $langNameOfLang['simpl_chinese'] = "китайски";
 $langNameOfLang['spanish'] = "испански";
 $Close = "Затваряне";
-$langPlatform = "Система";
+$Platform = "Система";
 $localLangName = "български";
 $email = "E-mail";
-$langCourseCodeAlreadyExists = "Този код на курс вече е зает. Моля, въведете друг код.";
+$CourseCodeAlreadyExists = "Този код на курс вече е зает. Моля, въведете друг код.";
 $Statistics = "Статистика";
-$langGrouplist = "Списък на групите";
-$langPrevious = "Предишен";
+$Grouplist = "Списък на групите";
+$Previous = "Предишен";
 $DestDirectoryDoesntExist = "Папката-приемник не съществува.";
 $Courses = "Курсове";
 $In = "в";
-$langShowAll = "Покажи всички";
-$langPage = "страница";
+$ShowAll = "Покажи всички";
+$Page = "страница";
 $englishLangName = "английски";
 $Home = "Начало";
-$langAreYouSureToDelete = "Желаете ли да изтриете";
+$AreYouSureToDelete = "Желаете ли да изтриете";
 $SelectAll = "Маркирай всички";
 $UnSelectAll = "Размаркирай всички";
 $WithSelected = "С маркираните";
-$langOnLine = "Посетители";
-$langUsers = "Потребители";
-$langPlatformAdmin = "Администратор";
+$OnLine = "Посетители";
+$Users = "Потребители";
+$PlatformAdmin = "Администратор";
 $langNameOfLang['hungarian'] = "унгарски";
 $langNameOfLang['indonesian'] = "индонезийски";
 $langNameOfLang['malay'] = "малайски";
@@ -204,21 +197,20 @@ $langNameOfLang['thai'] = "тайландски";
 $langNameOfLang['turkce'] = "турски";
 $langNameOfLang['vietnamese'] = "виетнамски";
 $UserInfo = "потребителска информация";
-$langModifyQuestion = "Промяна на въпроса";
-$langCheckAll = "Провери всички";
-$langNbAnnoucement = "Обяви";
-$lang_no_access_here = "Нямате достъп тук.";
-$langOtherCourses = "други курсове";
+$ModifyQuestion = "Промяна на въпроса";
+$CheckAll = "Провери всички";
+$NbAnnoucement = "Обяви";
+$OtherCourses = "други курсове";
 $Doc = "Документи";
 $PlataformAdmin = "Администратор";
 $Groups = "Групи";
 $GroupManagement = "Управление на групите";
 $All = "Всички";
 $None = "Няма";
-$langSorry = "Първо изберете курс.";
-$langDenied = "Това действие е позволено само за преподаватели.";
+$Sorry = "Първо изберете курс.";
+$Denied = "Това действие е позволено само за преподаватели.";
 $Today = "днес";
-$langCourseHomepageLink = "Начална страница";
+$CourseHomepageLink = "Начална страница";
 $Attachment = "Прикачен файл";
 $User = "Потребител";
 $MondayInit = "П";
@@ -278,10 +270,10 @@ $SeptemberLong = "Септeмври";
 $OctoberLong = "Октомври";
 $NovemberLong = "Ноември";
 $DecemberLong = "Декември";
-$langMyCompetences = "Моята квалификация";
-$langMyDiplomas = "Моите дипломи";
-$langMyPersonalOpenArea = "Моята лична страница";
-$langMyTeach = "Какво мога да преподавам";
+$MyCompetences = "Моята квалификация";
+$MyDiplomas = "Моите дипломи";
+$MyPersonalOpenArea = "Моята лична страница";
+$MyTeach = "Какво мога да преподавам";
 $Agenda = "Програма";
 $HourShort = "ч.";
 $PleaseTryAgain = "Моля, опитайте отново!";
@@ -291,7 +283,7 @@ $UplNotAZip = "Файлът, който сте избрали не е ZIP-фай
 $UplUploadSucceeded = "Файлът е качен.";
 $ExportAsCSV = "Експортиране като CSV-файл";
 $ExportAsXLS = "Експортиране като XLS-файл";
-$langOpenarea = "Лична страница";
+$Openarea = "Лична страница";
 $Done = "Извършено";
 $Documents = "Документи";
 $DocumentAdded = "Документът е добавен.";
@@ -304,7 +296,7 @@ $Link = "Връзки";
 $Announcement = "Обяви";
 $Dropbox = "Куриер";
 $Quiz = "Тестове";
-$langChat = "Говорилня";
+$Chat = "Говорилня";
 $Conference = "Конференция";
 $Student_publication = "Работи на курсистите";
 $Tracking = "Справки";
@@ -317,8 +309,8 @@ $StartDate = "Начална дата";
 $EndDate = "Крайна дата";
 $StartTime = "Начало";
 $EndTime = "Край";
-$langYouWereCalled = "Имате покана за разговор от";
-$langDoYouAccept = "Приемате ли?";
+$YouWereCalled = "Имате покана за разговор от";
+$DoYouAccept = "Приемате ли?";
 $Everybody = "Всички";
 $SentTo = "Изпращане до";
 $Export = "Експортиране";
@@ -342,7 +334,7 @@ $FormHasErrorsPleaseComplete = "Във формуляра не са попълн
 $StartDateShouldBeBeforeEndDate = "Началната дата трябва да предхожда крайната дата.";
 $InvalidDate = "Невалидна дата";
 $OnlyLettersAndNumbersAllowed = "Позволени са само букви и цифри.";
-$langBasicOverview = "Подредба";
+$BasicOverview = "Подредба";
 $CourseAdminRole = "Преподавател";
 $UserRole = "Роля";
 $OnlyImagesAllowed = "Позволени са изображения само във файловите формати PNG, JPG (JPEG) или GIF.";
@@ -352,16 +344,14 @@ $DeleteRight = "Изтриване";
 $OverviewCourseRights = "Преглед на ролите и правата";
 $SeeAllRightsAllLocationsForSpecificRole = "За роля";
 $SeeAllRolesAllLocationsForSpecificRight = "За правото";
-$langAdvanced = "Създаване";
+$Advanced = "Създаване";
 $RightValueModified = "Стойността е променена.";
 $course_rights = "Преглед на ролите и правата";
 $Visio_conference = "Виртуална среща";
 $CourseAdminRoleDescription = "Преподавател";
-$Move = "Преместване";
 $MoveTo = "Преместване към";
 $Delete = "Изтриване";
 $MoveFileTo = "Преместване на файла в";
-$Save = "Записване";
 $Error = "Грешка!";
 $Anonymous = "Анонимен посетител";
 $h = " ч.";
@@ -377,9 +367,9 @@ $YouHaveNewMessage = "Имате ново съобщение.";
 $myActiveSessions = "Моите активни сесии";
 $myInactiveSessions = "Моите неактивни сесии";
 $FileUpload = "Качване";
-$langMyActiveSessions = "Моите активни сесии";
-$langMyInActiveSessions = "Моите неактивни сесии";
-$langMySpace = "Справки";
+$MyActiveSessions = "Моите активни сесии";
+$MyInActiveSessions = "Моите неактивни сесии";
+$MySpace = "Справки";
 $ExtensionActivedButNotYetOperational = "Разширението е активирано, но в момента не може да работи.";
 $MyStudents = "Моите курсисти";
 $Progress = "Напредък";
@@ -784,7 +774,7 @@ $InvitationDenied = "Поканата е отказана.";
 $UserAdded = "Добавен е потребител.";
 $UpdatedIn = "Актуализиран на";
 $Metadata = "Метаданни";
-$langAddMetadata = "Преглед / редактиране на метаданните";
+$AddMetadata = "Преглед / редактиране на метаданните";
 $SendMessage = "Изпращане на съобщение";
 $SeeForum = "Към форума";
 $NoDataAvailable = "Няма данни.";

+ 97 - 107
main/lang/catalan/trad4all.inc.php

@@ -142,55 +142,53 @@ $Title = "Títol";
 $By = "Publicat per";
 $UsersOnline = "Usuaris connectats";
 $Remove = "Esborra";
-$langEnter = "Retorna a la llista dels meus cursos";
+$Enter = "Retorna a la llista dels meus cursos";
 $Description = "Descripció";
 $Links = "Enllaços";
-$langWorks = "Treballs dels estudiants";
+$Works = "Treballs dels estudiants";
 $Forums = "Fòrums";
-$langExercices = "Exercicis";
-$langCreateDir = "Crea un directori";
+$Exercices = "Exercicis";
+$CreateDir = "Crea un directori";
 $Name = "Nom";
-$langComment = "Comenta";
-$langVisible = "Visible/invisible";
-$langNewDir = "Nom de la nova carpeta";
-$langDirCr = "Directori creat";
+$Comment = "Comenta";
+$Visible = "Visible/invisible";
+$NewDir = "Nom de la nova carpeta";
+$DirCr = "Directori creat";
 $Download = "Descarrega";
-$langGroup = "Grup";
-$langEdit = "Edita";
-$langGroupForum = "Fòrum";
+$Group = "Grup";
+$Edit = "Edita";
+$GroupForum = "Fòrum";
 $Language = "Llenguatge";
 $LoginName = "Nom d'usuari";
 $AutostartMp3 = "Pressioni Acceptar si desitja que l'arxiu d'àudio es reprodueixi automàticament";
 $Assignments = "Assignments";
 $Forum = "Fòrums";
-$langDelImage = "Eliminar foto";
-$langCode = "Codi del curs";
-$langUp = "Amunt";
+$DelImage = "Eliminar foto";
+$Code = "Codi del curs";
+$Up = "Amunt";
 $Down = "Avall";
-$Up = "amunt";
 $Theme = "Tema";
 $TheListIsEmpty = "La llista és complerta";
-$langUniqueSelect = " Elecció múltiple (Resposta única)";
+$UniqueSelect = " Elecció múltiple (Resposta única)";
 $CreateCategory = "Crear categoria";
 $SendFile = "Enviar arxiu";
 $SaveChanges = "Guardar canvis";
 $SearchTerm = "Paraula a cercar";
 $TooShort = "Molt curt";
-$langCourseCreate = "Crear un curs web";
-$langTodo = "Activitats a fer";
+$CourseCreate = "Crear un curs web";
+$Todo = "Activitats a fer";
 $UserName = "Nom d'usuari";
-$lang_show_hide = "Mostrar / ocultar";
-$langCategoryMod = "Modificar categoria";
+$CategoryMod = "Modificar categoria";
 $Hide = "Ocultar";
-$langDear = "Estimat/da";
-$langArchive = "arxiu";
-$langCourseCode = "Codi del curs";
-$langNoDescription = "Sense descripció";
-$langOfficialCode = "Codi oficial";
+$Dear = "Estimat/da";
+$Archive = "arxiu";
+$CourseCode = "Codi del curs";
+$NoDescription = "Sense descripció";
+$OfficialCode = "Codi oficial";
 $FirstName = "Nom";
 $LastName = "Cognom";
 $Status = "Perfil";
-$langEmail = "Correu electrònic";
+$Email = "Correu electrònic";
 $SlideshowConversion = "Conversió de la presentació";
 $UploadFile = "Enviar arxiu";
 $AvailableFrom = "Disponible des de";
@@ -200,7 +198,6 @@ $Type = "Tipus";
 $EmailAddress = "Adreça de correu electrònic";
 $Organisation = "Organització";
 $Reporting = "Informes";
-$Code = "Codi";
 $Update = "Actualitzar";
 $SelectQuestionType = "Seleccionar tipus";
 $CurrentCourse = "Curs actual";
@@ -230,58 +227,54 @@ $dateFormatShort = "%d %b, %y";
 $dateFormatLong = "%A, %d de %B del %Y";
 $dateTimeFormatLong = "%A, %d de %B del %Y a les %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "sí";
-$langNo = "No";
+$Yes = "sí";
+$No = "No";
 $Next = "Seguent";
-$langAllowed = "Permés";
-$langBackHome = "Retorna a la Plana Principal de";
-$langPropositions = "Sugereix com millorar";
-$langMaj = "Actualitza";
-$langModify = "Modificar";
-$langDelete = "Esborrar";
-$langInvisible = "Fes-ho invisible";
-$langSave = "Guarda";
-$langMove = "Moure";
+$Allowed = "Permés";
+$BackHome = "Retorna a la Plana Principal de";
+$Propositions = "Sugereix com millorar";
+$Maj = "Actualitza";
+$Modify = "Modificar";
+$Invisible = "Fes-ho invisible";
+$Save = "Guarda";
+$Move = "Moure";
 $Help = "Ajuda";
-$langOk = "D'acord";
-$langAdd = "Afegeix";
-$langAddIntro = "Afegir un text d'introducció";
-$langBackList = "Tornar a la llista";
-$langText = "Text";
-$langEmpty = "Heu deixat alguns camps buits.<br>Utilitzeu el bot <b>Enrera</b> del vostre navegador i proveu un altre cop.<br>Si desconeixeu el codi del vostre curs, mireu el programa del curs";
-$langConfirmYourChoice = "Si us plau confirmeu la vostra seleccio";
-$langAnd = "i";
-$langChoice = "La teva opció";
-$langFinish = "Finalitza";
-$langCancel = "Cancela";
-$langNotAllowed = "No perm&ecute;s";
-$langNotLogged = "No estàs autentificat en el curs";
-$langManager = "Responsable";
-$langOptional = "Opcional";
+$Ok = "D'acord";
+$Add = "Afegeix";
+$AddIntro = "Afegir un text d'introducció";
+$BackList = "Tornar a la llista";
+$Text = "Text";
+$Empty = "Heu deixat alguns camps buits.<br>Utilitzeu el bot <b>Enrera</b> del vostre navegador i proveu un altre cop.<br>Si desconeixeu el codi del vostre curs, mireu el programa del curs";
+$ConfirmYourChoice = "Si us plau confirmeu la vostra seleccio";
+$And = "i";
+$Choice = "La teva opció";
+$Finish = "Finalitza";
+$Cancel = "Cancela";
+$NotAllowed = "No perm&ecute;s";
+$NotLogged = "No estàs autentificat en el curs";
+$Manager = "Responsable";
+$Optional = "Opcional";
 $NextPage = "Pàgina seguent";
 $PreviousPage = "Pàgina anterior";
-$langUse = "Usar";
-$langTotal = "Total";
-$langTake = "Passar la prova";
-$langOne = "Un";
-$langSeveral = "Varis";
-$langNotice = "Noticia";
-$langDate = "Data";
-$langAmong = "entre";
-$langShow = "Mostrar";
-$langMyCourses = "La meva llista de cursos";
-$langModifyProfile = "Modifica el meu perfil";
-$langMyStats = "Veure les meves estadístiques";
-$langLogout = "Sortir";
-$langMyAgenda = "Agenda personal";
-$langCourseHomepage = "Pàgina principal del curs";
-$langCourseManagerview = "Vista del professor";
-$langStudentView = "Vista de l'estudiant";
+$Use = "Usar";
+$Total = "Total";
+$Take = "Passar la prova";
+$One = "Un";
+$Several = "Varis";
+$Notice = "Noticia";
+$Date = "Data";
+$Among = "entre";
+$Show = "Mostrar";
+$MyCourses = "La meva llista de cursos";
+$ModifyProfile = "Modifica el meu perfil";
+$MyStats = "Veure les meves estadístiques";
+$Logout = "Sortir";
+$MyAgenda = "Agenda personal";
+$CourseHomepage = "Pàgina principal del curs";
+$CourseManagerview = "Vista del professor";
+$StudentView = "Vista de l'estudiant";
 $AddResource = "Afegir";
 $AddedResources = "Annexes";
-$lang_modify_resource = "Modificar / afegir recursos";
-$lang_resource = "Recurs";
-$lang_resources = "Recursos";
 $langNameOfLang['arabic'] = "Àrab";
 $langNameOfLang['brazilian'] = "Portugués Brazil";
 $langNameOfLang['bulgarian'] = "Bulgar";
@@ -305,27 +298,27 @@ $langNameOfLang['russian'] = "Rus";
 $langNameOfLang['simpl_chinese'] = "Xinès simple";
 $langNameOfLang['spanish'] = "Espanyol";
 $Close = "Tanca";
-$langPlatform = "Plataforma basada en";
+$Platform = "Plataforma basada en";
 $localLangName = "idioma";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Trist, però aquell codi de curs ja existeix. Si us plau esculli'n un altre.";
+$CourseCodeAlreadyExists = "Trist, però aquell codi de curs ja existeix. Si us plau esculli'n un altre.";
 $Statistics = "Estadístiques";
-$langGrouplist = "Llista de grups";
-$langPrevious = "previ";
+$Grouplist = "Llista de grups";
+$Previous = "previ";
 $DestDirectoryDoesntExist = "El directori de destinació no existeix";
 $Courses = "Cursos";
 $In = "en";
-$langShowAll = "Mostrar tots";
-$langPage = "Pàgina";
+$ShowAll = "Mostrar tots";
+$Page = "Pàgina";
 $englishLangName = "Anglès";
 $Home = "Pàgina inicial";
-$langAreYouSureToDelete = "Estàs segur que vols esborrar?";
+$AreYouSureToDelete = "Estàs segur que vols esborrar?";
 $SelectAll = "Seleccionar tot";
 $UnSelectAll = "desmarcar tots";
 $WithSelected = "Amb els seleccionats";
-$langOnLine = "Online";
-$langUsers = "Usuaris";
-$langPlatformAdmin = "Administrador de l'entorn";
+$OnLine = "Online";
+$Users = "Usuaris";
+$PlatformAdmin = "Administrador de l'entorn";
 $langNameOfLang['hungarian'] = "Hongarès";
 $langNameOfLang['indonesian'] = "Indonesi";
 $langNameOfLang['malay'] = "Malai";
@@ -336,22 +329,21 @@ $langNameOfLang['thai'] = "Tailandès";
 $langNameOfLang['turkce'] = "Turc";
 $langNameOfLang['vietnamese'] = "Vietnamita";
 $UserInfo = "Informació de l'usuari";
-$langModifyQuestion = "Modificar la pregunta";
+$ModifyQuestion = "Modificar la pregunta";
 $Example = "Exemple";
-$langCheckAll = "Verificar tot";
-$langNbAnnoucement = "Anunci";
-$lang_no_access_here = "No té accés aquí";
-$langOtherCourses = "Altres cursos";
+$CheckAll = "Verificar tot";
+$NbAnnoucement = "Anunci";
+$OtherCourses = "Altres cursos";
 $Doc = "Document";
 $PlataformAdmin = "Administrador de l'entorn";
 $Groups = "Grups";
 $GroupManagement = "Administració del grup";
 $All = "Tot";
 $None = "Res";
-$langSorry = "Seleccioni primer un curs";
-$langDenied = "Aquesta funció només està disponible per als administradors del curs";
+$Sorry = "Seleccioni primer un curs";
+$Denied = "Aquesta funció només està disponible per als administradors del curs";
 $Today = "avui";
-$langCourseHomepageLink = "Curs actual";
+$CourseHomepageLink = "Curs actual";
 $Attachment = "Annexes";
 $User = "Usuari";
 $MondayInit = "Dl";
@@ -411,10 +403,10 @@ $SeptemberLong = "Septembre";
 $OctoberLong = "Octubre";
 $NovemberLong = "Novembre";
 $DecemberLong = "Decembre";
-$langMyCompetences = "Les meves competències";
-$langMyDiplomas = "Els meus títols";
-$langMyPersonalOpenArea = "La meva àrea pública";
-$langMyTeach = "Quin puc ensenyar";
+$MyCompetences = "Les meves competències";
+$MyDiplomas = "Els meus títols";
+$MyPersonalOpenArea = "La meva àrea pública";
+$MyTeach = "Quin puc ensenyar";
 $Agenda = "Agenda";
 $HourShort = "h";
 $PleaseTryAgain = "Si us plau provi una altra vegada!";
@@ -424,7 +416,7 @@ $UplNotAZip = "L'arxiu que has seleccionat no és un arxiu zip.";
 $UplUploadSucceeded = "L'arxiu ha estat enviat!";
 $ExportAsCSV = "Exportar a un arxiu CSV";
 $ExportAsXLS = "Exportar a un arxiu XLS";
-$langOpenarea = "Àrea personal pública";
+$Openarea = "Àrea personal pública";
 $Done = "Fet";
 $Documents = "Documents";
 $DocumentAdded = "Documents afegits";
@@ -438,7 +430,7 @@ $Link = "Link";
 $Announcement = "Anuncis";
 $Dropbox = "Dropbox";
 $Quiz = "Exercicis";
-$langChat = "Xat";
+$Chat = "Xat";
 $Conference = "Conferència";
 $Student_publication = "Publicacions dels estudiants";
 $Tracking = "Seguiment";
@@ -451,8 +443,8 @@ $StartDate = "Data inici";
 $EndDate = "Data final";
 $StartTime = "Hora inici";
 $EndTime = "Hora final";
-$langYouWereCalled = "El truquen per xatear amb";
-$langDoYouAccept = "Ho acceptes?";
+$YouWereCalled = "El truquen per xatear amb";
+$DoYouAccept = "Ho acceptes?";
 $Everybody = "Tothom";
 $SentTo = "Visible per a";
 $Export = "Exportar";
@@ -476,7 +468,7 @@ $FormHasErrorsPleaseComplete = "Aquest formulari conté dades incorrectes o inco
 $StartDateShouldBeBeforeEndDate = "La data d'inici ha de ser anterior a la data final";
 $InvalidDate = "Data no vàlida";
 $OnlyLettersAndNumbersAllowed = "Només es permeten lletres i nombres";
-$langBasicOverview = "Organitzar";
+$BasicOverview = "Organitzar";
 $CourseAdminRole = "Administrador del curs";
 $UserRole = "Rol";
 $OnlyImagesAllowed = "Solament estan permeses imatges PNG, JPG i GIF";
@@ -486,16 +478,14 @@ $DeleteRight = "Eliminar";
 $OverviewCourseRights = "Descripció de rols i permisos";
 $SeeAllRightsAllLocationsForSpecificRole = "Rol";
 $SeeAllRolesAllLocationsForSpecificRight = "Veure tots els rols i localitzacions per a un permís específic";
-$langAdvanced = "Avançat";
+$Advanced = "Avançat";
 $RightValueModified = "El valor ha estat modificat";
 $course_rights = "Configuració de rols i permisos";
 $Visio_conference = "Reunió per videoconferència";
 $CourseAdminRoleDescription = "Administrador del curs";
-$Move = "Moure";
 $MoveTo = "Moure a";
 $Delete = "Eliminar";
 $MoveFileTo = "Moure arxiu a";
-$Save = "Guardar";
 $Error = "Error";
 $Anonymous = "Anònim";
 $h = "h";
@@ -511,9 +501,9 @@ $YouHaveNewMessage = "Té un nou missatge";
 $myActiveSessions = "Les meues sessions actives";
 $myInactiveSessions = "Les meves sessions no actives";
 $FileUpload = "Enviament d'arxiu";
-$langMyActiveSessions = "Les meves sessions actives";
-$langMyInActiveSessions = "Les meves sessions no actives";
-$langMySpace = "Informes";
+$MyActiveSessions = "Les meves sessions actives";
+$MyInActiveSessions = "Les meves sessions no actives";
+$MySpace = "Informes";
 $ExtensionActivedButNotYetOperational = "Aquesta extensió ha estat activada però, ara com ara, no pot estar operativa.";
 $MyStudents = "Els meus estudiants";
 $Progress = "Progrés";
@@ -931,7 +921,7 @@ $InvitationDenied = "Invitació denegada";
 $UserAdded = "L'usuari ha estat afegit";
 $UpdatedIn = "Actualitzat";
 $Metadata = "Metadades";
-$langAddMetadata = "Mostra/Edita metadades";
+$AddMetadata = "Mostra/Edita metadades";
 $SendMessage = "Envia missatge";
 $SeeForum = "Veure fòrum";
 $SeeMore = "Veure més";

+ 96 - 106
main/lang/croatian/trad4all.inc.php

@@ -9,50 +9,48 @@ $Title = "Naslov";
 $By = "Od";
 $UsersOnline = "Aktivnih korisnika";
 $Remove = "Ukloni";
-$langEnter = "Povratak na popis kolegija";
+$Enter = "Povratak na popis kolegija";
 $Description = "Opis";
 $Links = "Poveznice";
-$langWorks = "Studentski radovi";
+$Works = "Studentski radovi";
 $Forums = "Forumi";
-$langExercices = "Vježbe";
-$langCreateDir = "Izrada mape";
+$Exercices = "Vježbe";
+$CreateDir = "Izrada mape";
 $Name = "Naziv";
-$langComment = "Opaska";
-$langVisible = "Vidljivo/nevidljivo";
-$langNewDir = "Ime nove mape";
-$langDirCr = "Mapa izrađena";
+$Comment = "Opaska";
+$Visible = "Vidljivo/nevidljivo";
+$NewDir = "Ime nove mape";
+$DirCr = "Mapa izrađena";
 $Download = "Učitati";
-$langGroup = "Skupina";
-$langEdit = "uredi";
-$langGroupForum = "Forum skupine";
+$Group = "Skupina";
+$Edit = "uredi";
+$GroupForum = "Forum skupine";
 $Language = "Jezične postavke";
 $LoginName = "Korisničko ime";
 $AutostartMp3 = "Odaberite OK ukoliko želite pokrenuti audio datoteku automatski";
 $Assignments = "Studentski radovi";
 $Forum = "Forumi";
-$langDelImage = "Ukloni sliku";
-$langCode = "Šifra kolegija";
-$langUp = "Gore";
+$DelImage = "Ukloni sliku";
+$Code = "Šifra kolegija";
+$Up = "Gore";
 $Down = "dolje";
-$Up = "gore";
 $Theme = "Tema";
 $TheListIsEmpty = "Popis prazan.";
-$langUniqueSelect = "Višestruki izbor (Jedan odgovor)";
-$langCourseCreate = "Izradi web stranice kolegija";
-$langTodo = "Učiniti";
+$UniqueSelect = "Višestruki izbor (Jedan odgovor)";
+$CourseCreate = "Izradi web stranice kolegija";
+$Todo = "Učiniti";
 $UserName = "Korisničko ime";
-$lang_show_hide = "Prikaži/sakrij";
-$langCategoryMod = "Izmijeni kategoriju";
+$CategoryMod = "Izmijeni kategoriju";
 $Hide = "Sakrij";
-$langDear = "Poštovani";
-$langArchive = "Arhiva";
-$langCourseCode = "Šifra kolegija";
-$langNoDescription = "Bez opisa";
-$langOfficialCode = "Službena šifra";
+$Dear = "Poštovani";
+$Archive = "Arhiva";
+$CourseCode = "Šifra kolegija";
+$NoDescription = "Bez opisa";
+$OfficialCode = "Službena šifra";
 $FirstName = "Ime";
 $LastName = "Prezime";
 $Status = "Status";
-$langEmail = "Elektronička pošta";
+$Email = "Elektronička pošta";
 $SlideshowConversion = "Pretvorba prezentacije";
 $UploadFile = "Prijenos datoteke";
 $AvailableFrom = "Raspoloživ od";
@@ -62,7 +60,6 @@ $Type = "Vrsta";
 $EmailAddress = "E-pošta adresa";
 $Organisation = "Organizacija";
 $Reporting = "Izvještavanje";
-$Code = "Šifra";
 $Update = "Ažuriraj";
 $CurrentCourse = "Trenutni kolegij";
 $Back = "Nazad";
@@ -91,58 +88,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "da";
-$langNo = "Ne";
+$Yes = "da";
+$No = "Ne";
 $Next = "Sljedeći";
-$langAllowed = "Dopušteno";
-$langBackHome = "Povratak na početnu stranicu";
-$langPropositions = "Prijedlozi poboljšanja";
-$langMaj = "Ažuriraj";
-$langModify = "izmijeni";
-$langDelete = "izbriši";
-$langInvisible = "Učini nevidljivim";
-$langSave = "Spremi";
-$langMove = "Premjesti";
+$Allowed = "Dopušteno";
+$BackHome = "Povratak na početnu stranicu";
+$Propositions = "Prijedlozi poboljšanja";
+$Maj = "Ažuriraj";
+$Modify = "izmijeni";
+$Invisible = "Učini nevidljivim";
+$Save = "Spremi";
+$Move = "Premjesti";
 $Help = "Pomoć";
-$langOk = "U redu";
-$langAdd = "Dodaj";
-$langAddIntro = "Dodaj uvodni tekst";
-$langBackList = "Povratak na popis";
-$langText = "Tekst";
-$langEmpty = " Niste ispunili sve podatke.<br> Tipkom <b>Back</b> vratite se i pokušajte ponovno.<br>Ne sjećate li se šifre kolegija, pogledajte u Program kolegija";
-$langConfirmYourChoice = "Molim potvrdite odabir";
-$langAnd = "i";
-$langChoice = "Vaš izbor";
-$langFinish = "Kraj";
-$langCancel = "Odustani";
-$langNotAllowed = "Nije dopušteno";
-$langNotLogged = "Niste prijavljeni na kolegij";
-$langManager = "Manager";
-$langOptional = "Neobvezno";
+$Ok = "U redu";
+$Add = "Dodaj";
+$AddIntro = "Dodaj uvodni tekst";
+$BackList = "Povratak na popis";
+$Text = "Tekst";
+$Empty = " Niste ispunili sve podatke.<br> Tipkom <b>Back</b> vratite se i pokušajte ponovno.<br>Ne sjećate li se šifre kolegija, pogledajte u Program kolegija";
+$ConfirmYourChoice = "Molim potvrdite odabir";
+$And = "i";
+$Choice = "Vaš izbor";
+$Finish = "Kraj";
+$Cancel = "Odustani";
+$NotAllowed = "Nije dopušteno";
+$NotLogged = "Niste prijavljeni na kolegij";
+$Manager = "Manager";
+$Optional = "Neobvezno";
 $NextPage = "Sljedeća stranica";
 $PreviousPage = "Prethodna stranica";
-$langUse = "Uporaba";
-$langTotal = "Ukupno";
-$langTake = "uzmi";
-$langOne = "Jedan";
-$langSeveral = "Više";
-$langNotice = "Obavijest";
-$langDate = "Nadnevak";
-$langAmong = "među";
-$langShow = "Prikaži";
-$langMyCourses = "Moji predmeti";
-$langModifyProfile = "Izmijeni profil";
-$langMyStats = "Pogled u moju statistiku";
-$langLogout = "Odjava";
-$langMyAgenda = "Moj raspored";
-$langCourseHomepage = "Početna stranica kolegija";
-$langCourseManagerview = "Predavačev pogled";
-$langStudentView = "Studentov pogled";
+$Use = "Uporaba";
+$Total = "Ukupno";
+$Take = "uzmi";
+$One = "Jedan";
+$Several = "Više";
+$Notice = "Obavijest";
+$Date = "Nadnevak";
+$Among = "među";
+$Show = "Prikaži";
+$MyCourses = "Moji predmeti";
+$ModifyProfile = "Izmijeni profil";
+$MyStats = "Pogled u moju statistiku";
+$Logout = "Odjava";
+$MyAgenda = "Moj raspored";
+$CourseHomepage = "Početna stranica kolegija";
+$CourseManagerview = "Predavačev pogled";
+$StudentView = "Studentov pogled";
 $AddResource = "Dodaj";
 $AddedResources = "Prilozi";
-$lang_modify_resource = "Izmijeni/Dodaj resurse";
-$lang_resource = "Resurs";
-$lang_resources = "Resursi";
 $langNameOfLang['arabic'] = "arapski";
 $langNameOfLang['brazilian'] = "brazilski portugalski";
 $langNameOfLang['bulgarian'] = "bugarski";
@@ -166,27 +159,27 @@ $langNameOfLang['russian'] = "ruski";
 $langNameOfLang['simpl_chinese'] = "pojednostavljeni kineski";
 $langNameOfLang['spanish'] = "španjolski";
 $Close = "Zatvorite";
-$langPlatform = "Platforma";
+$Platform = "Platforma";
 $localLangName = "jezik";
 $email = "elektronička pošta";
-$langCourseCodeAlreadyExists = "Žao nam je, ali ta je šifra kolegija već u uporabi. Molimo odaberite drugu.";
+$CourseCodeAlreadyExists = "Žao nam je, ali ta je šifra kolegija već u uporabi. Molimo odaberite drugu.";
 $Statistics = "Statistika";
-$langGrouplist = "popis skupina";
-$langPrevious = "prethodni";
+$Grouplist = "popis skupina";
+$Previous = "prethodni";
 $DestDirectoryDoesntExist = "Odabrana mapa ne postoji";
 $Courses = "kolegiji";
 $In = "u";
-$langShowAll = "Prikaži sve";
-$langPage = "Stranica";
+$ShowAll = "Prikaži sve";
+$Page = "Stranica";
 $englishLangName = "engleski";
 $Home = "Početna stranica";
-$langAreYouSureToDelete = "Želite li doista izbrisati";
+$AreYouSureToDelete = "Želite li doista izbrisati";
 $SelectAll = "Označi sve";
 $UnSelectAll = "poništi odabir svega";
 $WithSelected = "S odabranim";
-$langOnLine = "Aktivnih";
-$langUsers = "Korisnici";
-$langPlatformAdmin = "Nadzor platforme";
+$OnLine = "Aktivnih";
+$Users = "Korisnici";
+$PlatformAdmin = "Nadzor platforme";
 $langNameOfLang['hungarian'] = "ma&#273;arski";
 $langNameOfLang['indonesian'] = "indonezijski";
 $langNameOfLang['malay'] = "malajski";
@@ -197,21 +190,20 @@ $langNameOfLang['thai'] = "tajlandski";
 $langNameOfLang['turkce'] = "turski";
 $langNameOfLang['vietnamese'] = "vijetnamski";
 $UserInfo = "podatci o korisniku";
-$langModifyQuestion = "Izmijeni pitanje";
-$langCheckAll = "Označi sve";
-$langNbAnnoucement = "Obavijest";
-$lang_no_access_here = "Zabranjen pristup";
-$langOtherCourses = "drugi kolegiji";
+$ModifyQuestion = "Izmijeni pitanje";
+$CheckAll = "Označi sve";
+$NbAnnoucement = "Obavijest";
+$OtherCourses = "drugi kolegiji";
 $Doc = "dokument";
 $PlataformAdmin = "Nadzornik platforme";
 $Groups = "Skupine";
 $GroupManagement = "Upravljanje skupinom";
 $All = "sve";
 $None = "ništa";
-$langSorry = "Najprije odaberite kolegij";
-$langDenied = "Funkcija je dostupna samo nadzornicima kolegija";
+$Sorry = "Najprije odaberite kolegij";
+$Denied = "Funkcija je dostupna samo nadzornicima kolegija";
 $Today = "danas";
-$langCourseHomepageLink = "Aktualni kolegij";
+$CourseHomepageLink = "Aktualni kolegij";
 $Attachment = "prilog";
 $User = "Korisnik";
 $MondayInit = "P";
@@ -271,10 +263,10 @@ $SeptemberLong = "Rujan";
 $OctoberLong = "Listopad";
 $NovemberLong = "Studeni";
 $DecemberLong = "Prosinac";
-$langMyCompetences = "Moje vještine";
-$langMyDiplomas = "Moje svjedodžbe";
-$langMyPersonalOpenArea = "Moje osobno otvoreno područje";
-$langMyTeach = "Što mogu podučavati";
+$MyCompetences = "Moje vještine";
+$MyDiplomas = "Moje svjedodžbe";
+$MyPersonalOpenArea = "Moje osobno otvoreno područje";
+$MyTeach = "Što mogu podučavati";
 $Agenda = "Raspored";
 $HourShort = ":";
 $PleaseTryAgain = "Molim pkušajte ponovno!";
@@ -284,7 +276,7 @@ $UplNotAZip = "Odabrana datoteka nije bila formata zip.";
 $UplUploadSucceeded = "Učitavanje datoteke uspješno!";
 $ExportAsCSV = "Prenesi datoteku u formatu CSV";
 $ExportAsXLS = "Prenesi datoteku u formatu XLS";
-$langOpenarea = "Osobi otvoreni prostor";
+$Openarea = "Osobi otvoreni prostor";
 $Done = "Dovršeno";
 $Documents = "Dokumenti";
 $DocumentAdded = "Dokument dodan";
@@ -297,7 +289,7 @@ $Link = "Poveznica";
 $Announcement = "Obavijesti";
 $Dropbox = "Pretinac";
 $Quiz = "Vježbe";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Konferencija";
 $Student_publication = "Studentski radovi";
 $Tracking = "Praćenje";
@@ -310,8 +302,8 @@ $StartDate = "Nadnevak početka";
 $EndDate = "Nadnevak svršetka";
 $StartTime = "Vrijeme početka";
 $EndTime = "Vrijeme svršetka";
-$langYouWereCalled = "Pozvani ste na chat s";
-$langDoYouAccept = "Prihvaćate li?";
+$YouWereCalled = "Pozvani ste na chat s";
+$DoYouAccept = "Prihvaćate li?";
 $Everybody = "Svi";
 $SentTo = "Vidljivo";
 $Export = "Prenesi";
@@ -335,7 +327,7 @@ $FormHasErrorsPleaseComplete = "Forma sadrži netočne ili nepotpune podatke. Mo
 $StartDateShouldBeBeforeEndDate = "Početni datum mora biti prije završnog datuma";
 $InvalidDate = "Netočan datum";
 $OnlyLettersAndNumbersAllowed = "Dozvoljeni su samo slova i brojevi";
-$langBasicOverview = "Organiziraj";
+$BasicOverview = "Organiziraj";
 $CourseAdminRole = "Upravitelj kolegija";
 $UserRole = "Status";
 $OnlyImagesAllowed = "Dozvoljene su slike samo PNG, JPG ili GIF formata";
@@ -345,16 +337,14 @@ $DeleteRight = "Izbriši";
 $OverviewCourseRights = "Pregled statusa i prava";
 $SeeAllRightsAllLocationsForSpecificRole = "Izdvoji prema statusu";
 $SeeAllRolesAllLocationsForSpecificRight = "Izdvoji prema pravu";
-$langAdvanced = "Napredni način";
+$Advanced = "Napredni način";
 $RightValueModified = "Vrijednost je promijenjena";
 $course_rights = "Pregled statusa i prava";
 $Visio_conference = "Video konferencija";
 $CourseAdminRoleDescription = "Upravitelj kolegija";
-$Move = "Premjesti";
 $MoveTo = "Premjesti u";
 $Delete = "Obriši";
 $MoveFileTo = "Premjesti datoteku u";
-$Save = "Spremi";
 $Error = "Greška";
 $Anonymous = "Anonimno";
 $h = "h";
@@ -370,9 +360,9 @@ $YouHaveNewMessage = "Imate novu poruku !";
 $myActiveSessions = "Moje aktivne sesije";
 $myInactiveSessions = "Moje neaktivne sesije";
 $FileUpload = "Prijenos datoteke";
-$langMyActiveSessions = "Moje aktivne sesije";
-$langMyInActiveSessions = "Moje neaktivne sesije";
-$langMySpace = "Izvještaj";
+$MyActiveSessions = "Moje aktivne sesije";
+$MyInActiveSessions = "Moje neaktivne sesije";
+$MySpace = "Izvještaj";
 $ExtensionActivedButNotYetOperational = "Ovo proširenje je aktivirano, ali trenutno nije u funkciji.";
 $MyStudents = "Moji studenti";
 $Progress = "Napredovanje";

+ 84 - 92
main/lang/czech/trad4all.inc.php

@@ -6,39 +6,38 @@ $NoTimeLimits = "Žádné časové omezení";
 $Title = "Nadpis";
 $UsersOnline = "Uživatel online";
 $Remove = "Odstranit";
-$langEnter = "Zpět na můj seznam kurzů";
+$Enter = "Zpět na můj seznam kurzů";
 $Description = "Popis";
 $Links = "Linky";
-$langWorks = "Publikace studentů";
+$Works = "Publikace studentů";
 $Forums = "Fóra";
-$langExercices = "Testy";
-$langCreateDir = "Vytvořit složku";
+$Exercices = "Testy";
+$CreateDir = "Vytvořit složku";
 $Name = "Název";
-$langComment = "Komentář";
-$langVisible = "Viditelné/skryté";
-$langNewDir = "Název nové složky";
-$langDirCr = "Složka vytvořená";
+$Comment = "Komentář";
+$Visible = "Viditelné/skryté";
+$NewDir = "Název nové složky";
+$DirCr = "Složka vytvořená";
 $Download = "Stáhnout";
-$langGroup = "Skupina";
-$langEdit = "Uprav";
+$Group = "Skupina";
+$Edit = "Uprav";
 $Language = "Jazyk";
 $LoginName = "Login (Přihlásit)";
-$langCode = "Kód kurzu";
-$langUp = "Nahoře";
+$Code = "Kód kurzu";
+$Up = "Nahoře";
 $Down = "Dolů";
-$Up = "nahorů";
 $TheListIsEmpty = "Seznam je prázdný.";
-$langCourseCreate = "Vytvořit webovou stránku kurzu";
-$langTodo = "Dodělat";
+$CourseCreate = "Vytvořit webovou stránku kurzu";
+$Todo = "Dodělat";
 $Hide = "Skrýt";
-$langArchive = "archiv";
-$langCourseCode = "Kód kurzu";
-$langNoDescription = "Žádný popis";
-$langOfficialCode = "Oficiální kód";
+$Archive = "archiv";
+$CourseCode = "Kód kurzu";
+$NoDescription = "Žádný popis";
+$OfficialCode = "Oficiální kód";
 $FirstName = "Jmémo";
 $LastName = "Příjmění";
 $Status = "Stav";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $iso639_2_code = "en";
 $iso639_1_code = "eng";
 $text_dir = "ltr";
@@ -50,92 +49,87 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "ano";
-$langNo = "Ne";
+$Yes = "ano";
+$No = "Ne";
 $Next = "Další";
-$langAllowed = "Povolené";
-$langBackHome = "Zpět na Domácí stránku";
-$langPropositions = "Návrhy na zlepšení";
-$langMaj = "Aktualizovat";
-$langModify = "upravit";
-$langDelete = "vymazat";
-$langInvisible = "Skrýt";
-$langSave = "Uložit";
-$langMove = "Přesunout";
+$Allowed = "Povolené";
+$BackHome = "Zpět na Domácí stránku";
+$Propositions = "Návrhy na zlepšení";
+$Maj = "Aktualizovat";
+$Modify = "upravit";
+$Invisible = "Skrýt";
+$Save = "Uložit";
+$Move = "Přesunout";
 $Help = "Nápověda";
-$langOk = "OK";
-$langAdd = "Přidat";
-$langAddIntro = "Přidat úvodní text";
-$langBackList = "Zpět na seznam";
-$langText = "Text";
-$langEmpty = "Nechali jste některá políčka prázdna.<br>Použijte tlačítko <b>Zpět</b> na Vašem prohlížeči a skuste to znovu.<br>Jestli ignorujete kód kurzu, podívejte se na Program kurzu";
-$langConfirmYourChoice = "Prosím potvrďte váš výběr";
-$langAnd = "a";
-$langChoice = "Vaše volba";
-$langFinish = "Ukončit test";
-$langCancel = "Zrušit";
-$langNotAllowed = "Nedovoleno";
-$langNotLogged = "Nejste přihlášený(á) do kurzu";
-$langManager = "Manager";
-$langOptional = "Volitelné";
+$Ok = "OK";
+$Add = "Přidat";
+$AddIntro = "Přidat úvodní text";
+$BackList = "Zpět na seznam";
+$Text = "Text";
+$Empty = "Nechali jste některá políčka prázdna.<br>Použijte tlačítko <b>Zpět</b> na Vašem prohlížeči a skuste to znovu.<br>Jestli ignorujete kód kurzu, podívejte se na Program kurzu";
+$ConfirmYourChoice = "Prosím potvrďte váš výběr";
+$And = "a";
+$Choice = "Vaše volba";
+$Finish = "Ukončit test";
+$Cancel = "Zrušit";
+$NotAllowed = "Nedovoleno";
+$NotLogged = "Nejste přihlášený(á) do kurzu";
+$Manager = "Manager";
+$Optional = "Volitelné";
 $NextPage = "Následující strana";
 $PreviousPage = "Předchozí strana";
-$langUse = "Použité";
-$langTotal = "Celkové";
-$langTake = "vzít";
-$langOne = "Jeden";
-$langSeveral = "Několik";
-$langNotice = "Oznámení";
-$langDate = "Datum";
-$langAmong = "mezi";
-$langShow = "Ukaž";
-$langMyCourses = "Moje kurzy";
-$langModifyProfile = "Můj profil";
-$langMyStats = "Zobraz mou statistiku";
-$langLogout = "Odhlášení";
-$langMyAgenda = "Moje Agenda";
-$langCourseHomepage = "Domov kurzu";
-$langCourseManagerview = "Pohled učitele";
-$langStudentView = "Pohled studenta";
+$Use = "Použité";
+$Total = "Celkové";
+$Take = "vzít";
+$One = "Jeden";
+$Several = "Několik";
+$Notice = "Oznámení";
+$Date = "Datum";
+$Among = "mezi";
+$Show = "Ukaž";
+$MyCourses = "Moje kurzy";
+$ModifyProfile = "Můj profil";
+$MyStats = "Zobraz mou statistiku";
+$Logout = "Odhlášení";
+$MyAgenda = "Moje Agenda";
+$CourseHomepage = "Domov kurzu";
+$CourseManagerview = "Pohled učitele";
+$StudentView = "Pohled studenta";
 $AddResource = "Přidat zdroj";
 $AddedResources = "Přidané zdroje";
-$lang_modify_resource = "Upravit / Přidat zdroj";
-$lang_resource = "Zdroj";
-$lang_resources = "Zdroje";
 $Close = "zavřít";
-$langPlatform = "Platforma";
+$Platform = "Platforma";
 $localLangName = "jazyk";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Lituji, ale takový kód kurzu již existuje. Prosím zvolte jiný.";
+$CourseCodeAlreadyExists = "Lituji, ale takový kód kurzu již existuje. Prosím zvolte jiný.";
 $Statistics = "Statistika";
-$langGrouplist = "seznam skupin";
-$langPrevious = "předchozí";
+$Grouplist = "seznam skupin";
+$Previous = "předchozí";
 $DestDirectoryDoesntExist = "Cílový adresář neexistuje";
-$langShowAll = "Ukaž vše";
-$langPage = "Strana";
+$ShowAll = "Ukaž vše";
+$Page = "Strana";
 $englishLangName = "Anglicky";
 $Home = "Domů";
 $SelectAll = "Označit všechno";
 $UnSelectAll = "odznaš vše";
 $WithSelected = "S vybranými";
-$langOnLine = "Online";
-$langUsers = "Uživatelé";
-$langPlatformAdmin = "Administrace platformy";
+$OnLine = "Online";
+$Users = "Uživatelé";
+$PlatformAdmin = "Administrace platformy";
 $UserInfo = "informace o uživateli";
-$langCheckAll = "Označ vše";
-$langNbAnnoucement = "Oznámení";
-$lang_no_access_here = "Žádný přístup";
-$langOtherCourses = "ostatní kurzy";
+$CheckAll = "Označ vše";
+$NbAnnoucement = "Oznámení";
+$OtherCourses = "ostatní kurzy";
 $Doc = "dokument";
 $PlataformAdmin = "Administrátor platformy";
 $Groups = "Skupiny";
 $GroupManagement = "Správa skupin";
 $All = "Všechno";
 $None = "Žádné";
-$langSorry = "Nejdříve vyberte kurz";
-$langDenied = "Tato funkce je dostupná pouze administrátorům kurzu";
+$Sorry = "Nejdříve vyberte kurz";
+$Denied = "Tato funkce je dostupná pouze administrátorům kurzu";
 $Today = "dnes";
-$langCourseHomepageLink = "Domovská stránka kurzu";
+$CourseHomepageLink = "Domovská stránka kurzu";
 $Attachment = "Příloha";
 $User = "Uživatel";
 $MondayInit = "P";
@@ -216,7 +210,7 @@ $Link = "Odkazy";
 $Announcement = "Oznámení";
 $Dropbox = "Schránka na dokumenty";
 $Quiz = "Kvíz";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Konference";
 $Student_publication = "Studentské publikace";
 $Tracking = "Statistika";
@@ -229,8 +223,8 @@ $StartDate = "Datum začátku";
 $EndDate = "Datum konce";
 $StartTime = "Čas začátku";
 $EndTime = "Čas konce";
-$langYouWereCalled = "Na chat vás zve";
-$langDoYouAccept = "Přijmete pozvání ?";
+$YouWereCalled = "Na chat vás zve";
+$DoYouAccept = "Přijmete pozvání ?";
 $Everybody = "Všichni";
 $SentTo = "Viditelné pro";
 $Export = "Export";
@@ -253,7 +247,7 @@ $FormHasErrorsPleaseComplete = "Formulář obsahuje nekompletní data. Prosím z
 $StartDateShouldBeBeforeEndDate = "Počáteční datum nesmí být vyšší než datum konečné";
 $InvalidDate = "Nesprávné datum";
 $OnlyLettersAndNumbersAllowed = "Povolené jsou jen číslice a písmena";
-$langBasicOverview = "Základní přehled";
+$BasicOverview = "Základní přehled";
 $CourseAdminRole = "Administrátor kurzu";
 $UserRole = "Role";
 $ViewRight = "Pohled";
@@ -262,16 +256,14 @@ $DeleteRight = "Smazat";
 $OverviewCourseRights = "Role & přehled práv";
 $SeeAllRightsAllLocationsForSpecificRole = "Přehled práv pro roli";
 $SeeAllRolesAllLocationsForSpecificRight = "Zaměř se na pravo";
-$langAdvanced = "Pokročilé";
+$Advanced = "Pokročilé";
 $RightValueModified = "Hodnota byla upravená.";
 $course_rights = "Přehled rolí & práv";
 $Visio_conference = "Visio konference";
 $CourseAdminRoleDescription = "Administrátor kurzu";
-$Move = "Přesunout";
 $MoveTo = "Přesunout do";
 $Delete = "Vymazat";
 $MoveFileTo = "Přesunout soubor do";
-$Save = "Uložit";
 $Error = "Chyba";
 $Anonymous = "Anonymní";
 $CreateNewGlobalRole = "Vytvořit novou globální roli";
@@ -286,9 +278,9 @@ $YouHaveNewMessage = "Máte novou zprávu!";
 $myActiveSessions = "Moje aktivní výuka";
 $myInactiveSessions = "Moje neaktivní výuka";
 $FileUpload = "Nahrání souboru";
-$langMyActiveSessions = "Moje aktivní výuka";
-$langMyInActiveSessions = "Moje neaktivní výuka";
-$langMySpace = "Můj prostor";
+$MyActiveSessions = "Moje aktivní výuka";
+$MyInActiveSessions = "Moje neaktivní výuka";
+$MySpace = "Můj prostor";
 $ExtensionActivedButNotYetOperational = "Rozšírení bylo aktivováno, ale prozatím nemůže být použito.";
 $MyStudents = "Moji studenti";
 $Progress = "Postup";

+ 96 - 106
main/lang/danish/trad4all.inc.php

@@ -9,49 +9,47 @@ $Title = "Titel";
 $By = "Af";
 $UsersOnline = "Brugere online";
 $Remove = "Flyt";
-$langEnter = "Tilbage til min kursusoversigt";
+$Enter = "Tilbage til min kursusoversigt";
 $Description = "Beskrivelse";
 $Links = "Links";
-$langWorks = "Studerendes afleveringer";
+$Works = "Studerendes afleveringer";
 $Forums = "Diskussionsforum";
-$langExercices = "Øvelser";
-$langCreateDir = "Opret en mappe";
+$Exercices = "Øvelser";
+$CreateDir = "Opret en mappe";
 $Name = "Navn";
-$langComment = "Kommentar";
-$langVisible = "Synlig/usynlig";
-$langNewDir = "Navn på ny folder";
-$langDirCr = "Mappen er oprettet";
+$Comment = "Kommentar";
+$Visible = "Synlig/usynlig";
+$NewDir = "Navn på ny folder";
+$DirCr = "Mappen er oprettet";
 $Download = "Download";
-$langGroup = "Gruppe";
-$langEdit = "rediger";
-$langGroupForum = "Diskussionsforum";
+$Group = "Gruppe";
+$Edit = "rediger";
+$GroupForum = "Diskussionsforum";
 $Language = "Sprog";
 $LoginName = "Login";
 $AutostartMp3 = "Klik på ok, hvis audio-filen skal afspilles automatisk";
 $Assignments = "Afleveringer";
 $Forum = "Diskussionsfora";
-$langDelImage = "Fjern billede";
-$langCode = "Kursuskode";
-$langUp = "Op";
+$DelImage = "Fjern billede";
+$Code = "Kursuskode";
+$Up = "Op";
 $Down = "ned";
-$Up = "op";
 $TheListIsEmpty = "Listen er tom.";
-$langUniqueSelect = "Liste (Et svar)";
-$langCourseCreate = "Opret kursusside";
-$langTodo = "Opgaver";
+$UniqueSelect = "Liste (Et svar)";
+$CourseCreate = "Opret kursusside";
+$Todo = "Opgaver";
 $UserName = "Brugernavn";
-$lang_show_hide = "Vis/skjul";
-$langCategoryMod = "Ret kategori";
+$CategoryMod = "Ret kategori";
 $Hide = "Skjul";
-$langDear = "Kære";
-$langArchive = "Arkiv";
-$langCourseCode = "Kursuskode";
-$langNoDescription = "Ingen beskrivelse";
-$langOfficialCode = "Studienummer";
+$Dear = "Kære";
+$Archive = "Arkiv";
+$CourseCode = "Kursuskode";
+$NoDescription = "Ingen beskrivelse";
+$OfficialCode = "Studienummer";
 $FirstName = "Fornavn";
 $LastName = "Efternavn";
 $Status = "Status";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $SlideshowConversion = "Slideshow-konvertering";
 $UploadFile = "Upload af fil";
 $AvailableFrom = "Tilgængelig fra";
@@ -61,7 +59,6 @@ $Type = "Type";
 $EmailAddress = "E-mailadresse";
 $Organisation = "Organisation";
 $Reporting = "Rapportering";
-$Code = "Kode";
 $Update = "Opdater";
 $CurrentCourse = "Aktuelle kursusside";
 $Back = "Tilbage";
@@ -90,58 +87,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "ja";
-$langNo = "Nej";
+$Yes = "ja";
+$No = "Nej";
 $Next = "Næste";
-$langAllowed = "Tilladt";
-$langBackHome = "Tilbage til min kursusoversigt på";
-$langPropositions = "Foreslå forbedringer til";
-$langMaj = "Opdater";
-$langModify = "rediger";
-$langDelete = "slet";
-$langInvisible = "Skjul";
-$langSave = "Gem";
-$langMove = "Flytte";
+$Allowed = "Tilladt";
+$BackHome = "Tilbage til min kursusoversigt på";
+$Propositions = "Foreslå forbedringer til";
+$Maj = "Opdater";
+$Modify = "rediger";
+$Invisible = "Skjul";
+$Save = "Gem";
+$Move = "Flytte";
 $Help = "Hjælp";
-$langOk = "OK";
-$langAdd = "Tilføj";
-$langAddIntro = "Tilføj introduktionstekst";
-$langBackList = "Tilbage til listen";
-$langText = "Tekst";
-$langEmpty = "Du har ikke udfyldt alle felter.<br>Brug<b> Tilbage</b> knappen på din browser og prøv igen.<br>Husk at anføre en kursuskode";
-$langConfirmYourChoice = "Venligst bekræft dit valg";
-$langAnd = "og";
-$langChoice = "Dit valg";
-$langFinish = "Afslut";
-$langCancel = "Fortryd";
-$langNotAllowed = "Ikke tilladt";
-$langNotLogged = "Du er ikke logget på et kurset";
-$langManager = "Support";
-$langOptional = "Valgfri";
+$Ok = "OK";
+$Add = "Tilføj";
+$AddIntro = "Tilføj introduktionstekst";
+$BackList = "Tilbage til listen";
+$Text = "Tekst";
+$Empty = "Du har ikke udfyldt alle felter.<br>Brug<b> Tilbage</b> knappen på din browser og prøv igen.<br>Husk at anføre en kursuskode";
+$ConfirmYourChoice = "Venligst bekræft dit valg";
+$And = "og";
+$Choice = "Dit valg";
+$Finish = "Afslut";
+$Cancel = "Fortryd";
+$NotAllowed = "Ikke tilladt";
+$NotLogged = "Du er ikke logget på et kurset";
+$Manager = "Support";
+$Optional = "Valgfri";
 $NextPage = "Næste side";
 $PreviousPage = "Forrige side";
-$langUse = "brug";
-$langTotal = "Total";
-$langTake = "tag";
-$langOne = "En";
-$langSeveral = "Adskillige";
-$langNotice = "Bemærk";
-$langDate = "Dato";
-$langAmong = "iblandt";
-$langShow = "Vis";
-$langMyCourses = "Min kursusoversigt";
-$langModifyProfile = "Ændre min profil";
-$langMyStats = "Se mine statistikker";
-$langLogout = "Logud";
-$langMyAgenda = "Min kalender";
-$langCourseHomepage = "Kursusside";
-$langCourseManagerview = "Se kursusside som underviser";
-$langStudentView = "Se kursusside som deltager";
+$Use = "brug";
+$Total = "Total";
+$Take = "tag";
+$One = "En";
+$Several = "Adskillige";
+$Notice = "Bemærk";
+$Date = "Dato";
+$Among = "iblandt";
+$Show = "Vis";
+$MyCourses = "Min kursusoversigt";
+$ModifyProfile = "Ændre min profil";
+$MyStats = "Se mine statistikker";
+$Logout = "Logud";
+$MyAgenda = "Min kalender";
+$CourseHomepage = "Kursusside";
+$CourseManagerview = "Se kursusside som underviser";
+$StudentView = "Se kursusside som deltager";
 $AddResource = "Tilføj det";
 $AddedResources = "Vedhæftninger";
-$lang_modify_resource = "Rediger / Tilføj ressourcer";
-$lang_resource = "Ressource";
-$lang_resources = "Ressourcer";
 $langNameOfLang['arabic'] = "arabisk";
 $langNameOfLang['brazilian'] = "brasiliensk";
 $langNameOfLang['bulgarian'] = "bulgarsk";
@@ -165,27 +158,27 @@ $langNameOfLang['russian'] = "russisk";
 $langNameOfLang['simpl_chinese'] = "simpelt_kinesisk";
 $langNameOfLang['spanish'] = "spansk";
 $Close = "luk";
-$langPlatform = "Platform";
+$Platform = "Platform";
 $localLangName = "sprog";
 $email = "Email";
-$langCourseCodeAlreadyExists = "Beklager, men den valgte kursuskode eksisterer allerede. Vælg venligst en anden.";
+$CourseCodeAlreadyExists = "Beklager, men den valgte kursuskode eksisterer allerede. Vælg venligst en anden.";
 $Statistics = "Statistikker";
-$langGrouplist = "gruppeliste";
-$langPrevious = "forrige";
+$Grouplist = "gruppeliste";
+$Previous = "forrige";
 $DestDirectoryDoesntExist = "Mappen eksisterer ikke";
 $Courses = "kurser";
 $In = "i";
-$langShowAll = "Vis alle";
-$langPage = "Side";
+$ShowAll = "Vis alle";
+$Page = "Side";
 $englishLangName = "Engelsk";
 $Home = "Hjem";
-$langAreYouSureToDelete = "Er du sikker på, at du vil slette";
+$AreYouSureToDelete = "Er du sikker på, at du vil slette";
 $SelectAll = "Vælg alle";
 $UnSelectAll = "fravælg alle";
 $WithSelected = "Med valgte";
-$langOnLine = "Online";
-$langUsers = "Brugere";
-$langPlatformAdmin = "Platformadmin";
+$OnLine = "Online";
+$Users = "Brugere";
+$PlatformAdmin = "Platformadmin";
 $langNameOfLang['hungarian'] = "ungarsk";
 $langNameOfLang['indonesian'] = "indonesisk";
 $langNameOfLang['malay'] = "malaisisk";
@@ -196,21 +189,20 @@ $langNameOfLang['thai'] = "thai";
 $langNameOfLang['turkce'] = "tyrkisk";
 $langNameOfLang['vietnamese'] = "vietnamesisk";
 $UserInfo = "brugerinformation";
-$langModifyQuestion = "Rediger spørgsmålet";
-$langCheckAll = "Afkryds alle";
-$langNbAnnoucement = "Meddelelser";
-$lang_no_access_here = "Ingen adgang";
-$langOtherCourses = "andre kurser";
+$ModifyQuestion = "Rediger spørgsmålet";
+$CheckAll = "Afkryds alle";
+$NbAnnoucement = "Meddelelser";
+$OtherCourses = "andre kurser";
 $Doc = "Læringssti";
 $PlataformAdmin = "Platformadmin";
 $Groups = "Grupper";
 $GroupManagement = "Gruppehåndtering";
 $All = "Alle";
 $None = "ingen";
-$langSorry = "Vælg et kursus først";
-$langDenied = "Funktionen er kun tilgængelig for kursusadministrator/underviser";
+$Sorry = "Vælg et kursus først";
+$Denied = "Funktionen er kun tilgængelig for kursusadministrator/underviser";
 $Today = "idag";
-$langCourseHomepageLink = "Nuværende kursus";
+$CourseHomepageLink = "Nuværende kursus";
 $Attachment = "vedhæftning";
 $User = "Bruger";
 $MondayInit = "M";
@@ -270,10 +262,10 @@ $SeptemberLong = "September";
 $OctoberLong = "Oktober";
 $NovemberLong = "November";
 $DecemberLong = "December";
-$langMyCompetences = "Mine kompetencer";
-$langMyDiplomas = "Mine diplomer";
-$langMyPersonalOpenArea = "Mit personlige åbne område";
-$langMyTeach = "Hvad kan jeg undervise i";
+$MyCompetences = "Mine kompetencer";
+$MyDiplomas = "Mine diplomer";
+$MyPersonalOpenArea = "Mit personlige åbne område";
+$MyTeach = "Hvad kan jeg undervise i";
 $Agenda = "Kalender";
 $HourShort = "t";
 $PleaseTryAgain = "Prøv venligst igen";
@@ -283,7 +275,7 @@ $UplNotAZip = "Den valgte fil er ikke en zipfil.";
 $UplUploadSucceeded = "Fil uploaded korrekt!";
 $ExportAsCSV = "Eksporter som CSV fil";
 $ExportAsXLS = "Eksporter som XLS fil";
-$langOpenarea = "Personligt åbent område";
+$Openarea = "Personligt åbent område";
 $Done = "Færdig";
 $Documents = "Dokumenter";
 $DocumentAdded = "Dokument tilføjet";
@@ -296,7 +288,7 @@ $Link = "Links";
 $Announcement = "Meddelelser";
 $Dropbox = "Dueslag";
 $Quiz = "Øvelser";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Konference";
 $Student_publication = "Afleveringer";
 $Tracking = "Rapportering";
@@ -309,8 +301,8 @@ $StartDate = "Startdato";
 $EndDate = "Slutdato";
 $StartTime = "Starttidspunkt";
 $EndTime = "Sluttidspunkt";
-$langYouWereCalled = "Du er indbudt til en chat med";
-$langDoYouAccept = "Accepterer du?";
+$YouWereCalled = "Du er indbudt til en chat med";
+$DoYouAccept = "Accepterer du?";
 $Everybody = "Alle";
 $SentTo = "Synlig for";
 $Export = "Eksport";
@@ -334,7 +326,7 @@ $FormHasErrorsPleaseComplete = "Formularen indeholder data, der enten er ukomple
 $StartDateShouldBeBeforeEndDate = "Startdato skal ligge før slutdato";
 $InvalidDate = "Ugyldig dato";
 $OnlyLettersAndNumbersAllowed = "Kun bogstaver og tal er tilladt";
-$langBasicOverview = "Rækkefølge";
+$BasicOverview = "Rækkefølge";
 $CourseAdminRole = "Kursusadministration";
 $UserRole = "Rolle";
 $OnlyImagesAllowed = "Det er kun muligt at anvende PNG, JPG eller GIF billeder";
@@ -344,16 +336,14 @@ $DeleteRight = "Slet";
 $OverviewCourseRights = "Overblik over roller og rettigheder";
 $SeeAllRightsAllLocationsForSpecificRole = "Fokus på roller";
 $SeeAllRolesAllLocationsForSpecificRight = "Fokus på højre";
-$langAdvanced = "Opbyg";
+$Advanced = "Opbyg";
 $RightValueModified = "Værdien er blevet ændret";
 $course_rights = "Overblik over roller og rettigheder";
 $Visio_conference = "Virtuelt møde";
 $CourseAdminRoleDescription = "Administration af kursusside";
-$Move = "Flyt";
 $MoveTo = "Flyt til";
 $Delete = "Slet";
 $MoveFileTo = "Flyt fil/dokument til";
-$Save = "Gem";
 $Error = "Fejl";
 $Anonymous = "Anonym";
 $h = "t";
@@ -369,9 +359,9 @@ $YouHaveNewMessage = "Du har modtaget en besked";
 $myActiveSessions = "Mine aktive sessioner";
 $myInactiveSessions = "Mine inaktive sessioner";
 $FileUpload = "Upload af fil/dokument";
-$langMyActiveSessions = "Mine aktive sessioner";
-$langMyInActiveSessions = "Mine inaktive sessioner";
-$langMySpace = "Afrapportering";
+$MyActiveSessions = "Mine aktive sessioner";
+$MyInActiveSessions = "Mine inaktive sessioner";
+$MySpace = "Afrapportering";
 $ExtensionActivedButNotYetOperational = "Overførslen er blevet aktiveret, men kan ikke gøres operationel lige nu";
 $MyStudents = "Mine deltagere";
 $Progress = "Progression";

+ 97 - 107
main/lang/dutch/trad4all.inc.php

@@ -17,55 +17,53 @@ $Title = "Titel";
 $By = "Door";
 $UsersOnline = "Gebruikers online";
 $Remove = "Verwijder";
-$langEnter = "Terug naar uw cursuslijst";
+$Enter = "Terug naar uw cursuslijst";
 $Description = "Beschrijving";
 $Links = "Links";
-$langWorks = "Studentenpublicaties";
+$Works = "Studentenpublicaties";
 $Forums = "Forums";
-$langExercices = "Oefeningen";
-$langCreateDir = "Nieuwe map";
+$Exercices = "Oefeningen";
+$CreateDir = "Nieuwe map";
 $Name = "Naam";
-$langComment = "Commentaar";
-$langVisible = "Zichtbaar/onzichtbaar";
-$langNewDir = "Naam van de nieuwe map";
-$langDirCr = "Map is aangemaakt.";
+$Comment = "Commentaar";
+$Visible = "Zichtbaar/onzichtbaar";
+$NewDir = "Naam van de nieuwe map";
+$DirCr = "Map is aangemaakt.";
 $Download = "Downloaden";
-$langGroup = "Groepen";
-$langEdit = "wijzig";
-$langGroupForum = "groepsforum";
+$Group = "Groepen";
+$Edit = "wijzig";
+$GroupForum = "groepsforum";
 $Language = "Taal";
 $LoginName = "Gebruikersnaam";
 $AutostartMp3 = "Druk OK als u het audiobestand automatisch wilt laten afspelen";
 $Assignments = "Opdrachten";
 $Forum = "Forums";
-$langDelImage = "Verwijder foto";
-$langCode = "Cursuscode";
-$langUp = "Omhoog";
+$DelImage = "Verwijder foto";
+$Code = "Cursuscode";
+$Up = "Omhoog";
 $Down = "omlaag";
-$Up = "omhoog";
 $Theme = "Thema";
 $TheListIsEmpty = "De lijst is leeg.";
-$langUniqueSelect = "Meerkeuze (uniek antwoord)";
+$UniqueSelect = "Meerkeuze (uniek antwoord)";
 $CreateCategory = "Categorie aanmaken";
 $SendFile = "Bestand uploaden";
 $SaveChanges = "Wijzigingen bewaren";
 $SearchTerm = "Zoekterm";
 $TooShort = "Te kort";
-$langCourseCreate = "Maak een webcursus";
-$langTodo = "Suggesties";
+$CourseCreate = "Maak een webcursus";
+$Todo = "Suggesties";
 $UserName = "Gebruikersnaam ('log-in')";
-$lang_show_hide = "Weergeven/verbergen";
-$langCategoryMod = "Categorie wijzigen";
+$CategoryMod = "Categorie wijzigen";
 $Hide = "Verbergen";
-$langDear = "Beste";
-$langArchive = "Archief";
-$langCourseCode = "Cursuscode";
-$langNoDescription = "Geen beschrijving";
-$langOfficialCode = "Officiële code";
+$Dear = "Beste";
+$Archive = "Archief";
+$CourseCode = "Cursuscode";
+$NoDescription = "Geen beschrijving";
+$OfficialCode = "Officiële code";
 $FirstName = "Voornaam";
 $LastName = "Familienaam";
 $Status = "Statuut";
-$langEmail = "Email";
+$Email = "Email";
 $SlideshowConversion = "Conversie van de presentatie";
 $UploadFile = "Bestand uploaden";
 $AvailableFrom = "Beschikbaar vanaf";
@@ -75,7 +73,6 @@ $Type = "Type";
 $EmailAddress = "Email adres";
 $Organisation = "Instelling";
 $Reporting = "Rapportering";
-$Code = "Code";
 $Update = "Updaten";
 $SelectQuestionType = "Vraagtype selecteren";
 $CurrentCourse = "Huidige cursus";
@@ -105,58 +102,54 @@ $dateFormatShort = "%a %d %b %y";
 $dateFormatLong = "%A %d %B %Y";
 $dateTimeFormatLong = "%A %d %B %Y om %H:%M";
 $timeNoSecFormat = "%H:%M";
-$langYes = "Ja";
-$langNo = "Nee";
+$Yes = "Ja";
+$No = "Nee";
 $Next = "Volgende";
-$langAllowed = "Toegelaten";
-$langBackHome = "Terug naar startpagina van";
-$langPropositions = "Voorstellen tot verbetering van";
-$langMaj = "Update";
-$langModify = "Wijzigen";
-$langDelete = "Verwijderen";
-$langInvisible = "Onzichtbaar maken";
-$langSave = "Opslaan";
-$langMove = "Verplaatsen";
+$Allowed = "Toegelaten";
+$BackHome = "Terug naar startpagina van";
+$Propositions = "Voorstellen tot verbetering van";
+$Maj = "Update";
+$Modify = "Wijzigen";
+$Invisible = "Onzichtbaar maken";
+$Save = "Opslaan";
+$Move = "Verplaatsen";
 $Help = "Hulp";
-$langOk = "OK";
-$langAdd = "Toevoegen";
-$langAddIntro = "Inleiding toevoegen";
-$langBackList = "Terug naar de lijst";
-$langText = "Tekst";
-$langEmpty = "U hebt niet alle velden ingevuld.<br />Gebruik de terugknop en herbegin.<br />Als u uw cursuscode niet kent, kunt u de cursuslijst raadplegen.";
-$langConfirmYourChoice = "Gelieve uw keuze te bevestigen";
-$langAnd = "en";
-$langChoice = "Uw keuze";
-$langFinish = "Eindigen";
-$langCancel = "Annuleren";
-$langNotAllowed = "U bent geen cursusbeheerder. U kunt deze actie niet uitvoeren.";
-$langNotLogged = "U bent niet ingelogd op een cursus.";
-$langManager = "Platformbeheerder";
-$langOptional = "Optioneel";
+$Ok = "OK";
+$Add = "Toevoegen";
+$AddIntro = "Inleiding toevoegen";
+$BackList = "Terug naar de lijst";
+$Text = "Tekst";
+$Empty = "U hebt niet alle velden ingevuld.<br />Gebruik de terugknop en herbegin.<br />Als u uw cursuscode niet kent, kunt u de cursuslijst raadplegen.";
+$ConfirmYourChoice = "Gelieve uw keuze te bevestigen";
+$And = "en";
+$Choice = "Uw keuze";
+$Finish = "Eindigen";
+$Cancel = "Annuleren";
+$NotAllowed = "U bent geen cursusbeheerder. U kunt deze actie niet uitvoeren.";
+$NotLogged = "U bent niet ingelogd op een cursus.";
+$Manager = "Platformbeheerder";
+$Optional = "Optioneel";
 $NextPage = "Volgende pagina";
 $PreviousPage = "Vorige pagina";
-$langUse = "Gebruiken";
-$langTotal = "Totaal";
-$langTake = "neem";
-$langOne = "Eén";
-$langSeveral = "Verschillende";
-$langNotice = "Merk op";
-$langDate = "Datum";
-$langAmong = "uit";
-$langShow = "Weergeven";
-$langMyCourses = "Mijn cursussen";
-$langModifyProfile = "Mijn profiel";
-$langMyStats = "Toon mijn statistieken";
-$langLogout = "Uitloggen";
-$langMyAgenda = "Mijn agenda";
-$langCourseHomepage = "Cursusstartpagina";
-$langCourseManagerview = "Zicht als cursusbeheerder";
-$langStudentView = "Zicht als student";
+$Use = "Gebruiken";
+$Total = "Totaal";
+$Take = "neem";
+$One = "Eén";
+$Several = "Verschillende";
+$Notice = "Merk op";
+$Date = "Datum";
+$Among = "uit";
+$Show = "Weergeven";
+$MyCourses = "Mijn cursussen";
+$ModifyProfile = "Mijn profiel";
+$MyStats = "Toon mijn statistieken";
+$Logout = "Uitloggen";
+$MyAgenda = "Mijn agenda";
+$CourseHomepage = "Cursusstartpagina";
+$CourseManagerview = "Zicht als cursusbeheerder";
+$StudentView = "Zicht als student";
 $AddResource = "Materiaal toevoegen";
 $AddedResources = "Bijlagen";
-$lang_modify_resource = "Wijzigen/toevoegen materiaal";
-$lang_resource = "Materiaal";
-$lang_resources = "Materialen";
 $langNameOfLang['arabic'] = "Arabisch";
 $langNameOfLang['brazilian'] = "Braziliaans";
 $langNameOfLang['bulgarian'] = "Bulgaars";
@@ -180,27 +173,27 @@ $langNameOfLang['russian'] = "Russisch";
 $langNameOfLang['simpl_chinese'] = "Vereenvoudigd Chinees";
 $langNameOfLang['spanish'] = "Spaans";
 $Close = "Sluiten";
-$langPlatform = "Platform";
+$Platform = "Platform";
 $localLangName = "Nederlands";
 $email = "E-mail";
-$langCourseCodeAlreadyExists = "Deze cursuscode is al in gebruik. Gelieve een andere te kiezen.";
+$CourseCodeAlreadyExists = "Deze cursuscode is al in gebruik. Gelieve een andere te kiezen.";
 $Statistics = "Statistieken";
-$langGrouplist = "Groepenlijst";
-$langPrevious = "Vorige";
+$Grouplist = "Groepenlijst";
+$Previous = "Vorige";
 $DestDirectoryDoesntExist = "De bestemmingsmap bestaat niet";
 $Courses = "cursussen";
 $In = "in";
-$langShowAll = "Toon alle";
-$langPage = "Pagina";
+$ShowAll = "Toon alle";
+$Page = "Pagina";
 $englishLangName = "Dutch";
 $Home = "Start";
-$langAreYouSureToDelete = "Wil u dit document verwijderen:";
+$AreYouSureToDelete = "Wil u dit document verwijderen:";
 $SelectAll = "Selecteer alle";
 $UnSelectAll = "selecteer geen";
 $WithSelected = "Met geselecteerde";
-$langOnLine = "Gebruikers online";
-$langUsers = "gebruikers";
-$langPlatformAdmin = "Platformbeheer";
+$OnLine = "Gebruikers online";
+$Users = "gebruikers";
+$PlatformAdmin = "Platformbeheer";
 $langNameOfLang['hungarian'] = "Hongaars";
 $langNameOfLang['indonesian'] = "Indonesisch";
 $langNameOfLang['malay'] = "Malaysisch";
@@ -211,22 +204,21 @@ $langNameOfLang['thai'] = "Thais";
 $langNameOfLang['turkce'] = "Turks";
 $langNameOfLang['vietnamese'] = "Vietnamees";
 $UserInfo = "gebruikersinformatie";
-$langModifyQuestion = "Wijzig vraag";
+$ModifyQuestion = "Wijzig vraag";
 $Example = "Voorbeeld";
-$langCheckAll = "Controleer alles";
-$langNbAnnoucement = "Mededeling";
-$lang_no_access_here = "Geen toegang tot deze gegevens";
-$langOtherCourses = "Andere cursussen";
+$CheckAll = "Controleer alles";
+$NbAnnoucement = "Mededeling";
+$OtherCourses = "Andere cursussen";
 $Doc = "document";
 $PlataformAdmin = "Platformbeheerder";
 $Groups = "Groepen";
 $GroupManagement = "Beheer van groepen";
 $All = "alles";
 $None = "Geen";
-$langSorry = "Selecteer eerst een cursus";
-$langDenied = "Deze functie is enkel beschikbaar voor cursusbeheerders";
+$Sorry = "Selecteer eerst een cursus";
+$Denied = "Deze functie is enkel beschikbaar voor cursusbeheerders";
 $Today = "vandaag";
-$langCourseHomepageLink = "Deze cursus";
+$CourseHomepageLink = "Deze cursus";
 $Attachment = "bijlage";
 $User = "Gebruikers";
 $MondayInit = "m";
@@ -286,10 +278,10 @@ $SeptemberLong = "september";
 $OctoberLong = "oktober";
 $NovemberLong = "november";
 $DecemberLong = "december";
-$langMyCompetences = "Mijn competenties";
-$langMyDiplomas = "Mijn diploma's";
-$langMyPersonalOpenArea = "Mijn persoonlijke ruimte";
-$langMyTeach = "Waarin kan ik lesgeven";
+$MyCompetences = "Mijn competenties";
+$MyDiplomas = "Mijn diploma's";
+$MyPersonalOpenArea = "Mijn persoonlijke ruimte";
+$MyTeach = "Waarin kan ik lesgeven";
 $Agenda = "Agenda";
 $HourShort = "u";
 $PleaseTryAgain = "Gelieve opnieuw te proberen.";
@@ -299,7 +291,7 @@ $UplNotAZip = "Het bestand dat u doorstuurde is geen .zip bestand.";
 $UplUploadSucceeded = "Het bestand is doorgestuurd.";
 $ExportAsCSV = "Exporteer als CSV-bestand";
 $ExportAsXLS = "Exporteer als XLS-bestand";
-$langOpenarea = "Persoonlijke ruimte";
+$Openarea = "Persoonlijke ruimte";
 $Done = "Klaar";
 $Documents = "Documenten";
 $DocumentAdded = "Document toegevoegd";
@@ -313,7 +305,7 @@ $Link = "Link";
 $Announcement = "Aankondigingen";
 $Dropbox = "Dropbox";
 $Quiz = "Oefeningen";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Conferentie";
 $Student_publication = "Studentenpublicaties";
 $Tracking = "Statistieken";
@@ -326,8 +318,8 @@ $StartDate = "Startdatum";
 $EndDate = "Einddatum";
 $StartTime = "Starttijd";
 $EndTime = "Eindtijd";
-$langYouWereCalled = "U kunt chatten met";
-$langDoYouAccept = "Bevestigen?";
+$YouWereCalled = "U kunt chatten met";
+$DoYouAccept = "Bevestigen?";
 $Everybody = "Iedereen";
 $SentTo = "Zichtbaar voor";
 $Export = "Exporteer";
@@ -351,7 +343,7 @@ $FormHasErrorsPleaseComplete = "Het formulier bevat foute of onvolledige gegeven
 $StartDateShouldBeBeforeEndDate = "De eerste datum moet vóór de tweede datum vallen.";
 $InvalidDate = "Ongeldige datum";
 $OnlyLettersAndNumbersAllowed = "Enkel letters en cijfers toegelaten";
-$langBasicOverview = "Organiseren";
+$BasicOverview = "Organiseren";
 $CourseAdminRole = "Cursusbeheerder";
 $UserRole = "Rol";
 $OnlyImagesAllowed = "Enkel afbeeldingen van het type PNG, JPG of GIF zijn toegestaan.";
@@ -361,16 +353,14 @@ $DeleteRight = "Verwijderen";
 $OverviewCourseRights = "Overzicht rollen en rechten";
 $SeeAllRightsAllLocationsForSpecificRole = "Overzicht voor specifieke gebruikersrol";
 $SeeAllRolesAllLocationsForSpecificRight = "Bekijk alle rollen en locaties voor specifiek recht";
-$langAdvanced = "Geavanceerde weergave";
+$Advanced = "Geavanceerde weergave";
 $RightValueModified = "De waarde is aangepast.";
 $course_rights = "Overzicht rollen en rechten";
 $Visio_conference = "Video conferentie";
 $CourseAdminRoleDescription = "De cursusbeheerder";
-$Move = "Verplaatsen";
 $MoveTo = "Verplaats naar";
 $Delete = "Verwijderen";
 $MoveFileTo = "Verplaats bestand naar";
-$Save = "Opslaan";
 $Error = "Fout";
 $Anonymous = "Anoniem";
 $h = "u";
@@ -386,9 +376,9 @@ $YouHaveNewMessage = "U hebt een nieuw bericht!";
 $myActiveSessions = "Mijn actieve sessies";
 $myInactiveSessions = "Mijn inactieve sessies";
 $FileUpload = "Bestand opladen";
-$langMyActiveSessions = "Mijn actieve sessies";
-$langMyInActiveSessions = "Mijn inactieve sessies";
-$langMySpace = "Mijn ruimte";
+$MyActiveSessions = "Mijn actieve sessies";
+$MyInActiveSessions = "Mijn inactieve sessies";
+$MySpace = "Mijn ruimte";
 $ExtensionActivedButNotYetOperational = "Deze extensie is geactiveerd maar kan niet operationeel gemaakt worden op dit moment.";
 $MyStudents = "Mijn studenten";
 $Progress = "Voortgang";
@@ -805,7 +795,7 @@ $InvitationDenied = "Uitnodiging afgewezen";
 $UserAdded = "De gebruiker werd toegevoegd";
 $UpdatedIn = "Gewijzigd op";
 $Metadata = "Metadata";
-$langAddMetadata = "Toon/wijzig Metadata";
+$AddMetadata = "Toon/wijzig Metadata";
 $SendMessage = "Bericht verzenden";
 $SeeForum = "Zie forum";
 $SeeMore = "Toon meer";

+ 107 - 107
main/lang/english/trad4all.inc.php

@@ -55,14 +55,19 @@ $BuyCourses = "Buy courses";
 $MySessions = "My sessions";
 $ActivateAudioRecorder = "Activate audio recorder";
 $StartSpeaking = "Start speaking";
+$SessionDurationDescription = "The session duration allows you to set a number of days of access starting from the first access date of the user to the session. This way, you can set a session to 'last for 15 days' instead of starting at a fixed date for all students.";
 $HyperbolicArctangentArctanh = "Hyperbolic arctangent:\t\tarctanh(x)";
+$SessionDurationTitle = "Session duration";
 $ArctangentArctan = "Arctangent:\t\t\tarctan(x)";
 $HyperbolicTangentTanh = "Hyperbolic tangent:\t\ttanh(x)";
 $TangentTan = "Tangent:\t\t\ttan(x)";
+$CoachAndStudent = "Coach and student";
+$Serie = "Series";
 $HyperbolicArccosineArccosh = "Hyperbolic arccosine:\t\tarccosh(x)";
 $ArccosineArccos = "Arccosine:\t\t\tarccos(x)";
 $HyperbolicCosineCosh = "Hyperbolic cosine:\t\tcosh(x)";
 $CosineCos = "Cosine:\t\t\t\tcos(x)";
+$TeacherTimeReport = "Teachers time report";
 $HyperbolicArcsineArcsinh = "Hyperbolic arcsine:\t\tarcsinh(x)";
 $ArcsineArcsin = "Arcsine:\t\t\tarcsin(x)";
 $HyperbolicSineSinh = "Hyperbolic sine:\t\tsinh(x)";
@@ -308,55 +313,55 @@ $Title = "Title";
 $By = "By";
 $UsersOnline = "Users online";
 $Remove = "Remove";
-$langEnter = "Back to training list";
+$Enter = "Back to training list";
 $Description = "Description";
 $Links = "Links";
-$langWorks = "Assignments";
+$Works = "Assignments";
 $Forums = "Forums";
-$langExercices = "Tests";
-$langCreateDir = "Create folder";
+$Exercices = "Tests";
+$CreateDir = "Create folder";
 $Name = "Name";
-$langComment = "Comment";
-$langVisible = "Visible";
-$langNewDir = "Name of the new folder";
-$langDirCr = "Folder created";
+$Comment = "Comment";
+$Visible = "Visible";
+$NewDir = "Name of the new folder";
+$DirCr = "Folder created";
 $Download = "Download";
-$langGroup = "Groups";
-$langEdit = "Edit";
-$langGroupForum = "Group Forum";
+$Group = "Groups";
+$Edit = "Edit";
+$GroupForum = "Group Forum";
 $Language = "Language";
 $LoginName = "Login";
 $AutostartMp3 = "Do you want audio file to START automatically?";
 $Assignments = "Assignments";
 $Forum = "Forum";
-$langDelImage = "Remove picture";
-$langCode = "Training code";
-$langUp = "Up";
-$Down = "down";
+$DelImage = "Remove picture";
+$Code = "Training code";
 $Up = "Up";
+$Down = "down";
+$TimeReportForCourseX = "Time report for course %s";
 $Theme = "Graphical theme";
 $TheListIsEmpty = "Empty";
-$langUniqueSelect = "Multiple choice";
+$UniqueSelect = "Multiple choice";
 $CreateCategory = "Create category";
 $SendFile = "Upload document";
 $SaveChanges = "Save changes";
 $SearchTerm = "Search term";
 $TooShort = "Too short";
-$langCourseCreate = "Create a course";
-$langTodo = "To do";
+$CourseCreate = "Create a course";
+$Todo = "To do";
 $UserName = "Username";
-$lang_show_hide = "Show / hide";
-$langCategoryMod = "Edit Category";
+$TimeReportIncludingAllCoursesAndSessionsByTeacher = "Time report including all courses and sessions, by teacher";
+$CategoryMod = "Edit Category";
 $Hide = "Hide";
-$langDear = "Dear";
-$langArchive = "archive";
-$langCourseCode = "Code";
-$langNoDescription = "No description";
-$langOfficialCode = "Code";
+$Dear = "Dear";
+$Archive = "archive";
+$CourseCode = "Code";
+$NoDescription = "No description";
+$OfficialCode = "Code";
 $FirstName = "First name";
 $LastName = "Last name";
 $Status = "Status";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $SlideshowConversion = "Slideshow conversion";
 $UploadFile = "File upload";
 $AvailableFrom = "Available from";
@@ -366,7 +371,6 @@ $Type = "Type";
 $EmailAddress = "Email address";
 $Organisation = "Company";
 $Reporting = "Reporting";
-$Code = "Code";
 $Update = "Update";
 $SelectQuestionType = "Select question type";
 $CurrentCourse = "Current course";
@@ -396,58 +400,56 @@ $dateFormatShort = "%b %d, %Y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "Yes";
-$langNo = "No";
+$Yes = "Yes";
+$No = "No";
 $Next = "Next";
-$langAllowed = "Allowed";
-$langBackHome = "Back to Home Page of";
-$langPropositions = "Proposals for an improvement of";
-$langMaj = "Update";
-$langModify = "Edit";
-$langDelete = "delete";
-$langInvisible = "invisible";
-$langSave = "Send message";
-$langMove = "Move";
+$Allowed = "Allowed";
+$BackHome = "Back to Home Page of";
+$Propositions = "Proposals for an improvement of";
+$Maj = "Update";
+$Modify = "Edit";
+$Invisible = "invisible";
+$Save = "Send message";
+$Move = "Move";
 $Help = "Help";
-$langOk = "Validate";
-$langAdd = "Add";
-$langAddIntro = "Add an introduction text";
-$langBackList = "Return to the list";
-$langText = "Text";
-$langEmpty = "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";
-$langConfirmYourChoice = "Please confirm your choice";
-$langAnd = "and";
-$langChoice = "Your choice";
-$langFinish = "Quit test";
-$langCancel = "Cancel";
-$langNotAllowed = "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.";
-$langNotLogged = "You are not logged in";
-$langManager = "Administrator";
-$langOptional = "Optional";
+$Ok = "Validate";
+$Add = "Add";
+$AddIntro = "Add an introduction text";
+$BackList = "Return to the list";
+$Text = "Text";
+$Empty = "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";
+$ConfirmYourChoice = "Please confirm your choice";
+$And = "and";
+$Choice = "Your choice";
+$Finish = "Quit test";
+$Cancel = "Cancel";
+$NotAllowed = "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.";
+$NotLogged = "You are not logged in";
+$Manager = "Administrator";
+$Optional = "Optional";
 $NextPage = "Next page";
 $PreviousPage = "Previous page";
-$langUse = "Use";
-$langTotal = "Total";
-$langTake = "take";
-$langOne = "One";
-$langSeveral = "Several";
-$langNotice = "Notice";
-$langDate = "Date";
-$langAmong = "among";
-$langShow = "Show";
-$langMyCourses = "My courses";
-$langModifyProfile = "Profile";
-$langMyStats = "View my progress";
-$langLogout = "Logout";
-$langMyAgenda = "Personal agenda";
-$langCourseHomepage = "Course home";
-$langCourseManagerview = "Teacher View";
-$langStudentView = "Learner View";
+$Use = "Use";
+$Total = "Total";
+$Take = "take";
+$One = "One";
+$Several = "Several";
+$Notice = "Notice";
+$Date = "Date";
+$Among = "among";
+$Show = "Show";
+$MyCourses = "My courses";
+$ModifyProfile = "Profile";
+$MyStats = "View my progress";
+$Logout = "Logout";
+$MyAgenda = "Personal agenda";
+$CourseHomepage = "Course home";
+$CourseManagerview = "Teacher View";
+$StudentView = "Learner View";
 $AddResource = "Add it";
 $AddedResources = "Attachments";
-$lang_modify_resource = "Edit / Add resources";
-$lang_resource = "Resource";
-$lang_resources = "Resources";
+$TimeReportForTeacherX = "Time report for teacher %s";
+$TotalTime = "Total time";
 $langNameOfLang['arabic'] = "arabic";
 $langNameOfLang['brazilian'] = "brazilian";
 $langNameOfLang['bulgarian'] = "bulgarian";
@@ -471,27 +473,27 @@ $langNameOfLang['russian'] = "russian";
 $langNameOfLang['simpl_chinese'] = "simpl_chinese";
 $langNameOfLang['spanish'] = "spanish";
 $Close = "close";
-$langPlatform = "Portal";
+$Platform = "Portal";
 $localLangName = "language";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Sorry, but that training code already exists. Please choose another one.";
+$CourseCodeAlreadyExists = "Sorry, but that training code already exists. Please choose another one.";
 $Statistics = "Statistics";
-$langGrouplist = "Groups list";
-$langPrevious = "Previous";
+$Grouplist = "Groups list";
+$Previous = "Previous";
 $DestDirectoryDoesntExist = "The target folder does not exist";
 $Courses = "Courses";
 $In = "in";
-$langShowAll = "Show all";
-$langPage = "Page";
+$ShowAll = "Show all";
+$Page = "Page";
 $englishLangName = "English";
 $Home = "Home";
-$langAreYouSureToDelete = "Are you sure you want to delete";
+$AreYouSureToDelete = "Are you sure you want to delete";
 $SelectAll = "Select all";
 $UnSelectAll = "Unselect all";
 $WithSelected = "With selected";
-$langOnLine = "Online";
-$langUsers = "Users";
-$langPlatformAdmin = "Administration";
+$OnLine = "Online";
+$Users = "Users";
+$PlatformAdmin = "Administration";
 $langNameOfLang['hungarian'] = "hungarian";
 $langNameOfLang['indonesian'] = "indonesian";
 $langNameOfLang['malay'] = "malay";
@@ -502,22 +504,21 @@ $langNameOfLang['thai'] = "thai";
 $langNameOfLang['turkce'] = "turkish";
 $langNameOfLang['vietnamese'] = "vietnamese";
 $UserInfo = "user information";
-$langModifyQuestion = "Save the question";
+$ModifyQuestion = "Save the question";
 $Example = "Example";
-$langCheckAll = "Check all";
-$langNbAnnoucement = "Announcement";
-$lang_no_access_here = "No access here";
-$langOtherCourses = "other courses";
+$CheckAll = "Check all";
+$NbAnnoucement = "Announcement";
+$OtherCourses = "other courses";
 $Doc = "Training";
 $PlataformAdmin = "Portal Admin";
 $Groups = "Groups";
 $GroupManagement = "Groups management";
 $All = "All";
 $None = "none";
-$langSorry = "Select a training first";
-$langDenied = "This function is only available to trainers";
+$Sorry = "Select a training first";
+$Denied = "This function is only available to trainers";
 $Today = "Today";
-$langCourseHomepageLink = "Course home";
+$CourseHomepageLink = "Course home";
 $Attachment = "attachment";
 $User = "User";
 $MondayInit = "M";
@@ -577,10 +578,10 @@ $SeptemberLong = "September";
 $OctoberLong = "October";
 $NovemberLong = "November";
 $DecemberLong = "December";
-$langMyCompetences = "My competences";
-$langMyDiplomas = "My diplomas";
-$langMyPersonalOpenArea = "My personal open area";
-$langMyTeach = "What I am able to teach";
+$MyCompetences = "My competences";
+$MyDiplomas = "My diplomas";
+$MyPersonalOpenArea = "My personal open area";
+$MyTeach = "What I am able to teach";
 $Agenda = "Agenda";
 $HourShort = "h";
 $PleaseTryAgain = "Please Try Again!";
@@ -590,7 +591,7 @@ $UplNotAZip = "The file you selected was not a zip file.";
 $UplUploadSucceeded = "File upload succeeded!";
 $ExportAsCSV = "CSV export";
 $ExportAsXLS = "Excel export";
-$langOpenarea = "Personal area";
+$Openarea = "Personal area";
 $Done = "Done";
 $Documents = "Documents";
 $DocumentAdded = "Document added";
@@ -604,7 +605,7 @@ $Link = "Links";
 $Announcement = "Announcements";
 $Dropbox = "Dropbox";
 $Quiz = "Tests";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Conference";
 $Student_publication = "Assignments";
 $Tracking = "Reporting";
@@ -617,8 +618,8 @@ $StartDate = "Start Date";
 $EndDate = "End Date";
 $StartTime = "Start Time";
 $EndTime = "End Time";
-$langYouWereCalled = "You were invited to chat with";
-$langDoYouAccept = "Do you accept it ?";
+$YouWereCalled = "You were invited to chat with";
+$DoYouAccept = "Do you accept it ?";
 $Everybody = "All";
 $SentTo = "Visible to";
 $Export = "Export";
@@ -642,7 +643,7 @@ $FormHasErrorsPleaseComplete = "The form contains incorrect or incomplete data.
 $StartDateShouldBeBeforeEndDate = "The first date should be before the end date";
 $InvalidDate = "Invalid date";
 $OnlyLettersAndNumbersAllowed = "Only letters and numbers allowed";
-$langBasicOverview = "Organize";
+$BasicOverview = "Organize";
 $CourseAdminRole = "Course admin";
 $UserRole = "Role";
 $OnlyImagesAllowed = "Only PNG, JPG or GIF images allowed";
@@ -652,16 +653,15 @@ $DeleteRight = "Delete";
 $OverviewCourseRights = "Roles & rights overview";
 $SeeAllRightsAllLocationsForSpecificRole = "Focus on role";
 $SeeAllRolesAllLocationsForSpecificRight = "Focus on right";
-$langAdvanced = "Authoring";
+$Advanced = "Authoring";
 $RightValueModified = "The value has been modified.";
 $course_rights = "Roles & rights overview";
 $Visio_conference = "Virtual meeting";
 $CourseAdminRoleDescription = "Teacher";
-$Move = "Move";
 $MoveTo = "Move to";
 $Delete = "Delete";
 $MoveFileTo = "Move file to";
-$Save = "Save";
+$TimeReportForSessionX = "Time report for session %s";
 $Error = "Error";
 $Anonymous = "Anonymous";
 $h = "h";
@@ -677,9 +677,9 @@ $YouHaveNewMessage = "You have a new message!";
 $myActiveSessions = "My active sessions";
 $myInactiveSessions = "My inactive sessions";
 $FileUpload = "File upload";
-$langMyActiveSessions = "My active Sessions";
-$langMyInActiveSessions = "My inactive sessions";
-$langMySpace = "Reporting";
+$MyActiveSessions = "My active Sessions";
+$MyInActiveSessions = "My inactive sessions";
+$MySpace = "Reporting";
 $ExtensionActivedButNotYetOperational = "This extension has been actived but can't be operational for the moment.";
 $MyStudents = "My learners";
 $Progress = "Progress";
@@ -1097,7 +1097,7 @@ $InvitationDenied = "Invitation denied";
 $UserAdded = "The user is added";
 $UpdatedIn = "Updated on";
 $Metadata = "Metadata";
-$langAddMetadata = "View/Edit Metadata";
+$AddMetadata = "View/Edit Metadata";
 $SendMessage = "Send message";
 $SeeForum = "See forum";
 $SeeMore = "See more";

+ 86 - 93
main/lang/esperanto/trad4all.inc.php

@@ -8,40 +8,38 @@ $NoTimeLimits = "Sen templimo";
 $Title = "Titolo";
 $UsersOnline = "Konektitaj uzuloj";
 $Remove = "Forigi";
-$langEnter = "Reiru al via kurslisto";
+$Enter = "Reiru al via kurslisto";
 $Description = "Priskribo";
 $Links = "Ligiloj";
-$langWorks = "Studentaj publikaĵoj";
+$Works = "Studentaj publikaĵoj";
 $Forums = "Forumoj";
-$langExercices = "Ekzercoj";
-$langCreateDir = "Nova dosierujo";
+$Exercices = "Ekzercoj";
+$CreateDir = "Nova dosierujo";
 $Name = "Nomo";
-$langComment = "Komento";
-$langVisible = "Videbla/nevidebla";
-$langNewDir = "Nomo de la nova dosierujo";
-$langDirCr = "Dosierujo estas kreita";
+$Comment = "Komento";
+$Visible = "Videbla/nevidebla";
+$NewDir = "Nomo de la nova dosierujo";
+$DirCr = "Dosierujo estas kreita";
 $Download = "Sendi";
-$langGroup = "Grupo";
-$langEdit = "redakti";
-$langGroupForum = "Forumo de Grupo";
+$Group = "Grupo";
+$Edit = "redakti";
+$GroupForum = "Forumo de Grupo";
 $Language = "Lingvo";
 $LoginName = "Uzula nomo";
 $Assignments = "Studentaj publikaĵoj";
 $Forum = "Forumoj";
-$langDelImage = "Forigi foton";
-$langCode = "Kurskodo";
-$langUp = "Supren";
+$DelImage = "Forigi foton";
+$Code = "Kurskodo";
+$Up = "Supren";
 $Down = "malsupren";
-$Up = "supren";
 $TheListIsEmpty = "La listo estas malplena.";
-$langUniqueSelect = "Plurelekta (ununura respondo)";
-$langCourseCreate = "Krei retkurson";
-$langTodo = "Sugestoj";
+$UniqueSelect = "Plurelekta (ununura respondo)";
+$CourseCreate = "Krei retkurson";
+$Todo = "Sugestoj";
 $UserName = "Ensalutnomo";
-$lang_show_hide = "Vidigi / kaŝi";
-$langCategoryMod = "Ŝanĝi kategorion";
+$CategoryMod = "Ŝanĝi kategorion";
 $Hide = "Kaŝi";
-$langDear = "Kara";
+$Dear = "Kara";
 $iso639_2_code = "EO";
 $iso639_1_code = "DU";
 $charset = "utf-8";
@@ -54,58 +52,54 @@ $dateFormatShort = "%a %y %b %d";
 $dateFormatLong = "%A %Y %B %d";
 $dateTimeFormatLong = "%A %Y %B %d je la %H:%M";
 $timeNoSecFormat = "%H:%M";
-$langYes = "Jes";
-$langNo = "Ne";
+$Yes = "Jes";
+$No = "Ne";
 $Next = "Venonta";
-$langAllowed = "Permesita";
-$langBackHome = "Reiri al startpaĝo";
-$langPropositions = "Proponoj por la plibonigo de";
-$langMaj = "Ĝisdatigo";
-$langModify = "Ŝanĝi";
-$langDelete = "Forigi";
-$langInvisible = "Nevidebligi";
-$langSave = "Konservi";
-$langMove = "Movi";
+$Allowed = "Permesita";
+$BackHome = "Reiri al startpaĝo";
+$Propositions = "Proponoj por la plibonigo de";
+$Maj = "Ĝisdatigo";
+$Modify = "Ŝanĝi";
+$Invisible = "Nevidebligi";
+$Save = "Konservi";
+$Move = "Movi";
 $Help = "Helpu";
-$langOk = "En ordo";
-$langAdd = "Aldoni";
-$langAddIntro = "ALDONI ENKONDUKON";
-$langBackList = "Reiri al la listo";
-$langText = "Teksto";
-$langEmpty = "Vi ne plenigis ĉiujn kampojn. <br> Premu la RETRO-klavon kaj rekomencu.<br>Se vi ne scias vian kurskodon, vi povas rigardi al la kurslisto";
-$langConfirmYourChoice = "Bv. konfirmi vian elekton";
-$langAnd = "kaj";
-$langChoice = "Via elekto";
-$langFinish = "Fini";
-$langCancel = "Nuligi";
-$langNotAllowed = "Vi ne estas kursmastrumanto. Vi ne povas fari tion.";
-$langNotLogged = "Vi ne ensalutis en tiun kurson";
-$langManager = "Platformmastrumanto";
-$langOptional = "Laŭvola";
+$Ok = "En ordo";
+$Add = "Aldoni";
+$AddIntro = "ALDONI ENKONDUKON";
+$BackList = "Reiri al la listo";
+$Text = "Teksto";
+$Empty = "Vi ne plenigis ĉiujn kampojn. <br> Premu la RETRO-klavon kaj rekomencu.<br>Se vi ne scias vian kurskodon, vi povas rigardi al la kurslisto";
+$ConfirmYourChoice = "Bv. konfirmi vian elekton";
+$And = "kaj";
+$Choice = "Via elekto";
+$Finish = "Fini";
+$Cancel = "Nuligi";
+$NotAllowed = "Vi ne estas kursmastrumanto. Vi ne povas fari tion.";
+$NotLogged = "Vi ne ensalutis en tiun kurson";
+$Manager = "Platformmastrumanto";
+$Optional = "Laŭvola";
 $NextPage = "Sekvanta paĝo";
 $PreviousPage = "Antaŭa paĝo";
-$langUse = "Uzi";
-$langTotal = "Sumo";
-$langTake = "prenu";
-$langOne = "Unu";
-$langSeveral = "Diversaj";
-$langNotice = "Rimarku";
-$langDate = "Dato";
-$langAmong = "el";
-$langShow = "Montri";
-$langMyCourses = "miajn kursojn";
-$langModifyProfile = "mian profilon";
-$langMyStats = "Montru la statistikon";
-$langLogout = "Adiaŭi";
-$langMyAgenda = "Mia agendo";
-$langCourseHomepage = "Kursaa hejmpaĝo";
-$langCourseManagerview = "Kursmastrumanta vido";
-$langStudentView = "Studenta vido";
+$Use = "Uzi";
+$Total = "Sumo";
+$Take = "prenu";
+$One = "Unu";
+$Several = "Diversaj";
+$Notice = "Rimarku";
+$Date = "Dato";
+$Among = "el";
+$Show = "Montri";
+$MyCourses = "miajn kursojn";
+$ModifyProfile = "mian profilon";
+$MyStats = "Montru la statistikon";
+$Logout = "Adiaŭi";
+$MyAgenda = "Mia agendo";
+$CourseHomepage = "Kursaa hejmpaĝo";
+$CourseManagerview = "Kursmastrumanta vido";
+$StudentView = "Studenta vido";
 $AddResource = "Aldoni materialon";
 $AddedResources = "Aldonitaĵoj";
-$lang_modify_resource = "Ŝanĝi / Aldoni materialon";
-$lang_resource = "Materialo";
-$lang_resources = "Materialoj";
 $langNameOfLang['arabic'] = "araba";
 $langNameOfLang['brazilian'] = "Brazila";
 $langNameOfLang['bulgarian'] = "bulgara";
@@ -129,26 +123,26 @@ $langNameOfLang['russian'] = "rusa";
 $langNameOfLang['simpl_chinese'] = "&#264;ina";
 $langNameOfLang['spanish'] = "hispana";
 $Close = "Fermi";
-$langPlatform = "Platformo";
+$Platform = "Platformo";
 $localLangName = "Esperanto";
 $email = "Retpoŝto  XX";
-$langCourseCodeAlreadyExists = "Tiu kurskodo jam ekzistas. Bonvolu elekti alian.";
+$CourseCodeAlreadyExists = "Tiu kurskodo jam ekzistas. Bonvolu elekti alian.";
 $Statistics = "Statistikoj";
-$langGrouplist = "Gruplisto";
-$langPrevious = "Antaŭa";
+$Grouplist = "Gruplisto";
+$Previous = "Antaŭa";
 $Courses = "kursoj";
 $In = "en";
-$langShowAll = "Montri ĉiujn";
-$langPage = "Paĝo";
+$ShowAll = "Montri ĉiujn";
+$Page = "Paĝo";
 $englishLangName = "Esperanto";
 $Home = "Komenco";
-$langAreYouSureToDelete = "Ĉu vi volas forigi ĉi-dokumenton:";
+$AreYouSureToDelete = "Ĉu vi volas forigi ĉi-dokumenton:";
 $SelectAll = "elekti ĉion";
 $UnSelectAll = "elektu nenion";
 $WithSelected = "Kun elektita";
-$langOnLine = "Konektitaj uzantoj";
-$langUsers = "uzuloj";
-$langPlatformAdmin = "Platformmastrumado";
+$OnLine = "Konektitaj uzantoj";
+$Users = "uzuloj";
+$PlatformAdmin = "Platformmastrumado";
 $langNameOfLang['hungarian'] = "hungara";
 $langNameOfLang['indonesian'] = "indonezia";
 $langNameOfLang['malay'] = "malaja";
@@ -159,21 +153,20 @@ $langNameOfLang['thai'] = "tajlanda";
 $langNameOfLang['turkce'] = "turka";
 $langNameOfLang['vietnamese'] = "vjetnama";
 $UserInfo = "uzulaj informoj";
-$langModifyQuestion = "Ŝanĝi la demandon";
-$langCheckAll = "Kontroli ĉion";
-$langNbAnnoucement = "Komuniko";
-$lang_no_access_here = "Ne aliro ĉi-tien";
-$langOtherCourses = "Aliaj kursoj";
+$ModifyQuestion = "Ŝanĝi la demandon";
+$CheckAll = "Kontroli ĉion";
+$NbAnnoucement = "Komuniko";
+$OtherCourses = "Aliaj kursoj";
 $Doc = "dokumento";
 $PlataformAdmin = "Platformmastrumanto";
 $Groups = "Grupoj";
 $GroupManagement = "Mastrumado de grupoj";
 $All = "ĉio";
 $None = "nenio";
-$langSorry = "Unue vi elektu kurson";
-$langDenied = "Tiu funkcio disponeblas nur al kursadministrantoj.";
+$Sorry = "Unue vi elektu kurson";
+$Denied = "Tiu funkcio disponeblas nur al kursadministrantoj.";
 $Today = "hodiaŭ";
-$langCourseHomepageLink = "Tiu ĉi kurso";
+$CourseHomepageLink = "Tiu ĉi kurso";
 $Attachment = "aldonaĵo";
 $User = "Uzulo";
 $MondayInit = "l";
@@ -233,10 +226,10 @@ $SeptemberLong = "septembro";
 $OctoberLong = "oktobro";
 $NovemberLong = "novembro";
 $DecemberLong = "decembro";
-$langMyCompetences = "Miaj kompetentoj";
-$langMyDiplomas = "Miaj diplomoj";
-$langMyPersonalOpenArea = "Mia persona spaco";
-$langMyTeach = "Pri kio mi povas instrui";
+$MyCompetences = "Miaj kompetentoj";
+$MyDiplomas = "Miaj diplomoj";
+$MyPersonalOpenArea = "Mia persona spaco";
+$MyTeach = "Pri kio mi povas instrui";
 $Agenda = "Agendo";
 $HourShort = "h";
 $PleaseTryAgain = "Bonvolu reprovi!";
@@ -246,7 +239,7 @@ $UplNotAZip = "La de vi transsendita dosiero ne estas zip-dosiero.";
 $UplUploadSucceeded = "La dosiero estis sukcese alŝutita!";
 $ExportAsCSV = "Eksporti kiel CSV-dosieron";
 $ExportAsXLS = "Eksporti kiel XLS-dosieron";
-$langOpenarea = "Persona areo";
+$Openarea = "Persona areo";
 $Done = "Preta";
 $Documents = "Dokumentoj";
 $DocumentAdded = "Dokumento aldonita";
@@ -259,7 +252,7 @@ $Link = "Ligilo";
 $Announcement = "Anoncoj";
 $Dropbox = "Demetujo";
 $Quiz = "Ekzercoj";
-$langChat = "Babilado";
+$Chat = "Babilado";
 $Conference = "Konferenco";
 $Student_publication = "Studentaj publikaĵoj";
 $Tracking = "Statistikoj";
@@ -272,8 +265,8 @@ $StartDate = "Startodato";
 $EndDate = "Fina dato";
 $StartTime = "Startohoro";
 $EndTime = "Fina horo";
-$langYouWereCalled = "Vi povas babili kun";
-$langDoYouAccept = "Ĉu vi konfirmas?";
+$YouWereCalled = "Vi povas babili kun";
+$DoYouAccept = "Ĉu vi konfirmas?";
 $Everybody = "Ĉiuj";
 $SentTo = "Videbla al";
 $Export = "Eksporti";

+ 17 - 18
main/lang/faroese/trad4all.inc.php

@@ -7,32 +7,31 @@ $FieldTypeMobilePhoneNumber = "Fartelefonnummar";
 $Username = "Brúkaranavn";
 $Description = "Lýsing";
 $Links = "Leinkjur";
-$langExercices = "Royndir";
+$Exercices = "Royndir";
 $Name = "Navn";
-$langEdit = "Broyt";
+$Edit = "Broyt";
 $Language = "Mál";
-$langCourseCreate = "Stovna eitt skeið";
-$langCourseCode = "Stytting";
-$langOfficialCode = "Stytting";
+$CourseCreate = "Stovna eitt skeið";
+$CourseCode = "Stytting";
+$OfficialCode = "Stytting";
 $FirstName = "Fornavn";
 $LastName = "Eftirnavn";
-$langEmail = "Teldupostur";
-$Code = "Stytting";
+$Email = "Teldupostur";
 $Search = "Leita";
-$langModify = "Broyt";
+$Modify = "Broyt";
 $Help = "Hjálp";
-$langManager = "Umsitari";
-$langDate = "Dato";
-$langMyCourses = "Míni skeið";
-$langModifyProfile = "Vangamynd";
-$langMyAgenda = "Kalendari";
-$langCourseManagerview = "Vís sum undirvísari";
-$langStudentView = "Vís sum næmingur";
+$Manager = "Umsitari";
+$Date = "Dato";
+$MyCourses = "Míni skeið";
+$ModifyProfile = "Vangamynd";
+$MyAgenda = "Kalendari";
+$CourseManagerview = "Vís sum undirvísari";
+$StudentView = "Vís sum næmingur";
 $Courses = "Skeið";
 $Home = "Heim";
 $SelectAll = "Vel alt";
 $UnSelectAll = "Frável alt";
-$langUsers = "Brúkarar";
+$Users = "Brúkarar";
 $Today = "Í dag";
 $WednesdayInit = "M";
 $ThursdayInit = "H";
@@ -65,7 +64,7 @@ $DecemberLong = "Desember";
 $Agenda = "Kalendari";
 $Average = "Miðal";
 $Learnpath = "Skeið";
-$langChat = "Prát";
+$Chat = "Prát";
 $Tracking = "Frásagnir";
 $Student = "Næmingur";
 $Teacher = "Undirvísari";
@@ -74,7 +73,7 @@ $EditRight = "Broyt";
 $Actions = "Smálutir";
 $Inbox = "Boðklivin";
 $CampusHomepage = "Heim";
-$langMySpace = "Frásagnir";
+$MySpace = "Frásagnir";
 $HomeDirectory = "Heim";
 $Exercise = "Venjing";
 $Result = "Úrslit";

+ 96 - 106
main/lang/finnish/trad4all.inc.php

@@ -10,55 +10,53 @@ $Title = "Otsikko";
 $By = "Kirjoittaja";
 $UsersOnline = "Käyttäjiä kirjautuneena";
 $Remove = "Poista";
-$langEnter = "Sisään.";
+$Enter = "Sisään.";
 $Description = "Kuvaus";
 $Links = "Linkit";
-$langWorks = "Tehtäväpalautus";
+$Works = "Tehtäväpalautus";
 $Forums = "Foorumit";
-$langExercices = "Harjoitukset";
-$langCreateDir = "Luo hakemisto";
+$Exercices = "Harjoitukset";
+$CreateDir = "Luo hakemisto";
 $Name = "Nimi";
-$langComment = "Kommentti";
-$langVisible = "Näkyvä/Näkymätön";
-$langNewDir = "Uuden hakemiston nimi";
-$langDirCr = "Hakemisto on luotu";
+$Comment = "Kommentti";
+$Visible = "Näkyvä/Näkymätön";
+$NewDir = "Uuden hakemiston nimi";
+$DirCr = "Hakemisto on luotu";
 $Download = "Lataa";
-$langGroup = "Ryhmä";
-$langEdit = "muokkaa";
-$langGroupForum = "Ryhmien foorumit";
+$Group = "Ryhmä";
+$Edit = "muokkaa";
+$GroupForum = "Ryhmien foorumit";
 $Language = "Kieli";
 $LoginName = "Kirjaudu";
 $AutostartMp3 = "Haluatko että ääni soitetaan automaattisesti?";
 $Assignments = "Oppilaan tehtävät";
 $Forum = "Keskustelut";
-$langDelImage = "Poista kuva";
-$langCode = "Kurssikoodi";
-$langUp = "Ylös";
+$DelImage = "Poista kuva";
+$Code = "Kurssikoodi";
+$Up = "Ylös";
 $Down = "alas";
-$Up = "ylös";
 $Theme = "Teema";
 $TheListIsEmpty = "Lista on tyhjä";
-$langUniqueSelect = "Monivalinta (yksi oikea vastaus)";
+$UniqueSelect = "Monivalinta (yksi oikea vastaus)";
 $CreateCategory = "Luo kansio";
 $SendFile = "Lataa tiedosto";
 $SaveChanges = "Tallenna muutokset";
 $SearchTerm = "hakusana";
 $TooShort = "Liian lyhyt";
-$langCourseCreate = "Luo kurssille nettisivu";
-$langTodo = "To do";
+$CourseCreate = "Luo kurssille nettisivu";
+$Todo = "To do";
 $UserName = "Käyttäjä";
-$lang_show_hide = "Näytä / piilota";
-$langCategoryMod = "Muokkaa aihealuetta";
+$CategoryMod = "Muokkaa aihealuetta";
 $Hide = "Piilota";
-$langDear = "Hyvä";
-$langArchive = "arkisto";
-$langCourseCode = "Kurssikoodi";
-$langNoDescription = "Ei kuvausta";
-$langOfficialCode = "Virallinen koodi";
+$Dear = "Hyvä";
+$Archive = "arkisto";
+$CourseCode = "Kurssikoodi";
+$NoDescription = "Ei kuvausta";
+$OfficialCode = "Virallinen koodi";
 $FirstName = "Etunimi";
 $LastName = "Sukunimi";
 $Status = "Tila";
-$langEmail = "Sähköposti";
+$Email = "Sähköposti";
 $SlideshowConversion = "Esityksen muuntaminen";
 $UploadFile = "Lataa tiedosto";
 $AvailableFrom = "Saatavilla lähtien";
@@ -68,7 +66,6 @@ $Type = "Tyyppi";
 $EmailAddress = "Sähköpostiosoite";
 $Organisation = "Organisaatio";
 $Reporting = "Raportointi";
-$Code = "Koodi";
 $Update = "Päivitä";
 $SelectQuestionType = "Valitse kysymyksen tyyppi";
 $CurrentCourse = "Nykyinen kurssi";
@@ -98,99 +95,94 @@ $dateFormatShort = "%d.%m.%Y";
 $dateFormatLong = "%A %d.%m.%Y";
 $dateTimeFormatLong = "%d.%m.%Y klo %H:%M";
 $timeNoSecFormat = "%H:%M";
-$langYes = "kyllä";
-$langNo = "Ei";
+$Yes = "kyllä";
+$No = "Ei";
 $Next = "Seuraava";
-$langAllowed = "Sallittu";
-$langBackHome = "Takaisin oamlle sivulle:";
-$langPropositions = "Parannusehdotuksia";
-$langMaj = "Päivitä";
-$langModify = "Muokkaa";
-$langDelete = "Poista";
-$langInvisible = "Piilota";
-$langSave = "Tallenna";
-$langMove = "Siirrä";
+$Allowed = "Sallittu";
+$BackHome = "Takaisin oamlle sivulle:";
+$Propositions = "Parannusehdotuksia";
+$Maj = "Päivitä";
+$Modify = "Muokkaa";
+$Invisible = "Piilota";
+$Save = "Tallenna";
+$Move = "Siirrä";
 $Help = "Apua";
-$langOk = "Ok";
-$langAdd = "Lisää";
-$langAddIntro = "Lisää esittely";
-$langBackList = "Takaisin listaan";
-$langText = "Teksti";
-$langEmpty = "Jätit joitain kenttiä tyhjäksi.<br>Mene takaisin ja yritä uudetaan.<br>Jos et huomannut kurssin koodia, katso kurssin ohjelmasta.";
-$langConfirmYourChoice = "Varmista valintasi";
-$langAnd = "ja";
-$langChoice = "Valintasi";
-$langFinish = "Lopeta";
-$langCancel = "Peruuta";
-$langNotAllowed = "Ei sallittu";
-$langNotLogged = "Et ole kirjautunut kurssille";
-$langManager = "Ylläpitäjä";
-$langOptional = "Valinnainen";
+$Ok = "Ok";
+$Add = "Lisää";
+$AddIntro = "Lisää esittely";
+$BackList = "Takaisin listaan";
+$Text = "Teksti";
+$Empty = "Jätit joitain kenttiä tyhjäksi.<br>Mene takaisin ja yritä uudetaan.<br>Jos et huomannut kurssin koodia, katso kurssin ohjelmasta.";
+$ConfirmYourChoice = "Varmista valintasi";
+$And = "ja";
+$Choice = "Valintasi";
+$Finish = "Lopeta";
+$Cancel = "Peruuta";
+$NotAllowed = "Ei sallittu";
+$NotLogged = "Et ole kirjautunut kurssille";
+$Manager = "Ylläpitäjä";
+$Optional = "Valinnainen";
 $NextPage = "Seuraava sivu";
 $PreviousPage = "Edellinen sivu";
-$langUse = "Käytä";
-$langTotal = "Yhteensä";
-$langTake = "valitse";
-$langOne = "Yksi";
-$langSeveral = "Useita";
-$langNotice = "Huomaa";
-$langDate = "Päivämäärä";
-$langAmong = "joukossa";
-$langShow = "Näytä";
-$langMyCourses = "Kurssini";
-$langModifyProfile = "Muokkaa profiiliani";
-$langMyStats = "Katso tilastojasi";
-$langLogout = "Logout";
-$langMyAgenda = "Oma kalenteri";
-$langCourseHomepage = "Kurssin kotisivu";
-$langCourseManagerview = "Opettajanäkymä";
-$langStudentView = "Oppilasnäkymä";
+$Use = "Käytä";
+$Total = "Yhteensä";
+$Take = "valitse";
+$One = "Yksi";
+$Several = "Useita";
+$Notice = "Huomaa";
+$Date = "Päivämäärä";
+$Among = "joukossa";
+$Show = "Näytä";
+$MyCourses = "Kurssini";
+$ModifyProfile = "Muokkaa profiiliani";
+$MyStats = "Katso tilastojasi";
+$Logout = "Logout";
+$MyAgenda = "Oma kalenteri";
+$CourseHomepage = "Kurssin kotisivu";
+$CourseManagerview = "Opettajanäkymä";
+$StudentView = "Oppilasnäkymä";
 $AddResource = "Lisää";
 $AddedResources = "Liitteet";
-$lang_modify_resource = "Muokkaa / lisää sisältöä";
-$lang_resource = "Sisältö";
-$lang_resources = "Sisällöt";
 $langNameOfLang['arabic'] = "Arabia";
 $langNameOfLang['brazilian'] = "brasilia";
 $langNameOfLang['finnish'] = "suomi";
 $langNameOfLang['spanish'] = "espanja";
 $Close = "sulje";
-$langPlatform = "Alusta";
+$Platform = "Alusta";
 $localLangName = "kieli";
 $email = "sähköposti";
-$langCourseCodeAlreadyExists = "Kurssikoodi on jo käytössä. Ole hyvä ja valitse toinen.";
+$CourseCodeAlreadyExists = "Kurssikoodi on jo käytössä. Ole hyvä ja valitse toinen.";
 $Statistics = "Tilastot";
-$langGrouplist = "ryhmälista";
-$langPrevious = "edellinen";
+$Grouplist = "ryhmälista";
+$Previous = "edellinen";
 $DestDirectoryDoesntExist = "Kohde hakemistoa ei ole olemassa";
 $Courses = "kurssit";
-$langShowAll = "Näytä kaikki";
-$langPage = "Sivu";
+$ShowAll = "Näytä kaikki";
+$Page = "Sivu";
 $englishLangName = "englanti";
 $Home = "Projektin kotisivu";
-$langAreYouSureToDelete = "Haluatko varmasti poistaa";
+$AreYouSureToDelete = "Haluatko varmasti poistaa";
 $SelectAll = "Valitse kaikki";
 $UnSelectAll = "poista valinnat";
 $WithSelected = "Valittujen kanssa";
-$langOnLine = "Kirjautuneena";
-$langUsers = "Käyttäjät";
-$langPlatformAdmin = "Alustan ylläpito";
+$OnLine = "Kirjautuneena";
+$Users = "Käyttäjät";
+$PlatformAdmin = "Alustan ylläpito";
 $UserInfo = "tietoja käyttäjästä";
-$langModifyQuestion = "Muokkaa kysymystä";
-$langCheckAll = "Valitse kaikki";
-$langNbAnnoucement = "Ilmoitus";
-$lang_no_access_here = "Sinulla ei ole pääsyä tänne";
-$langOtherCourses = "Kurssit";
+$ModifyQuestion = "Muokkaa kysymystä";
+$CheckAll = "Valitse kaikki";
+$NbAnnoucement = "Ilmoitus";
+$OtherCourses = "Kurssit";
 $Doc = "tiedosto";
 $PlataformAdmin = "Alustan ylläpitäjä";
 $Groups = "Ryhmät";
 $GroupManagement = "Ryhmän hallinta";
 $All = "Kaikki";
 $None = "Ei mitään";
-$langSorry = "Valitse kurssi ensin";
-$langDenied = "Tämä toiminto on sallittu vain opettajille";
+$Sorry = "Valitse kurssi ensin";
+$Denied = "Tämä toiminto on sallittu vain opettajille";
 $Today = "tänään";
-$langCourseHomepageLink = "Nykyinen kurssi";
+$CourseHomepageLink = "Nykyinen kurssi";
 $Attachment = "liite";
 $User = "Käyttäjä";
 $MondayInit = "Ma";
@@ -250,10 +242,10 @@ $SeptemberLong = "syyskuu";
 $OctoberLong = "lokakuu";
 $NovemberLong = "marraskuu";
 $DecemberLong = "joulukuu";
-$langMyCompetences = "Osaamiseni";
-$langMyDiplomas = "Suoritukseni";
-$langMyPersonalOpenArea = "Lisätietoja minusta";
-$langMyTeach = "Aineet joita opetan";
+$MyCompetences = "Osaamiseni";
+$MyDiplomas = "Suoritukseni";
+$MyPersonalOpenArea = "Lisätietoja minusta";
+$MyTeach = "Aineet joita opetan";
 $Agenda = "Aikataulu";
 $HourShort = "h";
 $PleaseTryAgain = "Yritä uudelleen!";
@@ -263,7 +255,7 @@ $UplNotAZip = "Valitsemasi tiedosto ei ollut zip-tiedosto.";
 $UplUploadSucceeded = "Tiedosto päivitetty onnistuneesti";
 $ExportAsCSV = "Tuo CSV-tiedosto";
 $ExportAsXLS = "Tuo xls-tiedosto";
-$langOpenarea = "Yleinen kuvaus";
+$Openarea = "Yleinen kuvaus";
 $Done = "Valmis";
 $Documents = "Dokumentit";
 $DocumentAdded = "Dokumentti lisätty";
@@ -277,7 +269,7 @@ $Link = "Link";
 $Announcement = "Ilmoitukset";
 $Dropbox = "Tiedostot";
 $Quiz = "Harjoitukset";
-$langChat = "Keskustelu";
+$Chat = "Keskustelu";
 $Conference = "Konferenssi";
 $Student_publication = "Opiskelijoiden julkaisut";
 $Tracking = "Seuranta";
@@ -290,8 +282,8 @@ $StartDate = "Aloituspäivä";
 $EndDate = "Lopetuspäivä";
 $StartTime = "Aloitusaika";
 $EndTime = "Päättymisaika";
-$langYouWereCalled = "Sinut on kutsunut keskustelemaan";
-$langDoYouAccept = "Hyväksytkö sen ?";
+$YouWereCalled = "Sinut on kutsunut keskustelemaan";
+$DoYouAccept = "Hyväksytkö sen ?";
 $Everybody = "Kaikki";
 $SentTo = "Nähtävillä";
 $Export = "Tuo";
@@ -315,7 +307,7 @@ $FormHasErrorsPleaseComplete = "Lomake sisältää vääriä tai puutteellisia t
 $StartDateShouldBeBeforeEndDate = "Alkamispäivän täytyy olla ennen päättymispäivää";
 $InvalidDate = "Epäkelpo päivämäärä";
 $OnlyLettersAndNumbersAllowed = "Vain kirjaimet ja numerot ovat sallittuja";
-$langBasicOverview = "Järjestä";
+$BasicOverview = "Järjestä";
 $CourseAdminRole = "Kurssin ylläpitäjä";
 $UserRole = "Rooli";
 $OnlyImagesAllowed = "Ainoastaan PNG, JPG tai GIF kuvat sallittu";
@@ -329,11 +321,9 @@ $RightValueModified = "Arvoa on muutettu.";
 $course_rights = "Roolien ja oikeuksien yhteenveto";
 $Visio_conference = "Virtuaalitapaaminen";
 $CourseAdminRoleDescription = "Kouluttaja";
-$Move = "Siirrä";
 $MoveTo = "Siirrä";
 $Delete = "Poista";
 $MoveFileTo = "Siirrä tiedosto";
-$Save = "Tallenna";
 $Error = "Virhe";
 $Anonymous = "Anonyymi";
 $h = "h";
@@ -349,9 +339,9 @@ $YouHaveNewMessage = "Sinulle on uusi viesti!";
 $myActiveSessions = "Omat aktiiviset sessiot";
 $myInactiveSessions = "Omat ei aktiiviset sessiot";
 $FileUpload = "Tiedoston tallennus";
-$langMyActiveSessions = "Omat aktiiviset sessiot";
-$langMyInActiveSessions = "Omat ei aktiiviset sessiot";
-$langMySpace = "Raportointi";
+$MyActiveSessions = "Omat aktiiviset sessiot";
+$MyInActiveSessions = "Omat ei aktiiviset sessiot";
+$MySpace = "Raportointi";
 $ExtensionActivedButNotYetOperational = "Tämä laajennos on aktivoitu mutta ei ole vielä käytössä.";
 $MyStudents = "Minun käyttäjäni";
 $Progress = "Edistyminen";
@@ -704,7 +694,7 @@ $New = "Uusi";
 $AddAdditionalProfileField = "Lisää kenttä käyttäjäprofiiliin";
 $UserAdded = "Käyttäjä lisätty";
 $Metadata = "Metadata";
-$langAddMetadata = "Näytä/Muokkaa Metadataa";
+$AddMetadata = "Näytä/Muokkaa Metadataa";
 $SendMessage = "Lähetä viesti";
 $SeeForum = "Näytä keskustelualue";
 $SeeMore = "Näytä lisää";

+ 106 - 109
main/lang/french/trad4all.inc.php

@@ -57,10 +57,12 @@ $HyperbolicArctangentArctanh = "Arctangente hyperbolique:\t\tarctanh(x)";
 $ArctangentArctan = "Arctangente:\t\t\tarctan(x)";
 $HyperbolicTangentTanh = "Tangente hyperbolique:\t\ttanh(x)";
 $TangentTan = "Tangente:\t\t\ttan(x)";
+$CoachAndStudent = "Coach et apprenant";
 $HyperbolicArccosineArccosh = "Arcosinus hyperbolique:\t\tarccosh(x)";
 $ArccosineArccos = "Arccosinus:\t\t\tarccos(x)";
 $HyperbolicCosineCosh = "Cosinus hyperbolique:\t\tcosh(x)";
 $CosineCos = "Cosinus:\t\t\t\tcos(x)";
+$TeacherTimeReport = "Rapport de temps des enseignants";
 $HyperbolicArcsineArcsinh = "Arcsinus hyperbolique:\t\tarcsinh(x)";
 $ArcsineArcsin = "Arcsinus:\t\t\tarcsin(x)";
 $HyperbolicSineSinh = "Sinus hyperbolique:\tsinh(x)";
@@ -307,55 +309,55 @@ $Title = "Titre";
 $By = "Par";
 $UsersOnline = "Utilisateurs en ligne";
 $Remove = "Éliminer";
-$langEnter = "Retourner à votre liste de cours";
+$Enter = "Retourner à votre liste de cours";
 $Description = "Description";
 $Links = "Liens";
-$langWorks = "Travaux";
+$Works = "Travaux";
 $Forums = "Forums";
-$langExercices = "Tests";
-$langCreateDir = "Créer un répertoire";
+$Exercices = "Tests";
+$CreateDir = "Créer un répertoire";
 $Name = "Nom";
-$langComment = "Commentaire";
-$langVisible = "Visible/invisible";
-$langNewDir = "nom du nouveau répertoire";
-$langDirCr = "Répertoire créé";
+$Comment = "Commentaire";
+$Visible = "Visible/invisible";
+$NewDir = "nom du nouveau répertoire";
+$DirCr = "Répertoire créé";
 $Download = "Télécharger";
-$langGroup = "Groupes";
-$langEdit = "éditer";
-$langGroupForum = "Forum du groupe";
+$Group = "Groupes";
+$Edit = "éditer";
+$GroupForum = "Forum du groupe";
 $Language = "Langue";
 $LoginName = "Identifiant";
 $AutostartMp3 = "Cliquez ok si vous souhaitez le démarrage automatique du fichier audio";
 $Assignments = "Travaux";
 $Forum = "Forums";
-$langDelImage = "Supprimer la photo";
-$langCode = "Code cours";
-$langUp = "Monter";
+$DelImage = "Supprimer la photo";
+$Code = "Code cours";
+$Up = "Monter";
 $Down = "descendre";
-$Up = "monter";
+$TimeReportForCourseX = "Rapport de temps pour le cours %s";
 $Theme = "Thème graphique";
 $TheListIsEmpty = "La liste est vide.";
-$langUniqueSelect = "Choix multiple";
+$UniqueSelect = "Choix multiple";
 $CreateCategory = "Créer une catégorie";
 $SendFile = "Importer le document";
 $SaveChanges = "Enregistrer les modifications";
 $SearchTerm = "Rechercher terme";
 $TooShort = "Trop court";
-$langCourseCreate = "Créer un cours";
-$langTodo = "Suggestions";
+$CourseCreate = "Créer un cours";
+$Todo = "Suggestions";
 $UserName = "Nom d'utilisateur";
-$lang_show_hide = "Visible/invisible";
-$langCategoryMod = "Modifier une catégorie";
+$TimeReportIncludingAllCoursesAndSessionsByTeacher = "Rapport de temps, incluant tous les cours et sessions, par enseignant";
+$CategoryMod = "Modifier une catégorie";
 $Hide = "Cacher";
-$langDear = "Cher(ère)";
-$langArchive = "archive";
-$langCourseCode = "Code de cours";
-$langNoDescription = "Aucune description";
-$langOfficialCode = "Code Officiel";
+$Dear = "Cher(ère)";
+$Archive = "archive";
+$CourseCode = "Code de cours";
+$NoDescription = "Aucune description";
+$OfficialCode = "Code Officiel";
 $FirstName = "Prénom";
 $LastName = "Nom";
 $Status = "Statut";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $SlideshowConversion = "Conversion de la présentation";
 $UploadFile = "Envoi du fichier";
 $AvailableFrom = "Disponible à partir de";
@@ -365,7 +367,6 @@ $Type = "Type";
 $EmailAddress = "Adresse email";
 $Organisation = "Organisation";
 $Reporting = "Suivi";
-$Code = "Code";
 $Update = "Actualiser";
 $SelectQuestionType = "Sélectionner type de question";
 $CurrentCourse = "Cours actif";
@@ -395,58 +396,56 @@ $dateFormatShort = "%a %d %b %Y";
 $dateFormatLong = "%A %d %B %Y";
 $dateTimeFormatLong = "%A %d %B %Y à %H:%M";
 $timeNoSecFormat = "%H:%M";
-$langYes = "oui";
-$langNo = "Non";
+$Yes = "oui";
+$No = "Non";
 $Next = "Suivant";
-$langAllowed = "Autorisé";
-$langBackHome = "Retour à la page d'accueil de";
-$langPropositions = "Propositions d'amélioration de";
-$langMaj = "Mise à jour";
-$langModify = "modifier";
-$langDelete = "supprimer";
-$langInvisible = "Rendre invisible";
-$langSave = "Enregistrer";
-$langMove = "Déplacer";
+$Allowed = "Autorisé";
+$BackHome = "Retour à la page d'accueil de";
+$Propositions = "Propositions d'amélioration de";
+$Maj = "Mise à jour";
+$Modify = "modifier";
+$Invisible = "Rendre invisible";
+$Save = "Enregistrer";
+$Move = "Déplacer";
 $Help = "Aide";
-$langOk = "Valider";
-$langAdd = "Ajouter";
-$langAddIntro = "Ajouter un texte d'introduction";
-$langBackList = "Retour à la liste";
-$langText = "Texte";
-$langEmpty = "Vous n'avez pas rempli tous les champs.\n<br />\nUtilisez le bouton de retour en arrière de votre navigateur et recommencez.<br />Si vous ne connaissez pas le code de votre cours, consultez le catalogue des cours";
-$langConfirmYourChoice = "Veuillez confirmer votre choix";
-$langAnd = "et";
-$langChoice = "Votre choix";
-$langFinish = "Terminer";
-$langCancel = "Annuler";
-$langNotAllowed = "Vous n'êtes pas autorisé à accéder à cette page. Soit votre connexion a expiré, soit vous essayez d'accéder à une page pour laquelle vous ne disposez pas des permissions suffisantes.";
-$langNotLogged = "Vous n'êtes pas identifié";
-$langManager = "Responsable";
-$langOptional = "Facultatif";
+$Ok = "Valider";
+$Add = "Ajouter";
+$AddIntro = "Ajouter un texte d'introduction";
+$BackList = "Retour à la liste";
+$Text = "Texte";
+$Empty = "Vous n'avez pas rempli tous les champs.\n<br />\nUtilisez le bouton de retour en arrière de votre navigateur et recommencez.<br />Si vous ne connaissez pas le code de votre cours, consultez le catalogue des cours";
+$ConfirmYourChoice = "Veuillez confirmer votre choix";
+$And = "et";
+$Choice = "Votre choix";
+$Finish = "Terminer";
+$Cancel = "Annuler";
+$NotAllowed = "Vous n'êtes pas autorisé à accéder à cette page. Soit votre connexion a expiré, soit vous essayez d'accéder à une page pour laquelle vous ne disposez pas des permissions suffisantes.";
+$NotLogged = "Vous n'êtes pas identifié";
+$Manager = "Responsable";
+$Optional = "Facultatif";
 $NextPage = "Page suivante";
 $PreviousPage = "Page précédente";
-$langUse = "Utiliser";
-$langTotal = "Total";
-$langTake = "faire (au sens de passer) le test";
-$langOne = "Une";
-$langSeveral = "Plusieurs";
-$langNotice = "Remarque";
-$langDate = "Date";
-$langAmong = "parmi";
-$langShow = "Afficher";
-$langMyCourses = "Mes cours";
-$langModifyProfile = "Mon profil";
-$langMyStats = "Mon parcours";
-$langLogout = "Quitter";
-$langMyAgenda = "Agenda perso";
-$langCourseHomepage = "Sommaire du cours";
-$langCourseManagerview = "Vue prof";
-$langStudentView = "Vue apprenant";
+$Use = "Utiliser";
+$Total = "Total";
+$Take = "faire (au sens de passer) le test";
+$One = "Une";
+$Several = "Plusieurs";
+$Notice = "Remarque";
+$Date = "Date";
+$Among = "parmi";
+$Show = "Afficher";
+$MyCourses = "Mes cours";
+$ModifyProfile = "Mon profil";
+$MyStats = "Mon parcours";
+$Logout = "Quitter";
+$MyAgenda = "Agenda perso";
+$CourseHomepage = "Sommaire du cours";
+$CourseManagerview = "Vue prof";
+$StudentView = "Vue apprenant";
 $AddResource = "Ajouter une ressource";
 $AddedResources = "Ressources ajoutées";
-$lang_modify_resource = "Modifier / Ajouter une ressource";
-$lang_resource = "Ressource";
-$lang_resources = "Ressources";
+$TimeReportForTeacherX = "Rapport de temps pour l'enseignant %s";
+$TotalTime = "Temps total";
 $langNameOfLang['arabic'] = "arabe";
 $langNameOfLang['brazilian'] = "brésilien";
 $langNameOfLang['bulgarian'] = "bulgare";
@@ -470,27 +469,27 @@ $langNameOfLang['russian'] = "russe";
 $langNameOfLang['simpl_chinese'] = "chinois simple";
 $langNameOfLang['spanish'] = "espagnol";
 $Close = "Fermer";
-$langPlatform = "Plateforme";
+$Platform = "Plateforme";
 $localLangName = "français";
 $email = "email";
-$langCourseCodeAlreadyExists = "Désolé, mais ce code de cours existe déjà. Veuillez en choisir un autre.";
+$CourseCodeAlreadyExists = "Désolé, mais ce code de cours existe déjà. Veuillez en choisir un autre.";
 $Statistics = "Statistiques";
-$langGrouplist = "Liste des groupes";
-$langPrevious = "précédent";
+$Grouplist = "Liste des groupes";
+$Previous = "précédent";
 $DestDirectoryDoesntExist = "Le répertoire de destination n'existe pas";
 $Courses = "cours";
 $In = "dans";
-$langShowAll = "Afficher tout";
-$langPage = "Page";
+$ShowAll = "Afficher tout";
+$Page = "Page";
 $englishLangName = "Anglais";
 $Home = "Accueil";
-$langAreYouSureToDelete = "Êtes-vous sûr de vouloir supprimer";
+$AreYouSureToDelete = "Êtes-vous sûr de vouloir supprimer";
 $SelectAll = "Tout sélectionner";
 $UnSelectAll = "annuler toutes les sélections";
 $WithSelected = "avec les sélections";
-$langOnLine = "En ligne";
-$langUsers = "utilisateurs";
-$langPlatformAdmin = "Administration";
+$OnLine = "En ligne";
+$Users = "utilisateurs";
+$PlatformAdmin = "Administration";
 $langNameOfLang['hungarian'] = "hongrois";
 $langNameOfLang['indonesian'] = "indonésien";
 $langNameOfLang['malay'] = "malaisien";
@@ -501,22 +500,21 @@ $langNameOfLang['thai'] = "thaïlandais";
 $langNameOfLang['turkce'] = "turque";
 $langNameOfLang['vietnamese'] = "vietnamien";
 $UserInfo = "Fiche utilisateur";
-$langModifyQuestion = "Modifier la question";
+$ModifyQuestion = "Modifier la question";
 $Example = "Exemple";
-$langCheckAll = "Sélectionner tout";
-$langNbAnnoucement = "Annonces";
-$lang_no_access_here = "Pas d'accès";
-$langOtherCourses = "autres cours";
+$CheckAll = "Sélectionner tout";
+$NbAnnoucement = "Annonces";
+$OtherCourses = "autres cours";
 $Doc = "Parcours";
 $PlataformAdmin = "Administrateur de la plateforme";
 $Groups = "Groupes";
 $GroupManagement = "Gestion de groupe";
 $All = "tout";
-$None = "rien";
-$langSorry = "Sélectionnez d'abord un cours";
-$langDenied = "Cette fonction est accessible seulement aux administrateurs de cours.";
+$None = "Aucun(e)";
+$Sorry = "Sélectionnez d'abord un cours";
+$Denied = "Cette fonction est accessible seulement aux administrateurs de cours.";
 $Today = "aujourd'hui";
-$langCourseHomepageLink = "Page d'accueil du cours";
+$CourseHomepageLink = "Page d'accueil du cours";
 $Attachment = "Joindre";
 $User = "Utilisateur";
 $MondayInit = "L";
@@ -576,10 +574,10 @@ $SeptemberLong = "Septembre";
 $OctoberLong = "Octobre";
 $NovemberLong = "Novembre";
 $DecemberLong = "Décembre";
-$langMyCompetences = "Mes compétences";
-$langMyDiplomas = "Mes diplômes";
-$langMyPersonalOpenArea = "Mon espace personnel";
-$langMyTeach = "Mes compétences professionnelles";
+$MyCompetences = "Mes compétences";
+$MyDiplomas = "Mes diplômes";
+$MyPersonalOpenArea = "Mon espace personnel";
+$MyTeach = "Mes compétences professionnelles";
 $Agenda = "Agenda";
 $HourShort = "h";
 $PleaseTryAgain = "Veuillez réessayer svp !";
@@ -589,7 +587,7 @@ $UplNotAZip = "Le fichier que vous avez sélectionné n'était pas un fichier zi
 $UplUploadSucceeded = "Envoi du fichier réussi !";
 $ExportAsCSV = "Export CSV";
 $ExportAsXLS = "Export Excel";
-$langOpenarea = "Espace perso";
+$Openarea = "Espace perso";
 $Done = "Terminé";
 $Documents = "Documents";
 $DocumentAdded = "Document ajouté";
@@ -603,7 +601,7 @@ $Link = "Liens";
 $Announcement = "Annonces";
 $Dropbox = "Partage de fichiers";
 $Quiz = "Tests";
-$langChat = "Discuter";
+$Chat = "Discuter";
 $Conference = "Conférence";
 $Student_publication = "Travaux";
 $Tracking = "Suivi";
@@ -616,8 +614,8 @@ $StartDate = "Date de début";
 $EndDate = "Date de fin";
 $StartTime = "Heure de début";
 $EndTime = "Heure de fin";
-$langYouWereCalled = "Vous êtes invité à utiliser le \"chat\" avec";
-$langDoYouAccept = "Acceptez-vous la demande ?";
+$YouWereCalled = "Vous êtes invité à utiliser le \"chat\" avec";
+$DoYouAccept = "Acceptez-vous la demande ?";
 $Everybody = "Tous";
 $SentTo = "Envoyé à";
 $Export = "Exporter";
@@ -641,7 +639,7 @@ $FormHasErrorsPleaseComplete = "Le formulaire contient des données incomplètes
 $StartDateShouldBeBeforeEndDate = "La date de départ doit être antérieure à la date finale";
 $InvalidDate = "Date invalide";
 $OnlyLettersAndNumbersAllowed = "Seuls les lettres et les chiffres sont autorisés";
-$langBasicOverview = "Organiser";
+$BasicOverview = "Organiser";
 $CourseAdminRole = "Administrateur de cours";
 $UserRole = "Rôle";
 $OnlyImagesAllowed = "Seuls les formats PNG, JPG ou GIF sont autorisés";
@@ -651,16 +649,15 @@ $DeleteRight = "Supprimer";
 $OverviewCourseRights = "Vue d'ensemble des rôles & droits";
 $SeeAllRightsAllLocationsForSpecificRole = "Rôle :";
 $SeeAllRolesAllLocationsForSpecificRight = "Droit :";
-$langAdvanced = "Construire";
+$Advanced = "Construire";
 $RightValueModified = "La valeur a été modifiée";
 $course_rights = "Vue d'ensemble des rôles & droits";
 $Visio_conference = "Réunion virtuelle";
 $CourseAdminRoleDescription = "Administrateur du cours";
-$Move = "Déplacer";
 $MoveTo = "Déplacer vers";
 $Delete = "Supprimer";
 $MoveFileTo = "Déplacer fichier vers";
-$Save = "Enregistrer";
+$TimeReportForSessionX = "Rapport de temps pour la session %s";
 $Error = "Erreur";
 $Anonymous = "Anonyme";
 $h = "h";
@@ -676,9 +673,9 @@ $YouHaveNewMessage = "Vous avez un nouveau message !";
 $myActiveSessions = "Mes sessions actives";
 $myInactiveSessions = "Mes sessions inactives";
 $FileUpload = "Envoi de fichier";
-$langMyActiveSessions = "Mes sessions actives";
-$langMyInActiveSessions = "Mes sessions inactives";
-$langMySpace = "Suivi";
+$MyActiveSessions = "Mes sessions actives";
+$MyInActiveSessions = "Mes sessions inactives";
+$MySpace = "Suivi";
 $ExtensionActivedButNotYetOperational = "Cette extension a été activée mais ne peut pas être opérationnelle pour le moment.";
 $MyStudents = "Mes apprenants";
 $Progress = "Progression";
@@ -994,7 +991,7 @@ $NoTemplatePreview = "Prévisualisation non disponible";
 $ModifyCategory = "Modifier la catégorie";
 $Photo = "Photo";
 $MoveFile = "Déplacer le fichier";
-$Filter = "Filtre";
+$Filter = "Filtrer";
 $Subject = "Sujet";
 $Message = "Message";
 $MoreInformation = "Plus d'info";
@@ -1096,7 +1093,7 @@ $InvitationDenied = "Invitation rejetée";
 $UserAdded = "L'utilisateur a été ajouté";
 $UpdatedIn = "Mise à jour le";
 $Metadata = "Méta-données";
-$langAddMetadata = "Visualiser/modifier métadonnées";
+$AddMetadata = "Visualiser/modifier métadonnées";
 $SendMessage = "Envoyer message";
 $SeeForum = "Voir forum";
 $SeeMore = "En savoir plus";

+ 97 - 107
main/lang/galician/trad4all.inc.php

@@ -18,55 +18,53 @@ $Title = "Título";
 $By = "Por";
 $UsersOnline = "Usuarios conectados";
 $Remove = "Eliminar";
-$langEnter = "Entrar no curso";
+$Enter = "Entrar no curso";
 $Description = "Descrición";
 $Links = "Ligazóns";
-$langWorks = "Traballos";
+$Works = "Traballos";
 $Forums = "Foros";
-$langExercices = "Exercicios";
-$langCreateDir = "Crear un directorio";
+$Exercices = "Exercicios";
+$CreateDir = "Crear un directorio";
 $Name = "Nome";
-$langComment = "Comentario";
-$langVisible = "Visible/invisible";
-$langNewDir = "Nome do novo cartafol";
-$langDirCr = "Directorio creado";
+$Comment = "Comentario";
+$Visible = "Visible/invisible";
+$NewDir = "Nome do novo cartafol";
+$DirCr = "Directorio creado";
 $Download = "Descargar";
-$langGroup = "Grupo";
-$langEdit = "editar";
-$langGroupForum = "Foro";
+$Group = "Grupo";
+$Edit = "editar";
+$GroupForum = "Foro";
 $Language = "Idioma";
 $LoginName = "Nome de usuario";
 $AutostartMp3 = "Pulse OK se desexa que o arquivo de audio se reproduza automaticamente.";
 $Assignments = "Tarefas dos estudantes";
 $Forum = "Foros";
-$langDelImage = "Borrar imaxe";
-$langCode = "Código do curso";
-$langUp = "Subir";
-$Down = "Descargar";
+$DelImage = "Borrar imaxe";
+$Code = "Código do curso";
 $Up = "Subir";
+$Down = "Descargar";
 $Theme = "Tema";
 $TheListIsEmpty = "A lista está valeira";
-$langUniqueSelect = "Elección múltiple (Resposta única)";
+$UniqueSelect = "Elección múltiple (Resposta única)";
 $CreateCategory = "Crear directorio";
 $SendFile = "Subir documento";
 $SaveChanges = "Gardar trocos";
 $SearchTerm = "Procurar término";
 $TooShort = "Moi curto";
-$langCourseCreate = "Crear un Curso";
-$langTodo = "Suxestións";
+$CourseCreate = "Crear un Curso";
+$Todo = "Suxestións";
 $UserName = "Nome de usuario";
-$lang_show_hide = "Amosar / ocultar";
-$langCategoryMod = "Modificar categoría";
+$CategoryMod = "Modificar categoría";
 $Hide = "Agochar";
-$langDear = "Estimado(a)";
-$langArchive = "arquivo";
-$langCourseCode = "Código do curso";
-$langNoDescription = "Sen descripción";
-$langOfficialCode = "Código oficial";
+$Dear = "Estimado(a)";
+$Archive = "arquivo";
+$CourseCode = "Código do curso";
+$NoDescription = "Sen descripción";
+$OfficialCode = "Código oficial";
 $FirstName = "Nome";
 $LastName = "Apelidos";
 $Status = "Status";
-$langEmail = "Email";
+$Email = "Email";
 $SlideshowConversion = "Conversión da presentación";
 $UploadFile = "Enviar arquivo";
 $AvailableFrom = "Dispoñible de";
@@ -76,7 +74,6 @@ $Type = "Tipo";
 $EmailAddress = "Enderezo de correo electrónico";
 $Organisation = "Organización";
 $Reporting = "Informe";
-$Code = "Código";
 $Update = "Actualizar";
 $SelectQuestionType = "Seleccionar tipo de cuestión";
 $CurrentCourse = "Curso actual";
@@ -106,58 +103,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "Si";
-$langNo = "Non";
+$Yes = "Si";
+$No = "Non";
 $Next = "Seguinte";
-$langAllowed = "Permitida";
-$langBackHome = "Voltar á páxina principal de";
-$langPropositions = "Propostas de mellora de";
-$langMaj = "Actualizar";
-$langModify = "modificar";
-$langDelete = "borrar";
-$langInvisible = "Facer invisible";
-$langSave = "Gardar";
-$langMove = "Desprazar";
+$Allowed = "Permitida";
+$BackHome = "Voltar á páxina principal de";
+$Propositions = "Propostas de mellora de";
+$Maj = "Actualizar";
+$Modify = "modificar";
+$Invisible = "Facer invisible";
+$Save = "Gardar";
+$Move = "Desprazar";
 $Help = "Axuda";
-$langOk = "validar";
-$langAdd = "engadir";
-$langAddIntro = "Engadir un texto de introducción";
-$langBackList = "Volver á lista";
-$langText = "Texto";
-$langEmpty = "Vostede non cubriu todos os campos.<br>Utilice o botón de retorno do seu navegador e volte empezar.<br>Se vostede non coñece o código do seu curso, consulte o programa do curso";
-$langConfirmYourChoice = "Confirme a súa elección";
-$langAnd = "e";
-$langChoice = "A súa elección";
-$langFinish = "Rematar";
-$langCancel = "Cancelar";
-$langNotAllowed = "Vostede non está identificado como responsable deste curso";
-$langNotLogged = "Non se che permite a entrada no curso";
-$langManager = "Responsable";
-$langOptional = "Opcional";
+$Ok = "validar";
+$Add = "engadir";
+$AddIntro = "Engadir un texto de introducción";
+$BackList = "Volver á lista";
+$Text = "Texto";
+$Empty = "Vostede non cubriu todos os campos.<br>Utilice o botón de retorno do seu navegador e volte empezar.<br>Se vostede non coñece o código do seu curso, consulte o programa do curso";
+$ConfirmYourChoice = "Confirme a súa elección";
+$And = "e";
+$Choice = "A súa elección";
+$Finish = "Rematar";
+$Cancel = "Cancelar";
+$NotAllowed = "Vostede non está identificado como responsable deste curso";
+$NotLogged = "Non se che permite a entrada no curso";
+$Manager = "Responsable";
+$Optional = "Opcional";
 $NextPage = "Páxina seguinte";
 $PreviousPage = "Páxina anterior";
-$langUse = "Use";
-$langTotal = "Total";
-$langTake = "facer";
-$langOne = "Un";
-$langSeveral = "Varios";
-$langNotice = "Observa";
-$langDate = "Datas";
-$langAmong = "entre";
-$langShow = "Mostrar";
-$langMyCourses = "Lista de cursos";
-$langModifyProfile = "Perfil";
-$langMyStats = "Ver as miñas estatísticas";
-$langLogout = "Saír";
-$langMyAgenda = "A miña axenda";
-$langCourseHomepage = "Páxina inicial do curso";
-$langCourseManagerview = "Vista do profesor";
-$langStudentView = "Vista do alumno";
+$Use = "Use";
+$Total = "Total";
+$Take = "facer";
+$One = "Un";
+$Several = "Varios";
+$Notice = "Observa";
+$Date = "Datas";
+$Among = "entre";
+$Show = "Mostrar";
+$MyCourses = "Lista de cursos";
+$ModifyProfile = "Perfil";
+$MyStats = "Ver as miñas estatísticas";
+$Logout = "Saír";
+$MyAgenda = "A miña axenda";
+$CourseHomepage = "Páxina inicial do curso";
+$CourseManagerview = "Vista do profesor";
+$StudentView = "Vista do alumno";
 $AddResource = "Engadir recurso";
 $AddedResources = "Recursos engadidos";
-$lang_modify_resource = "Modificar/Engadir recursos";
-$lang_resource = "Recurso";
-$lang_resources = "Recursos";
 $langNameOfLang['arabic'] = "árabe";
 $langNameOfLang['brazilian'] = "brasileiro";
 $langNameOfLang['bulgarian'] = "búlgaro";
@@ -181,27 +174,27 @@ $langNameOfLang['russian'] = "ruso";
 $langNameOfLang['simpl_chinese'] = "chino simplificado";
 $langNameOfLang['spanish'] = "español";
 $Close = "pechar";
-$langPlatform = "Plataforma";
+$Platform = "Plataforma";
 $localLangName = "galego";
 $email = "correo electrónico";
-$langCourseCodeAlreadyExists = "Parece que o código do curso xa existe. Por favor, escolle outro código.";
+$CourseCodeAlreadyExists = "Parece que o código do curso xa existe. Por favor, escolle outro código.";
 $Statistics = "Estatísticas";
-$langGrouplist = "lista de grupos";
-$langPrevious = "anterior";
+$Grouplist = "lista de grupos";
+$Previous = "anterior";
 $DestDirectoryDoesntExist = "O directorio de destino non existe";
 $Courses = "cursos";
 $In = "en";
-$langShowAll = "Mostrar todos";
-$langPage = "Páxina";
+$ShowAll = "Mostrar todos";
+$Page = "Páxina";
 $englishLangName = "Galician";
 $Home = "Principal";
-$langAreYouSureToDelete = "¿Está seguro de que quere borralo?";
+$AreYouSureToDelete = "¿Está seguro de que quere borralo?";
 $SelectAll = "Seleccionar todo";
 $UnSelectAll = "Quitarlles a selección a todos";
 $WithSelected = "co seleccionado";
-$langOnLine = "En liña";
-$langUsers = "Usuarios";
-$langPlatformAdmin = "Administración da plataforma";
+$OnLine = "En liña";
+$Users = "Usuarios";
+$PlatformAdmin = "Administración da plataforma";
 $langNameOfLang['hungarian'] = "húngaro";
 $langNameOfLang['indonesian'] = "indonesio";
 $langNameOfLang['malay'] = "malaio";
@@ -212,22 +205,21 @@ $langNameOfLang['thai'] = "tailandés";
 $langNameOfLang['turkce'] = "turco";
 $langNameOfLang['vietnamese'] = "vietnamita";
 $UserInfo = "Información do usuario";
-$langModifyQuestion = "Modificar a pregunta";
+$ModifyQuestion = "Modificar a pregunta";
 $Example = "Exemplo";
-$langCheckAll = "comprobar";
-$langNbAnnoucement = "Avisos";
-$lang_no_access_here = "Non ten autorización para acceder aquí";
-$langOtherCourses = "outros cursos";
+$CheckAll = "comprobar";
+$NbAnnoucement = "Avisos";
+$OtherCourses = "outros cursos";
 $Doc = "documento";
 $PlataformAdmin = "Administración da plataforma";
 $Groups = "Grupos";
 $GroupManagement = "Xestión de grupos";
 $All = "Todo";
 $None = "nada";
-$langSorry = "Seleccione primeiro un curso";
-$langDenied = "Esta función só está dispoñible para os administradores do curso";
+$Sorry = "Seleccione primeiro un curso";
+$Denied = "Esta función só está dispoñible para os administradores do curso";
 $Today = "hoxe";
-$langCourseHomepageLink = "Curso actual";
+$CourseHomepageLink = "Curso actual";
 $Attachment = "Adxuntar";
 $User = "Usuario";
 $MondayInit = "L";
@@ -287,10 +279,10 @@ $SeptemberLong = "Setembro";
 $OctoberLong = "Outubro";
 $NovemberLong = "Novembro";
 $DecemberLong = "Decembro";
-$langMyCompetences = "As miñas competencias";
-$langMyDiplomas = "Os meus títulos";
-$langMyPersonalOpenArea = "A miña área persoal pública";
-$langMyTeach = "Que podo ensinar";
+$MyCompetences = "As miñas competencias";
+$MyDiplomas = "Os meus títulos";
+$MyPersonalOpenArea = "A miña área persoal pública";
+$MyTeach = "Que podo ensinar";
 $Agenda = "Axenda";
 $HourShort = "h";
 $PleaseTryAgain = "¡Por favor, tenta outra vez!";
@@ -300,7 +292,7 @@ $UplNotAZip = "O ficheiro seleccionado non é un ficheiro zip.";
 $UplUploadSucceeded = "¡O arquivo xa se enviou!";
 $ExportAsCSV = "Exportar a un ficheiro CSV";
 $ExportAsXLS = "Exportar a un ficheiro XLS";
-$langOpenarea = "Área persoal aberta";
+$Openarea = "Área persoal aberta";
 $Done = "Feito";
 $Documents = "Documentos";
 $DocumentAdded = "Documento engadido";
@@ -314,7 +306,7 @@ $Link = "Ligazón";
 $Announcement = "Anuncios";
 $Dropbox = "Buzón de ficheiros";
 $Quiz = "Exercicios";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Conferencia Online";
 $Student_publication = "Tarefas";
 $Tracking = "Estatísticas";
@@ -327,8 +319,8 @@ $StartDate = "Data de comezo";
 $EndDate = "Data final";
 $StartTime = "Hora de comezo";
 $EndTime = "Hora final";
-$langYouWereCalled = "Estante chamando pra chatear con";
-$langDoYouAccept = "¿Acéptao?";
+$YouWereCalled = "Estante chamando pra chatear con";
+$DoYouAccept = "¿Acéptao?";
 $Everybody = "Todos";
 $SentTo = "Visible por";
 $Export = "Exportar";
@@ -352,7 +344,7 @@ $FormHasErrorsPleaseComplete = "O formulario contén datos incorrectos ou que fa
 $StartDateShouldBeBeforeEndDate = "A primeira data debería ser anterior á data final";
 $InvalidDate = "Data incorrecta";
 $OnlyLettersAndNumbersAllowed = "Somentes se permiten letras e números";
-$langBasicOverview = "Vista básica";
+$BasicOverview = "Vista básica";
 $CourseAdminRole = "Administrador do curso";
 $UserRole = "Rol de usuario";
 $OnlyImagesAllowed = "Só se permiten imaxes PNG, JPG e GIF";
@@ -362,16 +354,14 @@ $DeleteRight = "Eliminar";
 $OverviewCourseRights = "Vista de roles e permisos";
 $SeeAllRightsAllLocationsForSpecificRole = "Rol";
 $SeeAllRolesAllLocationsForSpecificRight = "Ver todos os roles e lugares para un dereito específico";
-$langAdvanced = "Avanzado";
+$Advanced = "Avanzado";
 $RightValueModified = "O valor foi modificado";
 $course_rights = "Vista de roles e permisos";
 $Visio_conference = "Videoconferencia";
 $CourseAdminRoleDescription = "Administrador do curso";
-$Move = "Mover";
 $MoveTo = "mover a";
 $Delete = "Borrar";
 $MoveFileTo = "Mover arquivo a";
-$Save = "Gardar";
 $Error = "Erro";
 $Anonymous = "Anónimo";
 $h = "h";
@@ -387,9 +377,9 @@ $YouHaveNewMessage = "Ten unha nova mensaxe!";
 $myActiveSessions = "As miñas Sesións activas";
 $myInactiveSessions = "As miñas sesións inactivas";
 $FileUpload = "Arquivo enviado";
-$langMyActiveSessions = "As miñas Sesións activas";
-$langMyInActiveSessions = "As miñas sesións inactivas";
-$langMySpace = "O meu espazo";
+$MyActiveSessions = "As miñas Sesións activas";
+$MyInActiveSessions = "As miñas sesións inactivas";
+$MySpace = "O meu espazo";
 $ExtensionActivedButNotYetOperational = "Activouse esta extensión pero non é operativa polo de agora.";
 $MyStudents = "Os meus estudantes";
 $Progress = "Progreso";
@@ -808,7 +798,7 @@ $InvitationDenied = "Invitación rexeitada";
 $UserAdded = "O usuario está engadido";
 $UpdatedIn = "Actualizado o";
 $Metadata = "Metadatos";
-$langAddMetadata = "Ver/Editar Metadatos";
+$AddMetadata = "Ver/Editar Metadatos";
 $SendMessage = "Enviar mensaxe";
 $SeeForum = "Ver foro";
 $SeeMore = "Ver máis";

+ 97 - 107
main/lang/german/trad4all.inc.php

@@ -13,55 +13,53 @@ $Title = "Titel";
 $By = "von";
 $UsersOnline = "Benutzer online";
 $Remove = "Entfernen";
-$langEnter = "Kurs betreten";
+$Enter = "Kurs betreten";
 $Description = "Beschreibung";
 $Links = "Links";
-$langWorks = "Ausarbeitungen";
+$Works = "Ausarbeitungen";
 $Forums = "Foren";
-$langExercices = "Tests";
-$langCreateDir = "Verzeichnis erstellen";
+$Exercices = "Tests";
+$CreateDir = "Verzeichnis erstellen";
 $Name = "Name";
-$langComment = "Kommentar";
-$langVisible = "sichtbar/unsichtbar";
-$langNewDir = "Name des neuen Verzeichnisses";
-$langDirCr = "Verzeichnis erstellt";
+$Comment = "Kommentar";
+$Visible = "sichtbar/unsichtbar";
+$NewDir = "Name des neuen Verzeichnisses";
+$DirCr = "Verzeichnis erstellt";
 $Download = "Download";
-$langGroup = "Gruppen";
-$langEdit = "bearbeiten";
-$langGroupForum = "Gruppen-Forum";
+$Group = "Gruppen";
+$Edit = "bearbeiten";
+$GroupForum = "Gruppen-Forum";
 $Language = "Sprache";
 $LoginName = "Login";
 $AutostartMp3 = "OK klicken, wenn die Audio Datei automatisch abgespielt werden soll";
 $Assignments = "Ausarbeitungen";
 $Forum = "Forum";
-$langDelImage = "Bild entfernen";
-$langCode = "Kürzel";
-$langUp = "höhere Ebene";
+$DelImage = "Bild entfernen";
+$Code = "Kürzel";
+$Up = "höhere Ebene";
 $Down = "nach unten";
-$Up = "nach oben";
 $Theme = "Grafische Vorlage";
 $TheListIsEmpty = "Leer";
-$langUniqueSelect = "Multiple Choice (eine Antwort je Frage)";
+$UniqueSelect = "Multiple Choice (eine Antwort je Frage)";
 $CreateCategory = "Ordner erstellen";
 $SendFile = "Dokument hochladen";
 $SaveChanges = "Änderungen speichern";
 $SearchTerm = "Nach Begriff suchen";
 $TooShort = "Zu kurz";
-$langCourseCreate = "Einen Kurs einrichten";
-$langTodo = "Noch zu tun";
+$CourseCreate = "Einen Kurs einrichten";
+$Todo = "Noch zu tun";
 $UserName = "Benutzername";
-$lang_show_hide = "Sichtbar / unsichtbar";
-$langCategoryMod = "Kategorie bearbeiten";
+$CategoryMod = "Kategorie bearbeiten";
 $Hide = "Verbergen";
-$langDear = "Hallo";
-$langArchive = "Archiv";
-$langCourseCode = "Kürzel";
-$langNoDescription = "Keine Beschreibung";
-$langOfficialCode = "Kürzel";
+$Dear = "Hallo";
+$Archive = "Archiv";
+$CourseCode = "Kürzel";
+$NoDescription = "Keine Beschreibung";
+$OfficialCode = "Kürzel";
 $FirstName = "Vorname";
 $LastName = "Nachname";
 $Status = "Status";
-$langEmail = "E-Mail";
+$Email = "E-Mail";
 $SlideshowConversion = "Diashow Konvertierung";
 $UploadFile = "Datei hochladen";
 $AvailableFrom = "Verfügbar in";
@@ -71,7 +69,6 @@ $Type = "Typ";
 $EmailAddress = "E-Mail Adresse";
 $Organisation = "Organisation / Firma";
 $Reporting = "Auswertung";
-$Code = "Kürzel";
 $Update = "Aktualisierung";
 $SelectQuestionType = "Fragetyp auswählen";
 $CurrentCourse = "dieser Kurs";
@@ -101,58 +98,54 @@ $dateFormatShort = "%d. %b %y";
 $dateFormatLong = "%A %d. %B %Y";
 $dateTimeFormatLong = "%d. %B %Y um %H:%M";
 $timeNoSecFormat = "%H:%M";
-$langYes = "Ja";
-$langNo = "Nein";
+$Yes = "Ja";
+$No = "Nein";
 $Next = "weiter";
-$langAllowed = "erlaubt";
-$langBackHome = "Zurück zur Homepage von";
-$langPropositions = "Verbesserungsvorschläge für";
-$langMaj = "Aktualisierung";
-$langModify = "ändern";
-$langDelete = "löschen";
-$langInvisible = "unsichtbar";
-$langSave = "Speichern";
-$langMove = "verschieben";
+$Allowed = "erlaubt";
+$BackHome = "Zurück zur Homepage von";
+$Propositions = "Verbesserungsvorschläge für";
+$Maj = "Aktualisierung";
+$Modify = "ändern";
+$Invisible = "unsichtbar";
+$Save = "Speichern";
+$Move = "verschieben";
 $Help = "Hilfe";
-$langOk = "Ok";
-$langAdd = "hinzufügen";
-$langAddIntro = "Einführungstext hinzufügen";
-$langBackList = "Zurück zur Liste";
-$langText = "Text";
-$langEmpty = "Einige Felder wurden leer gelassen.<br>Benutzen Sie den <b>'Zurück'</b> Button und versuchen Sie es erneut.<br>Wenn Sie das Kürzel nicht verwenden, schauen Sie sich bitte das Kursprogramm an";
-$langConfirmYourChoice = "Bitte bestätigen Sie Ihre Auswahl";
-$langAnd = "und";
-$langChoice = "Ihre Wahl";
-$langFinish = "beenden";
-$langCancel = "Abbruch";
-$langNotAllowed = "Diese Seite kann nicht angezeigt werden. Entweder ist Ihre Session abgelaufen oder Sie haben keine Berechtigung dieses Seite aufzurufen.";
-$langNotLogged = "Sie sind nicht eingeloggt";
-$langManager = "Kursleiter";
-$langOptional = "Optional";
+$Ok = "Ok";
+$Add = "hinzufügen";
+$AddIntro = "Einführungstext hinzufügen";
+$BackList = "Zurück zur Liste";
+$Text = "Text";
+$Empty = "Einige Felder wurden leer gelassen.<br>Benutzen Sie den <b>'Zurück'</b> Button und versuchen Sie es erneut.<br>Wenn Sie das Kürzel nicht verwenden, schauen Sie sich bitte das Kursprogramm an";
+$ConfirmYourChoice = "Bitte bestätigen Sie Ihre Auswahl";
+$And = "und";
+$Choice = "Ihre Wahl";
+$Finish = "beenden";
+$Cancel = "Abbruch";
+$NotAllowed = "Diese Seite kann nicht angezeigt werden. Entweder ist Ihre Session abgelaufen oder Sie haben keine Berechtigung dieses Seite aufzurufen.";
+$NotLogged = "Sie sind nicht eingeloggt";
+$Manager = "Kursleiter";
+$Optional = "Optional";
 $NextPage = "Nächste Seite";
 $PreviousPage = "Vorherige Seite";
-$langUse = "Zugriffe";
-$langTotal = "Gesamt";
-$langTake = "tun";
-$langOne = "Eine";
-$langSeveral = "Mehrere";
-$langNotice = "Anmerkung";
-$langDate = "Datum";
-$langAmong = "von";
-$langShow = "anzeigen";
-$langMyCourses = "Meine Kurse";
-$langModifyProfile = "Mein Profil";
-$langMyStats = "Mein Fortschritt";
-$langLogout = "Logout";
-$langMyAgenda = "Mein Kalender";
-$langCourseHomepage = "Kurs Home";
-$langCourseManagerview = "Kursleiter-Ansicht";
-$langStudentView = "Teilnehmer-Ansicht";
+$Use = "Zugriffe";
+$Total = "Gesamt";
+$Take = "tun";
+$One = "Eine";
+$Several = "Mehrere";
+$Notice = "Anmerkung";
+$Date = "Datum";
+$Among = "von";
+$Show = "anzeigen";
+$MyCourses = "Meine Kurse";
+$ModifyProfile = "Mein Profil";
+$MyStats = "Mein Fortschritt";
+$Logout = "Logout";
+$MyAgenda = "Mein Kalender";
+$CourseHomepage = "Kurs Home";
+$CourseManagerview = "Kursleiter-Ansicht";
+$StudentView = "Teilnehmer-Ansicht";
 $AddResource = "Hinzufügen";
 $AddedResources = "Anhänge";
-$lang_modify_resource = "Ändern/hinzufügen";
-$lang_resource = "Element";
-$lang_resources = "Elemente";
 $langNameOfLang['arabic'] = "Arabisch";
 $langNameOfLang['brazilian'] = "Brasilianisch";
 $langNameOfLang['bulgarian'] = "Bulgarisch";
@@ -176,27 +169,27 @@ $langNameOfLang['russian'] = "Russisch";
 $langNameOfLang['simpl_chinese'] = "Einfaches Chinesisch";
 $langNameOfLang['spanish'] = "Spanisch";
 $Close = "schließen";
-$langPlatform = "Portal";
+$Platform = "Portal";
 $localLangName = "Sprache";
 $email = "E-Mail";
-$langCourseCodeAlreadyExists = "Dieses Kürzel existiert bereits. Benutzen Sie bitte ein anderes Kürzel";
+$CourseCodeAlreadyExists = "Dieses Kürzel existiert bereits. Benutzen Sie bitte ein anderes Kürzel";
 $Statistics = "Auswertung";
-$langGrouplist = "Gruppen-Liste";
-$langPrevious = "vorherige";
+$Grouplist = "Gruppen-Liste";
+$Previous = "vorherige";
 $DestDirectoryDoesntExist = "Das Zielverzeichnis ist nicht vorhanden";
 $Courses = "Kurse";
 $In = "in";
-$langShowAll = "Alles zeigen";
-$langPage = "Seite";
+$ShowAll = "Alles zeigen";
+$Page = "Seite";
 $englishLangName = "Name der Sprache auf Englisch";
 $Home = "Home";
-$langAreYouSureToDelete = "Wollen Sie wirklich löschen";
+$AreYouSureToDelete = "Wollen Sie wirklich löschen";
 $SelectAll = "Alle auswählen";
 $UnSelectAll = "Auswahl aufheben";
 $WithSelected = "Mit Auswahl";
-$langOnLine = "Online";
-$langUsers = "Benutzer";
-$langPlatformAdmin = "Administration";
+$OnLine = "Online";
+$Users = "Benutzer";
+$PlatformAdmin = "Administration";
 $langNameOfLang['hungarian'] = "Ungarisch";
 $langNameOfLang['indonesian'] = "Indonesisch";
 $langNameOfLang['malay'] = "Malaisch";
@@ -207,22 +200,21 @@ $langNameOfLang['thai'] = "Thai";
 $langNameOfLang['turkce'] = "türkisch";
 $langNameOfLang['vietnamese'] = "Vietnamesisch";
 $UserInfo = "Benutzer Information";
-$langModifyQuestion = "Fragen ändern";
+$ModifyQuestion = "Fragen ändern";
 $Example = "Beispiel";
-$langCheckAll = "Alle prüfen";
-$langNbAnnoucement = "Ankündigung";
-$lang_no_access_here = "Kein Zugriff";
-$langOtherCourses = "andere Kurse";
+$CheckAll = "Alle prüfen";
+$NbAnnoucement = "Ankündigung";
+$OtherCourses = "andere Kurse";
 $Doc = "Dokument";
 $PlataformAdmin = "Administrator";
 $Groups = "Gruppen";
 $GroupManagement = "Gruppen-Verwaltung";
 $All = "Alles";
 $None = "nichts";
-$langSorry = "Zuerst einen Kurs auswählen";
-$langDenied = "Diese Funktion ist Kursleitern vorbehalten";
+$Sorry = "Zuerst einen Kurs auswählen";
+$Denied = "Diese Funktion ist Kursleitern vorbehalten";
 $Today = "heute";
-$langCourseHomepageLink = "Home (Kurs)";
+$CourseHomepageLink = "Home (Kurs)";
 $Attachment = "Anhang";
 $User = "Benutzer";
 $MondayInit = "M";
@@ -282,10 +274,10 @@ $SeptemberLong = "September";
 $OctoberLong = "Oktober";
 $NovemberLong = "November";
 $DecemberLong = "Dezember";
-$langMyCompetences = "Meine Kompetenzen";
-$langMyDiplomas = "Meine Abschlüsse";
-$langMyPersonalOpenArea = "Mein persönlicher öffentlicher Bereich";
-$langMyTeach = "Was ich unterrichten kann";
+$MyCompetences = "Meine Kompetenzen";
+$MyDiplomas = "Meine Abschlüsse";
+$MyPersonalOpenArea = "Mein persönlicher öffentlicher Bereich";
+$MyTeach = "Was ich unterrichten kann";
 $Agenda = "Kalender";
 $HourShort = ":";
 $PleaseTryAgain = "Bitte nochmals versuchen!";
@@ -295,7 +287,7 @@ $UplNotAZip = "Die ausgewählte Datei ist keine ZIP Datei.";
 $UplUploadSucceeded = "Hochladen der Datei war erfolgreich!";
 $ExportAsCSV = "Export als CSV Datei";
 $ExportAsXLS = "Export als XLS Datei";
-$langOpenarea = "Persönlicher öffentlicher Bereich";
+$Openarea = "Persönlicher öffentlicher Bereich";
 $Done = "Erledigt";
 $Documents = "Dokumente";
 $DocumentAdded = "Dokument wurde hinzugefügt";
@@ -309,7 +301,7 @@ $Link = "Links";
 $Announcement = "Ankündigungen";
 $Dropbox = "Dateikiste";
 $Quiz = "Tests";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Konferenz";
 $Student_publication = "Ausarbeitungen";
 $Tracking = "Auswertungen";
@@ -322,8 +314,8 @@ $StartDate = "Anfangsdatum";
 $EndDate = "Enddatum";
 $StartTime = "Beginn";
 $EndTime = "Ende";
-$langYouWereCalled = "Sie haben eine Chat-Anfrage erhalten";
-$langDoYouAccept = "Wollen Sie diese akzeptieren?";
+$YouWereCalled = "Sie haben eine Chat-Anfrage erhalten";
+$DoYouAccept = "Wollen Sie diese akzeptieren?";
 $Everybody = "Alle";
 $SentTo = "Gesendet an";
 $Export = "Exportieren";
@@ -347,7 +339,7 @@ $FormHasErrorsPleaseComplete = "Das Formular enthält inkorrekte Daten, oder es
 $StartDateShouldBeBeforeEndDate = "Das Anfangsdatum muss vor dem Enddatum liegen";
 $InvalidDate = "Ungültiges Datum";
 $OnlyLettersAndNumbersAllowed = "Es sind nur Buchstaben und Ziffern erlaubt.";
-$langBasicOverview = "Übersicht";
+$BasicOverview = "Übersicht";
 $CourseAdminRole = "Kursleiter";
 $UserRole = "Rolle";
 $OnlyImagesAllowed = "Es sind nur Bilddateien im PNG, JPG oder GIF Format erlaubt.";
@@ -357,16 +349,14 @@ $DeleteRight = "löschen";
 $OverviewCourseRights = "Überblick Rollen & Rechte";
 $SeeAllRightsAllLocationsForSpecificRole = "Ansicht der Rolle";
 $SeeAllRolesAllLocationsForSpecificRight = "Alle Rollen und Bereiche für ein spezifisches Recht ansehen";
-$langAdvanced = "Authoring";
+$Advanced = "Authoring";
 $RightValueModified = "Wert wurde geändert";
 $course_rights = "Überblick Rollen & Rechte";
 $Visio_conference = "Visioconference";
 $CourseAdminRoleDescription = "Kursleiter";
-$Move = "Verschieben";
 $MoveTo = "Verschieben nach";
 $Delete = "Löschen";
 $MoveFileTo = "Datei verschieben nach";
-$Save = "Speichern";
 $Error = "Fehler";
 $Anonymous = "Anonym";
 $h = "h";
@@ -382,9 +372,9 @@ $YouHaveNewMessage = "Sie haben eine neue Nachricht!";
 $myActiveSessions = "Meine aktiven Session-Kurse";
 $myInactiveSessions = "Meine inaktiven Session-Kurse";
 $FileUpload = "Datei Upload";
-$langMyActiveSessions = "Meine aktiven Sessions-Kurse";
-$langMyInActiveSessions = "Meine inaktiven Session-Kurse";
-$langMySpace = "Meine Auswertung";
+$MyActiveSessions = "Meine aktiven Sessions-Kurse";
+$MyInActiveSessions = "Meine inaktiven Session-Kurse";
+$MySpace = "Meine Auswertung";
 $ExtensionActivedButNotYetOperational = "Diese Erweiterung wurde aktiviert, kann aber momentan nicht benutzt werden";
 $MyStudents = "Meine Teilnehmer";
 $Progress = "Fortschritt";
@@ -801,7 +791,7 @@ $InvitationDenied = "Einladung abgelehnt";
 $UserAdded = "Benutzer hinzugefügt";
 $UpdatedIn = "Aktualisiert auf";
 $Metadata = "Metadaten";
-$langAddMetadata = "Metadaten ansehen/bearbeiten";
+$AddMetadata = "Metadaten ansehen/bearbeiten";
 $SendMessage = "Nachricht senden";
 $SeeForum = "Forum anzeigen";
 $SeeMore = "mehr";

+ 97 - 107
main/lang/greek/trad4all.inc.php

@@ -15,55 +15,53 @@ $Title = "Τίτλος";
 $By = "Από";
 $UsersOnline = "Συνδεδεμένοι Χρήστες";
 $Remove = "Μετακίνηση σε";
-$langEnter = "Είσοδος";
+$Enter = "Είσοδος";
 $Description = "Περιγραφή";
 $Links = "Σύνδεσμοι";
-$langWorks = "Αναθέσεις";
+$Works = "Αναθέσεις";
 $Forums = "Περιοχή συζητήσεων";
-$langExercices = "Test";
-$langCreateDir = "Δημιουργία φακέλου";
+$Exercices = "Test";
+$CreateDir = "Δημιουργία φακέλου";
 $Name = "Όνομα";
-$langComment = "Σχόλια";
-$langVisible = "Ορατό / Αόρατο";
-$langNewDir = "Όνομα νέου φακέλου";
-$langDirCr = "Ο φάκελος δημιουργήθηκε";
+$Comment = "Σχόλια";
+$Visible = "Ορατό / Αόρατο";
+$NewDir = "Όνομα νέου φακέλου";
+$DirCr = "Ο φάκελος δημιουργήθηκε";
 $Download = "Κατέβασμα";
-$langGroup = "Ομάδες";
-$langEdit = "Επεξεργασία";
-$langGroupForum = "Forum Ομάδας";
+$Group = "Ομάδες";
+$Edit = "Επεξεργασία";
+$GroupForum = "Forum Ομάδας";
 $Language = "Γλώσσα";
 $LoginName = "Είσοδος";
 $AutostartMp3 = "Do you want audio file to START automatically?";
 $Assignments = "Αναθέσεις";
 $Forum = "Περιοχή συζητήσεων";
-$langDelImage = "Αφαίρεση εικόνας";
-$langCode = "Κωδικός Μαθήματος";
-$langUp = "Πάνω";
-$Down = "Κατέβασμα";
+$DelImage = "Αφαίρεση εικόνας";
+$Code = "Κωδικός Μαθήματος";
 $Up = "Πάνω";
+$Down = "Κατέβασμα";
 $Theme = "Γραφικό θέμα";
 $TheListIsEmpty = "Η λίστα είναι άδεια";
-$langUniqueSelect = "Πολλαπλής Επιλογής (Μοναδική Απάντηση)";
+$UniqueSelect = "Πολλαπλής Επιλογής (Μοναδική Απάντηση)";
 $CreateCategory = "Δημιουργία";
 $SendFile = "Ανέβασμα εγγράφου";
 $SaveChanges = "Αποθήκευση αλλαγών";
 $SearchTerm = "Αναζήτηση όρου";
 $TooShort = "Πολύ μικρό μήκος";
-$langCourseCreate = "Δημιουργία ενός μαθήματος";
-$langTodo = "Να γίνουν";
+$CourseCreate = "Δημιουργία ενός μαθήματος";
+$Todo = "Να γίνουν";
 $UserName = "Όνομα χρήστη";
-$lang_show_hide = "Εμφάνιση / Απόκρυφη";
-$langCategoryMod = "Επεξεργασία κατηγορίας";
+$CategoryMod = "Επεξεργασία κατηγορίας";
 $Hide = "Απόκρυψη";
-$langDear = "Προς:";
-$langArchive = "αρχειοθέτηση";
-$langCourseCode = "Κωδικός Μαθήματος";
-$langNoDescription = "Χωρίς περιγραφή";
-$langOfficialCode = "Κωδική Ονομασία";
+$Dear = "Προς:";
+$Archive = "αρχειοθέτηση";
+$CourseCode = "Κωδικός Μαθήματος";
+$NoDescription = "Χωρίς περιγραφή";
+$OfficialCode = "Κωδική Ονομασία";
 $FirstName = "Όνομα";
 $LastName = "Επίθετο";
 $Status = "Κατάσταση";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $SlideshowConversion = "Slideshow conversion";
 $UploadFile = "Ανέβασμα αρχείου";
 $AvailableFrom = "Σε διάθεση από";
@@ -73,7 +71,6 @@ $Type = "Τύπος";
 $EmailAddress = "Διεύθυνση Εmail";
 $Organisation = "Εταιρια";
 $Reporting = "Αναφορές";
-$Code = "Κωδικός";
 $Update = "Ενημέρωση";
 $SelectQuestionType = "Επιλογή τύπου ερώτησης";
 $CurrentCourse = "Επιλεγμένο μάθημα";
@@ -103,58 +100,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y στις %H:%M";
 $timeNoSecFormat = "%H:%M";
-$langYes = "Ναι";
-$langNo = "Όχι";
+$Yes = "Ναι";
+$No = "Όχι";
 $Next = "Επόμενος";
-$langAllowed = "Επιτρέπεται";
-$langBackHome = "Επιστροφή στην αρχική σελίδα του";
-$langPropositions = "Προτάσεις για την βελτίωση του";
-$langMaj = "Ενημέρωση";
-$langModify = "Επεξεργασία";
-$langDelete = "διαγραφή";
-$langInvisible = "Αόρατο";
-$langSave = "Αποστολή μηνύματο";
-$langMove = "Μετακίνηση";
+$Allowed = "Επιτρέπεται";
+$BackHome = "Επιστροφή στην αρχική σελίδα του";
+$Propositions = "Προτάσεις για την βελτίωση του";
+$Maj = "Ενημέρωση";
+$Modify = "Επεξεργασία";
+$Invisible = "Αόρατο";
+$Save = "Αποστολή μηνύματο";
+$Move = "Μετακίνηση";
 $Help = "Βοήθεια";
-$langOk = "ΟΚ";
-$langAdd = "Προσθήκη";
-$langAddIntro = "Προσθήκη κειμένου εισαγωγής";
-$langBackList = "Επιστροφή στη λίστα";
-$langText = "Κείμενο";
-$langEmpty = "Αφήσατε μερικά πεδία κενά.<br>Πατήστε το πλήκτρο «Επιστροφή» του browser και ξαναδοκιμάστε.";
-$langConfirmYourChoice = "Παρακαλώ επικυρώστε την επιλογή σας";
-$langAnd = "και";
-$langChoice = "Η επιλογή σας";
-$langFinish = "Τέλος test";
-$langCancel = "Ακύρωση";
-$langNotAllowed = "Δεν επιτρέπεται να δείτε αυτή την σελίδα. (τέλος χρόνου/δικαιώματα)";
-$langNotLogged = "Δεν έχετε εισέλθει";
-$langManager = "Διαχειριστής";
-$langOptional = "Προαιρετικά";
+$Ok = "ΟΚ";
+$Add = "Προσθήκη";
+$AddIntro = "Προσθήκη κειμένου εισαγωγής";
+$BackList = "Επιστροφή στη λίστα";
+$Text = "Κείμενο";
+$Empty = "Αφήσατε μερικά πεδία κενά.<br>Πατήστε το πλήκτρο «Επιστροφή» του browser και ξαναδοκιμάστε.";
+$ConfirmYourChoice = "Παρακαλώ επικυρώστε την επιλογή σας";
+$And = "και";
+$Choice = "Η επιλογή σας";
+$Finish = "Τέλος test";
+$Cancel = "Ακύρωση";
+$NotAllowed = "Δεν επιτρέπεται να δείτε αυτή την σελίδα. (τέλος χρόνου/δικαιώματα)";
+$NotLogged = "Δεν έχετε εισέλθει";
+$Manager = "Διαχειριστής";
+$Optional = "Προαιρετικά";
 $NextPage = "Επόμενη σελίδα";
 $PreviousPage = "Προηγούμενη σελίδα";
-$langUse = "Χρήση";
-$langTotal = "Σύνολο";
-$langTake = "διάλεξε";
-$langOne = "Ένα";
-$langSeveral = "Αρκετοί";
-$langNotice = "Ειδοποίηση";
-$langDate = "Ημερομηνία";
-$langAmong = "μεταξύ";
-$langShow = "Εμφάνιση";
-$langMyCourses = "Τα μαθήματά μου";
-$langModifyProfile = "Προφίλ";
-$langMyStats = "Προβολή των στατιστικών μου";
-$langLogout = "Έξοδος";
-$langMyAgenda = "Η αντζέντα μου";
-$langCourseHomepage = "Κεντρική σελίδα του μαθήματος";
-$langCourseManagerview = "Όψη εκπαιδευτικού";
-$langStudentView = "Όψη μαθητή";
+$Use = "Χρήση";
+$Total = "Σύνολο";
+$Take = "διάλεξε";
+$One = "Ένα";
+$Several = "Αρκετοί";
+$Notice = "Ειδοποίηση";
+$Date = "Ημερομηνία";
+$Among = "μεταξύ";
+$Show = "Εμφάνιση";
+$MyCourses = "Τα μαθήματά μου";
+$ModifyProfile = "Προφίλ";
+$MyStats = "Προβολή των στατιστικών μου";
+$Logout = "Έξοδος";
+$MyAgenda = "Η αντζέντα μου";
+$CourseHomepage = "Κεντρική σελίδα του μαθήματος";
+$CourseManagerview = "Όψη εκπαιδευτικού";
+$StudentView = "Όψη μαθητή";
 $AddResource = "Προσθήκη";
 $AddedResources = "Επισυνάψεις";
-$lang_modify_resource = "Επεξεργασία / Προσθήκη πόρων";
-$lang_resource = "Πόρος";
-$lang_resources = "Πόροι";
 $langNameOfLang['arabic'] = "áñáâéêÜ";
 $langNameOfLang['brazilian'] = "ÂñáæéëéÜíéêá";
 $langNameOfLang['bulgarian'] = "âïõëãáñéêÜ";
@@ -173,27 +166,27 @@ $langNameOfLang['russian'] = "ñùóéêÜ";
 $langNameOfLang['simpl_chinese'] = "ÊéíÝæéêá";
 $langNameOfLang['spanish'] = "éóðáíéêÜ";
 $Close = "Κλείσιμο";
-$langPlatform = "Πλατφόρμα";
+$Platform = "Πλατφόρμα";
 $localLangName = "γλώσσα";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Ο κωδικός αυτού του μαθήματος υπάρχει ήδη. Παρακαλούμε επιλέξτε κάποιον άλλο";
+$CourseCodeAlreadyExists = "Ο κωδικός αυτού του μαθήματος υπάρχει ήδη. Παρακαλούμε επιλέξτε κάποιον άλλο";
 $Statistics = "Στατιστικά";
-$langGrouplist = "Λίστα ομάδων";
-$langPrevious = "Προηγούμενος";
+$Grouplist = "Λίστα ομάδων";
+$Previous = "Προηγούμενος";
 $DestDirectoryDoesntExist = "Ο φάκελος δεν υπάρχει";
 $Courses = "Μαθήματα";
 $In = "Πληροφορία";
-$langShowAll = "Προβολή όλων";
-$langPage = "Σελίδα";
+$ShowAll = "Προβολή όλων";
+$Page = "Σελίδα";
 $englishLangName = "Αγγλικά";
 $Home = "Αρχική";
-$langAreYouSureToDelete = "Είστε σίγουροι για την διαγραφή";
+$AreYouSureToDelete = "Είστε σίγουροι για την διαγραφή";
 $SelectAll = "Επιλογή όλων";
 $UnSelectAll = "Αποεπιλογή όλων";
 $WithSelected = "Με τα επιλεγμένα";
-$langOnLine = "Σε Σύνδεση";
-$langUsers = "Χρήστες";
-$langPlatformAdmin = "Διαχειριστής";
+$OnLine = "Σε Σύνδεση";
+$Users = "Χρήστες";
+$PlatformAdmin = "Διαχειριστής";
 $langNameOfLang['hungarian'] = "ïõããáñÝæéêá";
 $langNameOfLang['indonesian'] = "éíäïíçóéáêÜ";
 $langNameOfLang['slovenian'] = "óëïâåíéêÜ";
@@ -201,22 +194,21 @@ $langNameOfLang['swedish'] = "óïõçäéêÜ";
 $langNameOfLang['thai'] = "ôáúëáíäÝæéêá";
 $langNameOfLang['turkce'] = "ôïõñêéêÜ";
 $UserInfo = "Πληροφορίες χρήστη";
-$langModifyQuestion = "Μετατροπή μιας ερώτησης";
+$ModifyQuestion = "Μετατροπή μιας ερώτησης";
 $Example = "Παράδειγμα";
-$langCheckAll = "Επιλογή όλων";
-$langNbAnnoucement = "Ανακοίνωση";
-$lang_no_access_here = "Δεν επιτρέπεται η πρόσβαση εδώ";
-$langOtherCourses = "άλλα μαθήματα";
+$CheckAll = "Επιλογή όλων";
+$NbAnnoucement = "Ανακοίνωση";
+$OtherCourses = "άλλα μαθήματα";
 $Doc = "Εκπαίδευση";
 $PlataformAdmin = "Διαχειριστής Πλατφόρμας";
 $Groups = "Ομάδες";
 $GroupManagement = "Διαχείριση ομάδων";
 $All = "Όλες/Όλα";
 $None = "Καμία/Κανένα";
-$langSorry = "Επιλογή εκπαίδευης πρώτα";
-$langDenied = "Η λειτουργία είναι διαθέσιμη μόνο σε εκπαιδευτικούς";
+$Sorry = "Επιλογή εκπαίδευης πρώτα";
+$Denied = "Η λειτουργία είναι διαθέσιμη μόνο σε εκπαιδευτικούς";
 $Today = "Σήμερα";
-$langCourseHomepageLink = "Αρχική σελίδα μαθήματος";
+$CourseHomepageLink = "Αρχική σελίδα μαθήματος";
 $Attachment = "Επισύναψη";
 $User = "Χρήστης";
 $MondayInit = "Δ";
@@ -276,10 +268,10 @@ $SeptemberLong = "Σεπτέμβριος";
 $OctoberLong = "Οκτώβριος";
 $NovemberLong = "Νοέμβριος";
 $DecemberLong = "Δεκέμβριος";
-$langMyCompetences = "Οι συμμετοχές μου";
-$langMyDiplomas = "Τα διπλώματά μου";
-$langMyPersonalOpenArea = "My personal open area";
-$langMyTeach = "Τι μπορώ να διδάξω";
+$MyCompetences = "Οι συμμετοχές μου";
+$MyDiplomas = "Τα διπλώματά μου";
+$MyPersonalOpenArea = "My personal open area";
+$MyTeach = "Τι μπορώ να διδάξω";
 $Agenda = "Αντζέντα";
 $HourShort = "ω";
 $PleaseTryAgain = "Παρακαλούμε προσπαθήστε ξανά!";
@@ -289,7 +281,7 @@ $UplNotAZip = "Το αρχείο που επιλέξατε δεν ήταν αρ
 $UplUploadSucceeded = "Το αρχείο ανένηκε επιτυχώς";
 $ExportAsCSV = "Εξαγωγή ως αρχείο CSV";
 $ExportAsXLS = "Εξαγωγή ως αρχείο XLS";
-$langOpenarea = "Ανοιχτός προσωπικός χώρος";
+$Openarea = "Ανοιχτός προσωπικός χώρος";
 $Done = "Επιτυχία";
 $Documents = "Έγγραφα";
 $DocumentAdded = "Το έγγραφο προστέθηκε";
@@ -303,7 +295,7 @@ $Link = "Σύνδεσμοι";
 $Announcement = "Ανακοινώσεις";
 $Dropbox = "Dropbox";
 $Quiz = "Test";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Σύσκεψη";
 $Student_publication = "Αναθέσεις";
 $Tracking = "Αναφορές";
@@ -316,8 +308,8 @@ $StartDate = "Ημερ. Έναρξης";
 $EndDate = "Ημερ. Λήξης";
 $StartTime = "Ώρα Εκκίνησης";
 $EndTime = "Ώρα Τερματισμού";
-$langYouWereCalled = "Προσκαλεστήκατε σε chat από τον/την";
-$langDoYouAccept = "Αποδοχή";
+$YouWereCalled = "Προσκαλεστήκατε σε chat από τον/την";
+$DoYouAccept = "Αποδοχή";
 $Everybody = "Όλοι";
 $SentTo = "Αποστολή σε";
 $Export = "Εξαγωγή ως αρχείο CSV";
@@ -341,7 +333,7 @@ $FormHasErrorsPleaseComplete = "Ελέξτε τα γραφόμενά σας.";
 $StartDateShouldBeBeforeEndDate = "Η πρώτη ημερομηνία πρέπει να είναι πιο πίσω από την δεύτερη";
 $InvalidDate = "Μη έγγυρη ημερομηνία";
 $OnlyLettersAndNumbersAllowed = "Επιτρέπονται μόνο γράμματα και αριθμοί";
-$langBasicOverview = "Οργάνωση";
+$BasicOverview = "Οργάνωση";
 $CourseAdminRole = "Διαχειριστής μαθήματος";
 $UserRole = "Ρόλος";
 $OnlyImagesAllowed = "Μόνο PNG, JPG ή GIF εικόνες επιτρέπονται";
@@ -351,16 +343,14 @@ $DeleteRight = "Διαγραφή";
 $OverviewCourseRights = "Ανασκόπηση ρόλων και δικαιωμάτων";
 $SeeAllRightsAllLocationsForSpecificRole = "Focus στο ρόλο";
 $SeeAllRolesAllLocationsForSpecificRight = "Focus στο δικαίωμα";
-$langAdvanced = "Authoring";
+$Advanced = "Authoring";
 $RightValueModified = "Η τιμή έχει αλλάξει";
 $course_rights = "Ανασκόπηση ρόλων και δικαιωμάτων";
 $Visio_conference = "Εικονική συνάντηση";
 $CourseAdminRoleDescription = "Εκπαιδευτικός";
-$Move = "Μεταφορά";
 $MoveTo = "Μεταφορά σε";
 $Delete = "Διαγραφή";
 $MoveFileTo = "Μεταφορά αρχείου σε";
-$Save = "Αποθήκευση";
 $Error = "Σφάλμα";
 $Anonymous = "Ανώνυμος";
 $h = "ω";
@@ -376,9 +366,9 @@ $YouHaveNewMessage = "Έχετε νέο μήνυμα";
 $myActiveSessions = "Οι ενεργές περιόδοί μου";
 $myInactiveSessions = "Οι ανενεργές περιόδοί μου";
 $FileUpload = "Ανέβασμα αρχείου";
-$langMyActiveSessions = "Οι ενεργές περιόδοί μου";
-$langMyInActiveSessions = "Οι ανενεργές περιόδοί μου";
-$langMySpace = "Αναφορές";
+$MyActiveSessions = "Οι ενεργές περιόδοί μου";
+$MyInActiveSessions = "Οι ανενεργές περιόδοί μου";
+$MySpace = "Αναφορές";
 $ExtensionActivedButNotYetOperational = "This extension has been actived but can't be operational for the moment.";
 $MyStudents = "Οι εκπαιδευόμενοί μου";
 $Progress = "Πρόοδος";
@@ -771,7 +761,7 @@ $InvitationDenied = "Η πρόσκληση δεν έγινε δεκτή";
 $UserAdded = "Ο χρήστης προστέθηκε";
 $UpdatedIn = "Updated on";
 $Metadata = "Metadata";
-$langAddMetadata = "Εμφάνιση/επεξεργασία μεταδεδομένων";
+$AddMetadata = "Εμφάνιση/επεξεργασία μεταδεδομένων";
 $SendMessage = "Αποστολή μηνύματος";
 $SeeForum = "Δείτε το forum";
 $SeeMore = "Εμφάνιση περισσότερων επιλογών";

+ 96 - 106
main/lang/hungarian/trad4all.inc.php

@@ -9,55 +9,53 @@ $Title = "Cím";
 $By = "Szerző";
 $UsersOnline = "Jelenlévő felhasználó";
 $Remove = "Eltávolít";
-$langEnter = "Vissza a kurzuslistámhoz";
+$Enter = "Vissza a kurzuslistámhoz";
 $Description = "Leírás";
 $Links = "Hivatkozások";
-$langWorks = "Beadványok";
+$Works = "Beadványok";
 $Forums = "Fórumok";
-$langExercices = "Tesztek";
-$langCreateDir = "Könyvtár létrehozása";
+$Exercices = "Tesztek";
+$CreateDir = "Könyvtár létrehozása";
 $Name = "Név";
-$langComment = "Megjegyzés";
-$langVisible = "Látható/rejtett";
-$langNewDir = "Az új könyvtár neve";
-$langDirCr = "Könyvtár létrehozva";
+$Comment = "Megjegyzés";
+$Visible = "Látható/rejtett";
+$NewDir = "Az új könyvtár neve";
+$DirCr = "Könyvtár létrehozva";
 $Download = "Letöltés";
-$langGroup = "Csoport";
-$langEdit = "szerkeszt";
-$langGroupForum = "Csoport fóruma";
+$Group = "Csoport";
+$Edit = "szerkeszt";
+$GroupForum = "Csoport fóruma";
 $Language = "Nyelv";
 $LoginName = "Azonosító";
 $AutostartMp3 = "Kattintson az OK-ra, ha azt szeretné, hogy a hangfájl lejátszása automatikusan elinduljon";
 $Assignments = "Hallgatói publikációk";
 $Forum = "Fórumok";
-$langDelImage = "Kép eltávolítása";
-$langCode = "Kurzus kód";
-$langUp = "Fel";
+$DelImage = "Kép eltávolítása";
+$Code = "Kurzus kód";
+$Up = "Fel";
 $Down = "le";
-$Up = "fel";
 $Theme = "Téma";
 $TheListIsEmpty = "A lista üres.";
-$langUniqueSelect = "Több válaszból egy helyes";
+$UniqueSelect = "Több válaszból egy helyes";
 $CreateCategory = "Mappa létrehozása";
 $SendFile = "Állomány feltöltése";
 $SaveChanges = "Változások mentése";
 $SearchTerm = "Keresett szó";
 $TooShort = "Túl rövid";
-$langCourseCreate = "Kurzus website létrehozása";
-$langTodo = "Tennivalók";
+$CourseCreate = "Kurzus website létrehozása";
+$Todo = "Tennivalók";
 $UserName = "Felhasználói név";
-$lang_show_hide = "Mutat / Elrejt";
-$langCategoryMod = "Kategória módosítása";
+$CategoryMod = "Kategória módosítása";
 $Hide = "Elrejt";
-$langDear = "Kedves";
-$langArchive = "archív";
-$langCourseCode = "Kurzuskód";
-$langNoDescription = "Nincs leírás";
-$langOfficialCode = "Hivatalos kód";
+$Dear = "Kedves";
+$Archive = "archív";
+$CourseCode = "Kurzuskód";
+$NoDescription = "Nincs leírás";
+$OfficialCode = "Hivatalos kód";
 $FirstName = "Keresztnév";
 $LastName = "Vezetéknév";
 $Status = "Státusz";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $SlideshowConversion = "Diabemutató konverziója";
 $UploadFile = "Fájl feltöltése";
 $AvailableFrom = "Mikortól elérhető:";
@@ -67,7 +65,6 @@ $Type = "Típus";
 $EmailAddress = "Email cím";
 $Organisation = "Szervezet";
 $Reporting = "Jelentés";
-$Code = "Kód";
 $Update = "Frissít";
 $SelectQuestionType = "Válasszon kérdés típust";
 $CurrentCourse = "Jelenlegi kurzus";
@@ -97,58 +94,54 @@ $dateFormatShort = "%y %b %d";
 $dateFormatLong = "%Y %B %d, %A";
 $dateTimeFormatLong = "%Y %B %d, at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "Igen";
-$langNo = "Nem";
+$Yes = "Igen";
+$No = "Nem";
 $Next = "Következő";
-$langAllowed = "Engedélyezve";
-$langBackHome = "Vissza a főoldalra";
-$langPropositions = "Fejlesztési javaslat az alábbi elemhez:";
-$langMaj = "Frissít";
-$langModify = "módosít";
-$langDelete = "töröl";
-$langInvisible = "Elrejt";
-$langSave = "Ment";
-$langMove = "Áthelyez";
+$Allowed = "Engedélyezve";
+$BackHome = "Vissza a főoldalra";
+$Propositions = "Fejlesztési javaslat az alábbi elemhez:";
+$Maj = "Frissít";
+$Modify = "módosít";
+$Invisible = "Elrejt";
+$Save = "Ment";
+$Move = "Áthelyez";
 $Help = "Súgó";
-$langOk = "OK";
-$langAdd = "Hozzáad";
-$langAddIntro = "Bejelentkezési szöveg hozzáadása";
-$langBackList = "Vissza a listához";
-$langText = "Szöveg";
-$langEmpty = "Néhány mezőt üresen hagyott.<br>Használja a <b>Vissza</b> gombot a böngészőjén és próbálja újra.<br>Ha a kurzus kódot kihagyja, olvassa el a Kurzus Programot";
-$langConfirmYourChoice = "Kérjük, erősítse meg választását";
-$langAnd = "és";
-$langChoice = "A válasza";
-$langFinish = "Befejez";
-$langCancel = "Mégsem";
-$langNotAllowed = "Nem engedélyezett";
-$langNotLogged = "Nincs kurzusra bejelentkezve";
-$langManager = "Menedszer";
-$langOptional = "Opcionális";
+$Ok = "OK";
+$Add = "Hozzáad";
+$AddIntro = "Bejelentkezési szöveg hozzáadása";
+$BackList = "Vissza a listához";
+$Text = "Szöveg";
+$Empty = "Néhány mezőt üresen hagyott.<br>Használja a <b>Vissza</b> gombot a böngészőjén és próbálja újra.<br>Ha a kurzus kódot kihagyja, olvassa el a Kurzus Programot";
+$ConfirmYourChoice = "Kérjük, erősítse meg választását";
+$And = "és";
+$Choice = "A válasza";
+$Finish = "Befejez";
+$Cancel = "Mégsem";
+$NotAllowed = "Nem engedélyezett";
+$NotLogged = "Nincs kurzusra bejelentkezve";
+$Manager = "Menedszer";
+$Optional = "Opcionális";
 $NextPage = "Következő oldal";
 $PreviousPage = "Előző oldal";
-$langUse = "Használat";
-$langTotal = "Összes";
-$langTake = "tart";
-$langOne = "Egy";
-$langSeveral = "Több";
-$langNotice = "Figyelmeztetés";
-$langDate = "Dátum";
-$langAmong = "között";
-$langShow = "Megmutat";
-$langMyCourses = "Kurzusaim";
-$langModifyProfile = "Profilom";
-$langMyStats = "Statisztikáim megtekintése";
-$langLogout = "Kijelentkezés";
-$langMyAgenda = "Az én naptáram";
-$langCourseHomepage = "Kurzus főoldala";
-$langCourseManagerview = "Oktatói nézet";
-$langStudentView = "Felhasználói nézet";
+$Use = "Használat";
+$Total = "Összes";
+$Take = "tart";
+$One = "Egy";
+$Several = "Több";
+$Notice = "Figyelmeztetés";
+$Date = "Dátum";
+$Among = "között";
+$Show = "Megmutat";
+$MyCourses = "Kurzusaim";
+$ModifyProfile = "Profilom";
+$MyStats = "Statisztikáim megtekintése";
+$Logout = "Kijelentkezés";
+$MyAgenda = "Az én naptáram";
+$CourseHomepage = "Kurzus főoldala";
+$CourseManagerview = "Oktatói nézet";
+$StudentView = "Felhasználói nézet";
 $AddResource = "Hozzáad";
 $AddedResources = "Csatolások";
-$lang_modify_resource = "Módosítás/Hozzáadás";
-$lang_resource = "Forrás";
-$lang_resources = "Források";
 $langNameOfLang['arabic'] = "arab";
 $langNameOfLang['brazilian'] = "brazil";
 $langNameOfLang['bulgarian'] = "bolgár";
@@ -172,27 +165,27 @@ $langNameOfLang['russian'] = "orosz";
 $langNameOfLang['simpl_chinese'] = "egyszer&#369;sített kínai";
 $langNameOfLang['spanish'] = "spanyol";
 $Close = "bezár";
-$langPlatform = "Platform";
+$Platform = "Platform";
 $localLangName = "magyar";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Sajnos ez a kurzus kód már létezik. Kérjük válassz egy másikat!";
+$CourseCodeAlreadyExists = "Sajnos ez a kurzus kód már létezik. Kérjük válassz egy másikat!";
 $Statistics = "Statisztikák";
-$langGrouplist = "csoport lista";
-$langPrevious = "előző";
+$Grouplist = "csoport lista";
+$Previous = "előző";
 $DestDirectoryDoesntExist = "A célkönyvtár nem létezik";
 $Courses = "kurzusok";
 $In = "itt:";
-$langShowAll = "Mutasd mindet";
-$langPage = "Oldal";
+$ShowAll = "Mutasd mindet";
+$Page = "Oldal";
 $englishLangName = "Angol";
 $Home = "Kezdőlap";
-$langAreYouSureToDelete = "Biztos, hogy törli";
+$AreYouSureToDelete = "Biztos, hogy törli";
 $SelectAll = "Összes kijelölése";
 $UnSelectAll = "összes kiválasztás visszavonása";
 $WithSelected = "Kiválasztottal együtt";
-$langOnLine = "Online";
-$langUsers = "Felhasználók";
-$langPlatformAdmin = "Platform adminisztrációja";
+$OnLine = "Online";
+$Users = "Felhasználók";
+$PlatformAdmin = "Platform adminisztrációja";
 $langNameOfLang['hungarian'] = "magyar";
 $langNameOfLang['indonesian'] = "indonéz";
 $langNameOfLang['malay'] = "maláj";
@@ -203,21 +196,20 @@ $langNameOfLang['thai'] = "thai";
 $langNameOfLang['turkce'] = "török";
 $langNameOfLang['vietnamese'] = "vietnámi";
 $UserInfo = "Felhasználói információ";
-$langModifyQuestion = "Kérdés módosítása";
-$langCheckAll = "Összes ellenőrzése";
-$langNbAnnoucement = "Bejelentés";
-$lang_no_access_here = "Itt nincs belépés";
-$langOtherCourses = "más kurzusok";
+$ModifyQuestion = "Kérdés módosítása";
+$CheckAll = "Összes ellenőrzése";
+$NbAnnoucement = "Bejelentés";
+$OtherCourses = "más kurzusok";
 $Doc = "dokumentum";
 $PlataformAdmin = "Platform Adminisztrátor";
 $Groups = "Csoportok";
 $GroupManagement = "Csoport menedzsment";
 $All = "Mind";
 $None = "semmi";
-$langSorry = "Válasszon ki egy kurzust először";
-$langDenied = "Ez a funkció csak a kurzus adminisztrátorai számára elérhető.";
+$Sorry = "Válasszon ki egy kurzust először";
+$Denied = "Ez a funkció csak a kurzus adminisztrátorai számára elérhető.";
 $Today = "ma";
-$langCourseHomepageLink = "Aktuális kurzus";
+$CourseHomepageLink = "Aktuális kurzus";
 $Attachment = "csatolás";
 $User = "Felhasználó";
 $MondayInit = "H";
@@ -277,10 +269,10 @@ $SeptemberLong = "Szeptember";
 $OctoberLong = "Október";
 $NovemberLong = "November";
 $DecemberLong = "December";
-$langMyCompetences = "Kompetenciáim";
-$langMyDiplomas = "Diplomáim";
-$langMyPersonalOpenArea = "Személyes";
-$langMyTeach = "Amit tanítok";
+$MyCompetences = "Kompetenciáim";
+$MyDiplomas = "Diplomáim";
+$MyPersonalOpenArea = "Személyes";
+$MyTeach = "Amit tanítok";
 $Agenda = "Naptár";
 $HourShort = "ó";
 $PleaseTryAgain = "Próbálja meg újra!";
@@ -290,7 +282,7 @@ $UplNotAZip = "A kiválasztott fájl nem ZIP archívum.";
 $UplUploadSucceeded = "A fájl feltöltése megtörtént!";
 $ExportAsCSV = "Exportálás CSV fájlként";
 $ExportAsXLS = "Exportálás XLS fájlként";
-$langOpenarea = "Személyes";
+$Openarea = "Személyes";
 $Done = "Kész";
 $Documents = "Dokumentumok";
 $DocumentAdded = "Dokumentum hozzáadva";
@@ -303,7 +295,7 @@ $Link = "Link";
 $Announcement = "Hirdetmények";
 $Dropbox = "Fájlposta";
 $Quiz = "Tesztek";
-$langChat = "Csevegés";
+$Chat = "Csevegés";
 $Conference = "Konferencia";
 $Student_publication = "Hallgatói publikációk";
 $Tracking = "Nyomonkövetés";
@@ -316,8 +308,8 @@ $StartDate = "Kezdés dátuma";
 $EndDate = "Befejezés dátuma";
 $StartTime = "Kezdés ideje";
 $EndTime = "Befejezés ideje";
-$langYouWereCalled = "Chat-elni hívott";
-$langDoYouAccept = "Elfogadja?";
+$YouWereCalled = "Chat-elni hívott";
+$DoYouAccept = "Elfogadja?";
 $Everybody = "Mindenki";
 $SentTo = "Kik számára látható:";
 $Export = "Exportálás";
@@ -341,7 +333,7 @@ $FormHasErrorsPleaseComplete = "Az űrlap érvénytelen vagy hiányos adatokat t
 $StartDateShouldBeBeforeEndDate = "A kezdés dátuma nem lehet későbbi, mint a befejezés dátuma.";
 $InvalidDate = "Érvénytelen dátum";
 $OnlyLettersAndNumbersAllowed = "Csak betűk és számok engedélyezettek";
-$langBasicOverview = "Általános leírás";
+$BasicOverview = "Általános leírás";
 $CourseAdminRole = "Kurzus adminisztrátor";
 $UserRole = "Szerep";
 $OnlyImagesAllowed = "Csak a PNG, JPG és GIF képformátumok engedélyezettek.";
@@ -351,16 +343,14 @@ $DeleteRight = "Töröl";
 $OverviewCourseRights = "Szerepek és jogok áttekintése";
 $SeeAllRightsAllLocationsForSpecificRole = "Fókusz a szerepen";
 $SeeAllRolesAllLocationsForSpecificRight = "Fókusz a jogokon";
-$langAdvanced = "Haladó";
+$Advanced = "Haladó";
 $RightValueModified = "Az érték módosításra került.";
 $course_rights = "Szerepek és jogok áttekintése";
 $Visio_conference = "Videókonferencia";
 $CourseAdminRoleDescription = "A kurzus adminisztrátora";
-$Move = "Áthelyez";
 $MoveTo = "Áthelyez";
 $Delete = "Töröl";
 $MoveFileTo = "Fájl áthelyezése ide";
-$Save = "Mentés";
 $Error = "Hiba";
 $Anonymous = "Névtelen";
 $h = "ó";
@@ -376,9 +366,9 @@ $YouHaveNewMessage = "Új üzenete érkezett!";
 $myActiveSessions = "Aktív munkameneteim";
 $myInactiveSessions = "Passzív munkameneteim";
 $FileUpload = "Fájl feltöltés";
-$langMyActiveSessions = "Aktív belépéseim";
-$langMyInActiveSessions = "Korábbi belépéseim";
-$langMySpace = "Jelentések";
+$MyActiveSessions = "Aktív belépéseim";
+$MyInActiveSessions = "Korábbi belépéseim";
+$MySpace = "Jelentések";
 $ExtensionActivedButNotYetOperational = "A kiterjesztés aktiválásra került, de jelenleg nem üzemképes.";
 $MyStudents = "Hallgatóim";
 $Progress = "Haladás";

+ 86 - 93
main/lang/indonesian/trad4all.inc.php

@@ -8,40 +8,38 @@ $NoTimeLimits = "Tanpa batas waktu";
 $Title = "Judul";
 $UsersOnline = "User Online";
 $Remove = "Hapus";
-$langEnter = "Kembali ke daftar mata kuliah";
+$Enter = "Kembali ke daftar mata kuliah";
 $Description = "Deskripsi";
 $Links = "Link";
-$langWorks = "Tugas-tugas";
+$Works = "Tugas-tugas";
 $Forums = "Forum";
-$langExercices = "Latihan";
-$langCreateDir = "Buat direktori";
+$Exercices = "Latihan";
+$CreateDir = "Buat direktori";
 $Name = "Nama";
-$langComment = "Komentar";
-$langVisible = "Nampak/Sembunyi";
-$langNewDir = "Nama directori baru";
-$langDirCr = "Direktori dibuat";
+$Comment = "Komentar";
+$Visible = "Nampak/Sembunyi";
+$NewDir = "Nama directori baru";
+$DirCr = "Direktori dibuat";
 $Download = "Upload";
-$langGroup = "Group";
-$langEdit = "edit";
-$langGroupForum = "Forum";
+$Group = "Group";
+$Edit = "edit";
+$GroupForum = "Forum";
 $Language = "Bahasa";
 $LoginName = "Login";
 $Assignments = "Tugas-tugas";
 $Forum = "Forum";
-$langDelImage = "Hapus foto";
-$langCode = "Kode Mata Kuliah";
-$langUp = "Ke atas";
+$DelImage = "Hapus foto";
+$Code = "Kode Mata Kuliah";
+$Up = "Ke atas";
 $Down = "turun";
-$Up = "naik";
 $TheListIsEmpty = "Daftar kosong.";
-$langUniqueSelect = "Pilihan berganda (jawaban unik)";
-$langCourseCreate = "Buat situs mata kuliah";
-$langTodo = "Yang akan dilakukan";
+$UniqueSelect = "Pilihan berganda (jawaban unik)";
+$CourseCreate = "Buat situs mata kuliah";
+$Todo = "Yang akan dilakukan";
 $UserName = "Nama user";
-$lang_show_hide = "Tampilkan / Sembunyikan";
-$langCategoryMod = "Ubah kategori";
+$CategoryMod = "Ubah kategori";
 $Hide = "Sembunyi";
-$langDear = "Yth.";
+$Dear = "Yth.";
 $iso639_2_code = "en";
 $iso639_1_code = "eng";
 $charset = "iso-8859-1";
@@ -54,58 +52,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A, %d %B %Y";
 $dateTimeFormatLong = "%d %B, %Y pada %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "ya";
-$langNo = "Tidak";
+$Yes = "ya";
+$No = "Tidak";
 $Next = "Berikutnya";
-$langAllowed = "Diijinkan";
-$langBackHome = "Kembali ke situs";
-$langPropositions = "Usul untuk pengembangan";
-$langMaj = "Update";
-$langModify = "ubah";
-$langDelete = "hapus";
-$langInvisible = "Sembunyikan";
-$langSave = "Simpan";
-$langMove = "Pindahkan";
+$Allowed = "Diijinkan";
+$BackHome = "Kembali ke situs";
+$Propositions = "Usul untuk pengembangan";
+$Maj = "Update";
+$Modify = "ubah";
+$Invisible = "Sembunyikan";
+$Save = "Simpan";
+$Move = "Pindahkan";
 $Help = "Pertolongan";
-$langOk = "OK";
-$langAdd = "Tambah";
-$langAddIntro = "Tambah teks pengantar";
-$langBackList = "kembali ke daftar";
-$langText = "Teks";
-$langEmpty = "Anda belum mengisi semua field.<br>Gunakan tombol <b>Back</b>di browser dan coba lagi.<br>Jika anda tidak tahu kode mata kuliah, hubungi pengelola";
-$langConfirmYourChoice = "Silahkan konfirmasi pilihan anda";
-$langAnd = "dan";
-$langChoice = "Pilihan anda";
-$langFinish = "Selesai";
-$langCancel = "Cancel";
-$langNotAllowed = "Tidak diijinkan";
-$langNotLogged = "Anda tidak login ke suatu mata kuliah";
-$langManager = "Pengelola";
-$langOptional = "Opsional";
+$Ok = "OK";
+$Add = "Tambah";
+$AddIntro = "Tambah teks pengantar";
+$BackList = "kembali ke daftar";
+$Text = "Teks";
+$Empty = "Anda belum mengisi semua field.<br>Gunakan tombol <b>Back</b>di browser dan coba lagi.<br>Jika anda tidak tahu kode mata kuliah, hubungi pengelola";
+$ConfirmYourChoice = "Silahkan konfirmasi pilihan anda";
+$And = "dan";
+$Choice = "Pilihan anda";
+$Finish = "Selesai";
+$Cancel = "Cancel";
+$NotAllowed = "Tidak diijinkan";
+$NotLogged = "Anda tidak login ke suatu mata kuliah";
+$Manager = "Pengelola";
+$Optional = "Opsional";
 $NextPage = "Halaman berikutnya";
 $PreviousPage = "Halaman sebelumnya";
-$langUse = "Gunakan";
-$langTotal = "Total";
-$langTake = "ambil";
-$langOne = "Satu";
-$langSeveral = "Beberapa";
-$langNotice = "Catatan";
-$langDate = "Tanggal";
-$langAmong = "diantara";
-$langShow = "Tampilkan";
-$langMyCourses = "Daftar Mata Kuliah Ku";
-$langModifyProfile = "Ubah profil Ku";
-$langMyStats = "Lihat statistik Ku";
-$langLogout = "Logout";
-$langMyAgenda = "Agenda-ku";
-$langCourseHomepage = "Situs Mata Kuliah";
-$langCourseManagerview = "Jendela Pengajar";
-$langStudentView = "Jendela Siswa";
+$Use = "Gunakan";
+$Total = "Total";
+$Take = "ambil";
+$One = "Satu";
+$Several = "Beberapa";
+$Notice = "Catatan";
+$Date = "Tanggal";
+$Among = "diantara";
+$Show = "Tampilkan";
+$MyCourses = "Daftar Mata Kuliah Ku";
+$ModifyProfile = "Ubah profil Ku";
+$MyStats = "Lihat statistik Ku";
+$Logout = "Logout";
+$MyAgenda = "Agenda-ku";
+$CourseHomepage = "Situs Mata Kuliah";
+$CourseManagerview = "Jendela Pengajar";
+$StudentView = "Jendela Siswa";
 $AddResource = "Tambahkan";
 $AddedResources = "Resource ditambahkan";
-$lang_modify_resource = "Ubah / Tambah resource";
-$lang_resource = "Resource";
-$lang_resources = "Resource";
 $langNameOfLang['arabic'] = "arab";
 $langNameOfLang['brazilian'] = "brrazil";
 $langNameOfLang['bulgarian'] = "bulgaria";
@@ -129,26 +123,26 @@ $langNameOfLang['russian'] = "rusia";
 $langNameOfLang['simpl_chinese'] = "china sederhana";
 $langNameOfLang['spanish'] = "spanyol";
 $Close = "tutup";
-$langPlatform = "Platform";
+$Platform = "Platform";
 $localLangName = "bahasa";
 $email = "email";
-$langCourseCodeAlreadyExists = "Maaf, kode mata kuliah tsb sudah terpakai.  Silahkan pilih yang lain.";
+$CourseCodeAlreadyExists = "Maaf, kode mata kuliah tsb sudah terpakai.  Silahkan pilih yang lain.";
 $Statistics = "Statistik";
-$langGrouplist = "daftar group";
-$langPrevious = "sebelumnya";
+$Grouplist = "daftar group";
+$Previous = "sebelumnya";
 $Courses = "mata kuliah";
 $In = "dalam";
-$langShowAll = "Tampilkan semua";
-$langPage = "Halaman";
+$ShowAll = "Tampilkan semua";
+$Page = "Halaman";
 $englishLangName = "Inggris";
 $Home = "Home";
-$langAreYouSureToDelete = "Apakah anda sungguh-sungguh ingin menghapus";
+$AreYouSureToDelete = "Apakah anda sungguh-sungguh ingin menghapus";
 $SelectAll = "pilih semua";
 $UnSelectAll = "semua tidak dipilih";
 $WithSelected = "dengan pilihan";
-$langOnLine = "Online";
-$langUsers = "User";
-$langPlatformAdmin = "Administrasi Platform";
+$OnLine = "Online";
+$Users = "User";
+$PlatformAdmin = "Administrasi Platform";
 $langNameOfLang['hungarian'] = "hungaria";
 $langNameOfLang['indonesian'] = "indonesia";
 $langNameOfLang['malay'] = "Melayu";
@@ -159,21 +153,20 @@ $langNameOfLang['thai'] = "thailand";
 $langNameOfLang['turkce'] = "turki";
 $langNameOfLang['vietnamese'] = "vietnam";
 $UserInfo = "informasi user";
-$langModifyQuestion = "Ubah pertanyaan";
-$langCheckAll = "Conteng semua";
-$langNbAnnoucement = "Pengumuman";
-$lang_no_access_here = "Tidak ada akses disini";
-$langOtherCourses = "mata kuliah lain";
+$ModifyQuestion = "Ubah pertanyaan";
+$CheckAll = "Conteng semua";
+$NbAnnoucement = "Pengumuman";
+$OtherCourses = "mata kuliah lain";
 $Doc = "dokumen";
 $PlataformAdmin = "Admin Platform";
 $Groups = "Group";
 $GroupManagement = "Manajemen Group";
 $All = "Semua";
 $None = "tidak ada";
-$langSorry = "Pilih sebuah mata kuliah terlebih dulu";
-$langDenied = "Fungsi ini hanya tersedia unutk admin mata kuliah";
+$Sorry = "Pilih sebuah mata kuliah terlebih dulu";
+$Denied = "Fungsi ini hanya tersedia unutk admin mata kuliah";
 $Today = "hari ini";
-$langCourseHomepageLink = "Mata kuliah sekarang";
+$CourseHomepageLink = "Mata kuliah sekarang";
 $Attachment = "lampiran";
 $User = "User";
 $MondayInit = "S";
@@ -233,10 +226,10 @@ $SeptemberLong = "September";
 $OctoberLong = "Oktober";
 $NovemberLong = "November";
 $DecemberLong = "Desember";
-$langMyCompetences = "Kompetensi-ku";
-$langMyDiplomas = "Diploma-ku";
-$langMyPersonalOpenArea = "Area terbuka personal-ku";
-$langMyTeach = "Apa yang dapat saya ajarkan";
+$MyCompetences = "Kompetensi-ku";
+$MyDiplomas = "Diploma-ku";
+$MyPersonalOpenArea = "Area terbuka personal-ku";
+$MyTeach = "Apa yang dapat saya ajarkan";
 $Agenda = "Agenda";
 $HourShort = "J";
 $PleaseTryAgain = "Silahkan coba lagi!";
@@ -246,7 +239,7 @@ $UplNotAZip = "File yang anda file bukan file zip.";
 $UplUploadSucceeded = "Upload file berhasil!";
 $ExportAsCSV = "Export sebagai file CSV";
 $ExportAsXLS = "Eksport sebagai file XLS";
-$langOpenarea = "Area terbuka personal";
+$Openarea = "Area terbuka personal";
 $Done = "Dilakukan";
 $Documents = "Dokumen";
 $DocumentAdded = "Dokumen ditambahkan";
@@ -259,7 +252,7 @@ $Link = "Link";
 $Announcement = "Pengumuman";
 $Dropbox = "Dropbox";
 $Quiz = "Latihan";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Konfrensi";
 $Student_publication = "Publikasi Siswa";
 $Tracking = "Penelusuran";
@@ -272,8 +265,8 @@ $StartDate = "Tanggal Mulai";
 $EndDate = "Tanggal Selesai";
 $StartTime = "Waktu Mulai";
 $EndTime = "Waktu Selesai";
-$langYouWereCalled = "Anda diundang untuk chatting dengan";
-$langDoYouAccept = "Apakah anda menerima?";
+$YouWereCalled = "Anda diundang untuk chatting dengan";
+$DoYouAccept = "Apakah anda menerima?";
 $Everybody = "Setiap orang";
 $SentTo = "Nampak bagi";
 $Export = "Export";

+ 97 - 107
main/lang/italian/trad4all.inc.php

@@ -11,55 +11,53 @@ $Title = "Titolo";
 $By = "Da";
 $UsersOnline = "Utenti collegati";
 $Remove = "Rimuovi";
-$langEnter = "<< elenco dei corsi";
+$Enter = "<< elenco dei corsi";
 $Description = "Descrizione";
 $Links = "Collegamenti";
-$langWorks = "Elaborati";
+$Works = "Elaborati";
 $Forums = "Forum";
-$langExercices = "Test";
-$langCreateDir = "Crea una cartella";
+$Exercices = "Test";
+$CreateDir = "Crea una cartella";
 $Name = "Nome";
-$langComment = "Commento";
-$langVisible = "Visibile";
-$langNewDir = "Nome della nuova cartella";
-$langDirCr = "Cartella creata";
+$Comment = "Commento";
+$Visible = "Visibile";
+$NewDir = "Nome della nuova cartella";
+$DirCr = "Cartella creata";
 $Download = "Scarica";
-$langGroup = "Gruppi";
-$langEdit = "modifica";
-$langGroupForum = "Forum di gruppo";
+$Group = "Gruppi";
+$Edit = "modifica";
+$GroupForum = "Forum di gruppo";
 $Language = "Lingua";
 $LoginName = "Nome utente";
 $AutostartMp3 = "Premi OK se desideri far partire il brano al caricamento";
 $Assignments = "Elaborati";
 $Forum = "Forum";
-$langDelImage = "Elimina immagine";
-$langCode = "Codice del Corso";
-$langUp = "Su";
+$DelImage = "Elimina immagine";
+$Code = "Codice del Corso";
+$Up = "Su";
 $Down = "giù";
-$Up = "su";
 $Theme = "Aspetto";
 $TheListIsEmpty = "L'elenco è vuoto.";
-$langUniqueSelect = "Risposta singola";
+$UniqueSelect = "Risposta singola";
 $CreateCategory = "Crea categoria";
 $SendFile = "Invia il file";
 $SaveChanges = "Salva le modifiche";
 $SearchTerm = "Parola da cercare";
 $TooShort = "Troppo corto";
-$langCourseCreate = "Crea un corso";
-$langTodo = "Suggerimenti";
+$CourseCreate = "Crea un corso";
+$Todo = "Suggerimenti";
 $UserName = "Nome utente";
-$lang_show_hide = "Mostra / nascondi";
-$langCategoryMod = "Modifica una categoria";
+$CategoryMod = "Modifica una categoria";
 $Hide = "Nascondi";
-$langDear = "Cara/o";
-$langArchive = "Archivio";
-$langCourseCode = "Codice del corso";
-$langNoDescription = "Nessuna descrizione";
-$langOfficialCode = "Codice";
+$Dear = "Cara/o";
+$Archive = "Archivio";
+$CourseCode = "Codice del corso";
+$NoDescription = "Nessuna descrizione";
+$OfficialCode = "Codice";
 $FirstName = "Nome";
 $LastName = "Cognome";
 $Status = "Ruolo";
-$langEmail = "Email";
+$Email = "Email";
 $SlideshowConversion = "Conversione della presentazione";
 $UploadFile = "Carica un file";
 $AvailableFrom = "Disponibile dal";
@@ -69,7 +67,6 @@ $Type = "Tipo";
 $EmailAddress = "Indirizzo email";
 $Organisation = "Organizzazione";
 $Reporting = "Registro";
-$Code = "Codice";
 $Update = "Aggiorna";
 $SelectQuestionType = "Seleziona il tipo di domanda";
 $CurrentCourse = "Corso attivo";
@@ -99,58 +96,54 @@ $dateFormatShort = "%a %d %b %y";
 $dateFormatLong = "%A %d %B %Y";
 $dateTimeFormatLong = "%A %d %B %Y ore %H:%M";
 $timeNoSecFormat = "%H:%M";
-$langYes = "sì";
-$langNo = "No";
+$Yes = "sì";
+$No = "No";
 $Next = "Successivo";
-$langAllowed = "Consentita";
-$langBackHome = "Ritornare alla Pagina Principale del";
-$langPropositions = "Proposte di miglioramento di";
-$langMaj = "Aggiorna";
-$langModify = "Modifica";
-$langDelete = "Elimina";
-$langInvisible = "Invisibile";
-$langSave = "Salva";
-$langMove = "Sposta";
+$Allowed = "Consentita";
+$BackHome = "Ritornare alla Pagina Principale del";
+$Propositions = "Proposte di miglioramento di";
+$Maj = "Aggiorna";
+$Modify = "Modifica";
+$Invisible = "Invisibile";
+$Save = "Salva";
+$Move = "Sposta";
 $Help = "Aiuto";
-$langOk = "Conferma";
-$langAdd = "Aggiungi";
-$langAddIntro = "Aggiungi un testo iniziale";
-$langBackList = "Ritorna all'elenco";
-$langText = "Testo";
-$langEmpty = "Alcuni campi non sono stati compilati.<br>Utilizza il pulsante <b>Indietro</b> del browser e riprova.<br>Se non conosci il codice del Corso, consulta il Piano dei Corsi";
-$langConfirmYourChoice = "Conferma la scelta";
-$langAnd = "e";
-$langChoice = "La tua scelta";
-$langFinish = "Concludi";
-$langCancel = "Annulla";
-$langNotAllowed = "Non consentito";
-$langNotLogged = "Non hai fatto un Login alla piattaforma";
-$langManager = "Responsabile";
-$langOptional = "Opzionale";
+$Ok = "Conferma";
+$Add = "Aggiungi";
+$AddIntro = "Aggiungi un testo iniziale";
+$BackList = "Ritorna all'elenco";
+$Text = "Testo";
+$Empty = "Alcuni campi non sono stati compilati.<br>Utilizza il pulsante <b>Indietro</b> del browser e riprova.<br>Se non conosci il codice del Corso, consulta il Piano dei Corsi";
+$ConfirmYourChoice = "Conferma la scelta";
+$And = "e";
+$Choice = "La tua scelta";
+$Finish = "Concludi";
+$Cancel = "Annulla";
+$NotAllowed = "Non consentito";
+$NotLogged = "Non hai fatto un Login alla piattaforma";
+$Manager = "Responsabile";
+$Optional = "Opzionale";
 $NextPage = "Pagina seguente";
 $PreviousPage = "Pagina precedente";
-$langUse = "Usa";
-$langTotal = "Totale";
-$langTake = "prendi";
-$langOne = "Uno";
-$langSeveral = "Molti";
-$langNotice = "Nota";
-$langDate = "Data";
-$langAmong = "tra";
-$langShow = "Mostra";
-$langMyCourses = "Corsi";
-$langModifyProfile = "Profilo";
-$langMyStats = "Progressi personali";
-$langLogout = "Esci";
-$langMyAgenda = "La mia agenda";
-$langCourseHomepage = "Pagina iniziale";
-$langCourseManagerview = "Vista Docente";
-$langStudentView = "Vista Corsista";
+$Use = "Usa";
+$Total = "Totale";
+$Take = "prendi";
+$One = "Uno";
+$Several = "Molti";
+$Notice = "Nota";
+$Date = "Data";
+$Among = "tra";
+$Show = "Mostra";
+$MyCourses = "Corsi";
+$ModifyProfile = "Profilo";
+$MyStats = "Progressi personali";
+$Logout = "Esci";
+$MyAgenda = "La mia agenda";
+$CourseHomepage = "Pagina iniziale";
+$CourseManagerview = "Vista Docente";
+$StudentView = "Vista Corsista";
 $AddResource = "Aggiungi";
 $AddedResources = "Allegati";
-$lang_modify_resource = "Modifica  / Aggiungi risorse";
-$lang_resource = "Risorsa";
-$lang_resources = "Risorse";
 $langNameOfLang['arabic'] = "Arabo";
 $langNameOfLang['brazilian'] = "brasiliano";
 $langNameOfLang['bulgarian'] = "Bulgaro";
@@ -174,27 +167,27 @@ $langNameOfLang['russian'] = "Russo";
 $langNameOfLang['simpl_chinese'] = "Cinese semplificato";
 $langNameOfLang['spanish'] = "Spagnolo";
 $Close = "chiudi";
-$langPlatform = "Piattaforma";
+$Platform = "Piattaforma";
 $localLangName = "Italiano";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Spiacente, ma questo codice è già in uso, scegline uno diverso.";
+$CourseCodeAlreadyExists = "Spiacente, ma questo codice è già in uso, scegline uno diverso.";
 $Statistics = "Statistiche";
-$langGrouplist = "Elenco dei gruppi";
-$langPrevious = "precedente";
+$Grouplist = "Elenco dei gruppi";
+$Previous = "precedente";
 $DestDirectoryDoesntExist = "La cartella di destinazione non esiste";
 $Courses = "Corsi";
 $In = "in";
-$langShowAll = "Mostra tutto";
-$langPage = "Pagina";
+$ShowAll = "Mostra tutto";
+$Page = "Pagina";
 $englishLangName = "inglese";
 $Home = "Pagina iniziale";
-$langAreYouSureToDelete = "Siete sicuri di voler eliminare";
+$AreYouSureToDelete = "Siete sicuri di voler eliminare";
 $SelectAll = "Seleziona tutto";
 $UnSelectAll = "deseleziona tutti";
 $WithSelected = "Con selezionati";
-$langOnLine = "Online";
-$langUsers = "Utenti";
-$langPlatformAdmin = "Amministrazione";
+$OnLine = "Online";
+$Users = "Utenti";
+$PlatformAdmin = "Amministrazione";
 $langNameOfLang['hungarian'] = "Ungherese";
 $langNameOfLang['indonesian'] = "Indonesiano";
 $langNameOfLang['malay'] = "Malese";
@@ -205,21 +198,20 @@ $langNameOfLang['thai'] = "Tailandese";
 $langNameOfLang['turkce'] = "Turco";
 $langNameOfLang['vietnamese'] = "Vietnamita";
 $UserInfo = "informazioni sull'utente";
-$langModifyQuestion = "Modifica il quesito";
-$langCheckAll = "Seleziona tutto";
-$langNbAnnoucement = "Avviso";
-$lang_no_access_here = "Nessun accesso";
-$langOtherCourses = "altri corsi";
+$ModifyQuestion = "Modifica il quesito";
+$CheckAll = "Seleziona tutto";
+$NbAnnoucement = "Avviso";
+$OtherCourses = "altri corsi";
 $Doc = "Moduli didattici";
 $PlataformAdmin = "Amministratore Campus";
 $Groups = "Gruppi";
 $GroupManagement = "Gestione gruppi";
 $All = "Tutto";
 $None = "Niente";
-$langSorry = "Seleziona prima un corso";
-$langDenied = "Riservata ai gestori del corso";
+$Sorry = "Seleziona prima un corso";
+$Denied = "Riservata ai gestori del corso";
 $Today = "oggi";
-$langCourseHomepageLink = "Pagina iniziale";
+$CourseHomepageLink = "Pagina iniziale";
 $Attachment = "Allegato";
 $User = "Utente";
 $MondayInit = "L";
@@ -279,10 +271,10 @@ $SeptemberLong = "Settembre";
 $OctoberLong = "Ottobre";
 $NovemberLong = "Novembre";
 $DecemberLong = "Dicembre";
-$langMyCompetences = "Le mie competenze";
-$langMyDiplomas = "Le mie certificazioni";
-$langMyPersonalOpenArea = "Spazio personale";
-$langMyTeach = "In cosa posso contribuire";
+$MyCompetences = "Le mie competenze";
+$MyDiplomas = "Le mie certificazioni";
+$MyPersonalOpenArea = "Spazio personale";
+$MyTeach = "In cosa posso contribuire";
 $Agenda = "Agenda";
 $HourShort = "h";
 $PleaseTryAgain = "Per favore, riprova.";
@@ -292,7 +284,7 @@ $UplNotAZip = "Il file selezionato non è del tipo zip.";
 $UplUploadSucceeded = "Caricamento avvenuto!";
 $ExportAsCSV = "Esporta come CSV";
 $ExportAsXLS = "Esporta come XLS";
-$langOpenarea = "Spazio personale";
+$Openarea = "Spazio personale";
 $Done = "Fatto !";
 $Documents = "Documenti";
 $DocumentAdded = "Documento aggiunto";
@@ -305,7 +297,7 @@ $Link = "Collegamento";
 $Announcement = "Avvisi";
 $Dropbox = "Scambio file";
 $Quiz = "Test";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Teleconferenza";
 $Student_publication = "Elaborati";
 $Tracking = "Registro";
@@ -318,8 +310,8 @@ $StartDate = "Dal";
 $EndDate = "Al";
 $StartTime = "Dalle";
 $EndTime = "Alle";
-$langYouWereCalled = "Sei stato invitato in chat da";
-$langDoYouAccept = "Accetti la chiamata?";
+$YouWereCalled = "Sei stato invitato in chat da";
+$DoYouAccept = "Accetti la chiamata?";
 $Everybody = "Ciascuno";
 $SentTo = "Visibile per";
 $Export = "Esporta";
@@ -343,7 +335,7 @@ $FormHasErrorsPleaseComplete = "Il modulo contiene dati non corretti o incomplet
 $StartDateShouldBeBeforeEndDate = "La data d'inizio deve precedere quella di fine";
 $InvalidDate = "Data non valida";
 $OnlyLettersAndNumbersAllowed = "Sono consentiti solo lettere o numeri";
-$langBasicOverview = "Ordina";
+$BasicOverview = "Ordina";
 $CourseAdminRole = "Gestore del corso";
 $UserRole = "Ruolo";
 $OnlyImagesAllowed = "Sono consentite solo immagini del tipo PNG, JPG o GIF";
@@ -353,16 +345,14 @@ $DeleteRight = "Elimina";
 $OverviewCourseRights = "Ruoli e permessi";
 $SeeAllRightsAllLocationsForSpecificRole = "Ruolo:";
 $SeeAllRolesAllLocationsForSpecificRight = "Permesso:";
-$langAdvanced = "Crea";
+$Advanced = "Crea";
 $RightValueModified = "Il valore è stato modificato";
 $course_rights = "Ruoli e permessi";
 $Visio_conference = "Videoconferenza";
 $CourseAdminRoleDescription = "Gestione del corso";
-$Move = "Sposta";
 $MoveTo = "Sposta verso";
 $Delete = "Elimina";
 $MoveFileTo = "Sposta il file verso";
-$Save = "Salva";
 $Error = "Errore";
 $Anonymous = "Anonimo";
 $h = "h";
@@ -378,9 +368,9 @@ $YouHaveNewMessage = "Hai un nuovo messaggio";
 $myActiveSessions = "Mie sessioni attive";
 $myInactiveSessions = "Mie sessioni inattive";
 $FileUpload = "Carica un file";
-$langMyActiveSessions = "Mie sessioni attive";
-$langMyInActiveSessions = "Mie sessioni inattive";
-$langMySpace = "Registro";
+$MyActiveSessions = "Mie sessioni attive";
+$MyInActiveSessions = "Mie sessioni inattive";
+$MySpace = "Registro";
 $ExtensionActivedButNotYetOperational = "L'estensione è stata attivata ma per ora non è disponibile";
 $MyStudents = "Corsisti";
 $Progress = "Avanzamento";
@@ -796,7 +786,7 @@ $InvitationDenied = "Invito non accettato";
 $UserAdded = "L'utente è stato aggiunto";
 $UpdatedIn = "Aggiornato";
 $Metadata = "Metadati";
-$langAddMetadata = "Vedi/Modifica i Metadati";
+$AddMetadata = "Vedi/Modifica i Metadati";
 $SendMessage = "Invia il messaggio";
 $SeeForum = "Vedi il forum";
 $SeeMore = "Vedi tutto";

+ 49 - 54
main/lang/japanese/trad4all.inc.php

@@ -9,49 +9,47 @@ $UsersOnline = "オンライン ユーザー";
 $Remove = "败瓢";
 $Description = "説明";
 $Links = "リンク";
-$langWorks = "課題";
+$Works = "課題";
 $Forums = "フォーラム";
-$langExercices = "テスト";
-$langCreateDir = "フォルダーを作成";
+$Exercices = "テスト";
+$CreateDir = "フォルダーを作成";
 $Name = "叹疚";
-$langComment = "コメント";
-$langVisible = "表示";
-$langNewDir = "新しいフォルダーの名前";
-$langDirCr = "ディレクトリ侯喇";
+$Comment = "コメント";
+$Visible = "表示";
+$NewDir = "新しいフォルダーの名前";
+$DirCr = "ディレクトリ侯喇";
 $Download = "ダウンロード";
-$langGroup = "グループ";
-$langEdit = "編集";
-$langGroupForum = "グループ フォーラム";
+$Group = "グループ";
+$Edit = "編集";
+$GroupForum = "グループ フォーラム";
 $Language = "言語";
 $LoginName = "ログイン";
 $AutostartMp3 = "音声を自動再生しますか?";
 $Assignments = "Assignments";
 $Forum = "フォーラム";
-$langDelImage = "画像を削除";
-$langCode = "コース コード";
-$langUp = "Up";
+$DelImage = "画像を削除";
+$Code = "コース コード";
+$Up = "Up";
 $Down = "下へ";
-$Up = "上へ";
 $Theme = "グラフィック テーマ";
 $TheListIsEmpty = "空";
-$langUniqueSelect = "選択";
-$langCourseCreate = "コースを作成";
-$langTodo = "≈妥司∽";
+$UniqueSelect = "選択";
+$CourseCreate = "コースを作成";
+$Todo = "≈妥司∽";
 $UserName = "ユ〖ザ叹";
 $Hide = "非表示";
-$langDear = "飞球";
-$langArchive = "アーカイブ";
-$langCourseCode = "コース コード";
-$langOfficialCode = "コード";
+$Dear = "飞球";
+$Archive = "アーカイブ";
+$CourseCode = "コース コード";
+$OfficialCode = "コード";
 $FirstName = "名";
 $LastName = "姓";
 $Status = "状態";
-$langEmail = "電子メール";
+$Email = "電子メール";
 $AvailableFrom = "開始日";
 $Preview = "プレビュー";
 $Type = "種類";
 $Reporting = "レポート作成";
-$Code = "コード";
 $Back = "戻る";
 $Info = "情報";
 $Search = "検索";
@@ -72,47 +70,46 @@ $dateFormatLong = "%Y/%m/%d (%a)";
 $dateTimeFormatLong = "%Y/%m/%d %H:%M";
 $timeNoSecFormat = "%H:%M";
 $Next = "次へ";
-$langAllowed = "許可する";
-$langModify = "饯赖";
-$langDelete = "猴近";
-$langInvisible = "非表示";
+$Allowed = "許可する";
+$Modify = "饯赖";
+$Invisible = "非表示";
 $Help = "ヘルプ";
-$langOk = "OK";
-$langAdd = "追加";
-$langAddIntro = "Add introduction text";
-$langBackList = "リストに提る";
-$langConfirmYourChoice = "よろしいですか";
-$langChoice = "回答";
-$langNotAllowed = "このページを参照することが許可されていません。接続の有効期限が切れたか、ページにアクセスするための特権が不足しています。";
-$langManager = "管理者";
+$Ok = "OK";
+$Add = "追加";
+$AddIntro = "Add introduction text";
+$BackList = "リストに提る";
+$ConfirmYourChoice = "よろしいですか";
+$Choice = "回答";
+$NotAllowed = "このページを参照することが許可されていません。接続の有効期限が切れたか、ページにアクセスするための特権が不足しています。";
+$Manager = "管理者";
 $NextPage = "次のページへ";
 $PreviousPage = "前のページへ";
-$langShow = "表示";
-$langMyCourses = "コース";
-$langModifyProfile = "プロファイル";
-$langMyStats = "進行状況を表示";
-$langLogout = "ログアウト";
-$langMyAgenda = "個人用の予定表";
-$langCourseHomepage = "コースのホーム";
-$langCourseManagerview = "教員表示";
-$langStudentView = "学生表示";
-$langPlatform = "iCampus utilise la plate-forme";
+$Show = "表示";
+$MyCourses = "コース";
+$ModifyProfile = "プロファイル";
+$MyStats = "進行状況を表示";
+$Logout = "ログアウト";
+$MyAgenda = "個人用の予定表";
+$CourseHomepage = "コースのホーム";
+$CourseManagerview = "教員表示";
+$StudentView = "学生表示";
+$Platform = "iCampus utilise la plate-forme";
 $Statistics = "統計情報";
-$langPrevious = "前へ";
+$Previous = "前へ";
 $Courses = "コース";
 $Home = "ホーム";
 $SelectAll = "すべて選択";
 $UnSelectAll = "すべて選択解除";
-$langOnLine = "オンライン";
-$langPlatformAdmin = "管理";
+$OnLine = "オンライン";
+$PlatformAdmin = "管理";
 $Doc = "コース";
 $Groups = "グループ";
 $GroupManagement = "グループ管理";
 $All = "すべて";
 $None = "なし";
-$langDenied = "この機能を教員のみに利用可能にする";
+$Denied = "この機能を教員のみに利用可能にする";
 $Today = "今日";
-$langCourseHomepageLink = "コースのホーム";
+$CourseHomepageLink = "コースのホーム";
 $User = "ユーザー";
 $MondayShort = "月";
 $TuesdayShort = "火";
@@ -184,10 +181,8 @@ $StartDateShouldBeBeforeEndDate = "最初の日付は終了日よりも前でな
 $InvalidDate = "日付が無効です";
 $OnlyLettersAndNumbersAllowed = "文字と数字のみが許可されています";
 $OnlyImagesAllowed = "PNG、JPG または GIF 画像のみが使用することができます";
-$Move = "移動";
 $MoveTo = "移動先";
 $Delete = "削除";
-$Save = "保存";
 $Error = "エラー";
 $Anonymous = "匿名";
 $h = "時";
@@ -196,7 +191,7 @@ $Inbox = "受信トレイ";
 $ComposeMessage = "メッセージを作成";
 $Other = "その他";
 $CampusHomepage = "ホームページ";
-$langMySpace = "レポート作成";
+$MySpace = "レポート作成";
 $MyStudents = "学生";
 $ActionNotAllowed = "操作が許可されていません";
 $Teachers = "教員";
@@ -344,7 +339,7 @@ $AssessmentInformation = "スキルを取得するための条件です。";
 $UploadADocument = "文書をアップロードする。";
 $AddAdditionalProfileField = "ユーザー プロファイルのフィールドを追加";
 $Metadata = "メタデータ";
-$langAddMetadata = "メタデータを表示/編集";
+$AddMetadata = "メタデータを表示/編集";
 $SeeMore = "詳細を参照";
 $Announcements = "お知らせ";
 $Password = "パスワード";

+ 81 - 88
main/lang/korean/trad4all.inc.php

@@ -4,38 +4,36 @@ for more information: see languages.txt in the lang folder.
 */
 $UsersOnline = "온라인 상의 유저";
 $Remove = "삭제";
-$langEnter = "과정 목록으로 돌아가기";
+$Enter = "과정 목록으로 돌아가기";
 $Description = "설명";
 $Links = "링크";
-$langWorks = "학생 출판";
+$Works = "학생 출판";
 $Forums = "포럼";
-$langExercices = "테스트";
-$langCreateDir = "디렉토리 생성";
+$Exercices = "테스트";
+$CreateDir = "디렉토리 생성";
 $Name = "이름";
-$langComment = "커멘트";
-$langVisible = "공개/비공개";
-$langNewDir = "새 폴더 이름";
-$langDirCr = "디렉토리가 생성되었습니다";
+$Comment = "커멘트";
+$Visible = "공개/비공개";
+$NewDir = "새 폴더 이름";
+$DirCr = "디렉토리가 생성되었습니다";
 $Download = "업로드";
-$langGroup = "그룹";
-$langEdit = "수정";
-$langGroupForum = "그룹의 포럼";
+$Group = "그룹";
+$Edit = "수정";
+$GroupForum = "그룹의 포럼";
 $Language = "언어";
 $LoginName = "로그인";
 $Assignments = "학생 출판";
 $Forum = "포럼";
-$langCode = "과정 코드";
-$langUp = "위로";
-$Down = "아래로";
+$Code = "과정 코드";
 $Up = "위로";
+$Down = "아래로";
 $TheListIsEmpty = "목록이 비어있습니다";
-$langUniqueSelect = "Multiple choice (한개의 답)";
-$langCourseCreate = "과정 웹사이트 생성";
-$langTodo = "할 일";
+$UniqueSelect = "Multiple choice (한개의 답)";
+$CourseCreate = "과정 웹사이트 생성";
+$Todo = "할 일";
 $UserName = "유저 명";
-$lang_show_hide = "보이기/숨기기";
-$langCategoryMod = "카테고리 수정";
-$langDear = "Dear";
+$CategoryMod = "카테고리 수정";
+$Dear = "Dear";
 $iso639_2_code = "en";
 $iso639_1_code = "eng";
 $charset = "iso-8859-1";
@@ -46,56 +44,52 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "예";
-$langNo = "아니오";
+$Yes = "예";
+$No = "아니오";
 $Next = "다음";
-$langAllowed = "허용";
-$langBackHome = "~의 홈페이지로 돌아가기";
-$langPropositions = "성능개선을 위한 제안";
-$langMaj = "업데이트";
-$langModify = "변경";
-$langDelete = "삭제";
-$langInvisible = "비공개로 전환";
-$langSave = "저장";
-$langMove = "이동";
+$Allowed = "허용";
+$BackHome = "~의 홈페이지로 돌아가기";
+$Propositions = "성능개선을 위한 제안";
+$Maj = "업데이트";
+$Modify = "변경";
+$Invisible = "비공개로 전환";
+$Save = "저장";
+$Move = "이동";
 $Help = "도움말";
-$langOk = "확인";
-$langAdd = "추가";
-$langAddIntro = "개요문 추가";
-$langBackList = "목록으로 되돌아가기";
-$langText = "텍스트";
-$langEmpty = "채우지 않은 필드가 있습니다. .<br>브라우저의<b>Back</b> 버튼을 이용하여 다시 시도하십시요..<br>만약 과정 코드를 생략한다면, Course Program을 보십시요.";
-$langConfirmYourChoice = "선택한 항목을 재확인 해주십시오";
-$langAnd = "그리고";
-$langFinish = "종료";
-$langCancel = "취소";
-$langNotAllowed = "허용안됨";
-$langNotLogged = "과정에 로그인 하지 않았습니다";
-$langManager = "매니저";
+$Ok = "확인";
+$Add = "추가";
+$AddIntro = "개요문 추가";
+$BackList = "목록으로 되돌아가기";
+$Text = "텍스트";
+$Empty = "채우지 않은 필드가 있습니다. .<br>브라우저의<b>Back</b> 버튼을 이용하여 다시 시도하십시요..<br>만약 과정 코드를 생략한다면, Course Program을 보십시요.";
+$ConfirmYourChoice = "선택한 항목을 재확인 해주십시오";
+$And = "그리고";
+$Finish = "종료";
+$Cancel = "취소";
+$NotAllowed = "허용안됨";
+$NotLogged = "과정에 로그인 하지 않았습니다";
+$Manager = "매니저";
 $NextPage = "다음 페이지";
 $PreviousPage = "이전 페이지";
-$langUse = "사용";
-$langTotal = "전체";
-$langTake = "take";
-$langOne = "하나";
-$langSeveral = "여럿";
-$langNotice = "공지";
-$langDate = "날짜";
-$langAmong = "among";
-$langShow = "보여주기";
-$langMyCourses = "내 과정";
-$langModifyProfile = "내 프로필";
-$langMyStats = "내 통계정보 보기";
-$langLogout = "로그아웃";
-$langMyAgenda = "내 일정";
-$langCourseHomepage = "과정 홈";
-$langCourseManagerview = "교사 화면";
-$langStudentView = "학생 화면";
+$Use = "사용";
+$Total = "전체";
+$Take = "take";
+$One = "하나";
+$Several = "여럿";
+$Notice = "공지";
+$Date = "날짜";
+$Among = "among";
+$Show = "보여주기";
+$MyCourses = "내 과정";
+$ModifyProfile = "내 프로필";
+$MyStats = "내 통계정보 보기";
+$Logout = "로그아웃";
+$MyAgenda = "내 일정";
+$CourseHomepage = "과정 홈";
+$CourseManagerview = "교사 화면";
+$StudentView = "학생 화면";
 $AddResource = "추가";
 $AddedResources = "첨부";
-$lang_modify_resource = "자료 수정/추가";
-$lang_resource = "자료";
-$lang_resources = "자료";
 $langNameOfLang['arabic'] = "arabic";
 $langNameOfLang['bulgarian'] = "bulgarian";
 $langNameOfLang['catalan'] = "catalan";
@@ -112,25 +106,25 @@ $langNameOfLang['polish'] = "polish";
 $langNameOfLang['russian'] = "russian";
 $langNameOfLang['spanish'] = "spanish";
 $Close = "닫기";
-$langPlatform = "플랫폼";
+$Platform = "플랫폼";
 $localLangName = "언어";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "존재하는 과목 코드입니다. 다른 코드를 선택하시기 바랍니다.";
+$CourseCodeAlreadyExists = "존재하는 과목 코드입니다. 다른 코드를 선택하시기 바랍니다.";
 $Statistics = "통계정보";
-$langGrouplist = "그룹 목록";
-$langPrevious = "이전";
+$Grouplist = "그룹 목록";
+$Previous = "이전";
 $Courses = "과정";
 $In = "들어가기";
-$langShowAll = "전체 보기";
+$ShowAll = "전체 보기";
 $englishLangName = "English";
 $Home = "홈";
-$langAreYouSureToDelete = "정말로 삭제하시겠습니까";
+$AreYouSureToDelete = "정말로 삭제하시겠습니까";
 $SelectAll = "전체 선택";
 $UnSelectAll = "전체 선택 해제";
 $WithSelected = "중복 선택";
-$langOnLine = "온라인 상의";
-$langUsers = "유저";
-$langPlatformAdmin = "플랫폼 관리";
+$OnLine = "온라인 상의";
+$Users = "유저";
+$PlatformAdmin = "플랫폼 관리";
 $langNameOfLang['hungarian'] = "hungarian";
 $langNameOfLang['indonesian'] = "indonesian";
 $langNameOfLang['malay'] = "malay";
@@ -141,20 +135,19 @@ $langNameOfLang['thai'] = "thai";
 $langNameOfLang['turkce'] = "turkish";
 $langNameOfLang['vietnamese'] = "vietnamese";
 $UserInfo = "유저 정보";
-$langModifyQuestion = "문제 수정";
-$langNbAnnoucement = "공지사항";
-$lang_no_access_here = "액세스한 사람이 없습니다";
-$langOtherCourses = "다른 과정들";
+$ModifyQuestion = "문제 수정";
+$NbAnnoucement = "공지사항";
+$OtherCourses = "다른 과정들";
 $Doc = "문서";
 $PlataformAdmin = "플랫폼 관리자";
 $Groups = "그룹";
 $GroupManagement = "그룹 관리";
 $All = "모두";
 $None = "none";
-$langSorry = "과정을 먼저 선택하십시요";
-$langDenied = "이 기능은 과정 관리자만 사용 가능합니다";
+$Sorry = "과정을 먼저 선택하십시요";
+$Denied = "이 기능은 과정 관리자만 사용 가능합니다";
 $Today = "오늘";
-$langCourseHomepageLink = "과정 홈";
+$CourseHomepageLink = "과정 홈";
 $Attachment = "첨부";
 $User = "유저";
 $MondayInit = "월";
@@ -214,10 +207,10 @@ $SeptemberLong = "9월";
 $OctoberLong = "10월";
 $NovemberLong = "11월";
 $DecemberLong = "12월";
-$langMyCompetences = "내 능력";
-$langMyDiplomas = "내 학위";
-$langMyPersonalOpenArea = "개인정보 공개 영역";
-$langMyTeach = "강의 가능한 과목";
+$MyCompetences = "내 능력";
+$MyDiplomas = "내 학위";
+$MyPersonalOpenArea = "개인정보 공개 영역";
+$MyTeach = "강의 가능한 과목";
 $Agenda = "일정";
 $HourShort = "h";
 $PleaseTryAgain = "다시 시도하십시오!";
@@ -227,7 +220,7 @@ $UplNotAZip = "선택한 파일이 압축파일이 아닙니다.";
 $UplUploadSucceeded = "파일이 업로드 되었습니다!";
 $ExportAsCSV = "CSV 파일로 내보내기";
 $ExportAsXLS = "XLS 파일로 내보내기";
-$langOpenarea = "개인적 공개 영역";
+$Openarea = "개인적 공개 영역";
 $Done = "완료";
 $Documents = "문서";
 $DocumentAdded = "문서가 추가되었습니다";
@@ -240,7 +233,7 @@ $Link = "링크";
 $Announcement = "공지사항";
 $Dropbox = "파일 보관함";
 $Quiz = "퀴즈";
-$langChat = "채팅";
+$Chat = "채팅";
 $Conference = "컨퍼런스";
 $Student_publication = "학생 발간";
 $Tracking = "Tracking";
@@ -253,8 +246,8 @@ $StartDate = "시작 날짜";
 $EndDate = "종료 날짜";
 $StartTime = "시작 시간";
 $EndTime = "종료 시간";
-$langYouWereCalled = "대화 신청이 왔습니다";
-$langDoYouAccept = "받아들이겠습니까?";
+$YouWereCalled = "대화 신청이 왔습니다";
+$DoYouAccept = "받아들이겠습니까?";
 $Everybody = "모두";
 $SentTo = "공개 대상";
 $Export = "내보내기";

+ 97 - 107
main/lang/latvian/trad4all.inc.php

@@ -13,55 +13,53 @@ $Title = "Virsraksts";
 $By = "Autors";
 $UsersOnline = "Lietotāji tiešsaistē";
 $Remove = "Izņemt";
-$langEnter = "Atpakaļ uz manu kursu sarakstu";
+$Enter = "Atpakaļ uz manu kursu sarakstu";
 $Description = "Apraksts";
 $Links = "Ievietot Hipersaišu arhīvā esošas tīmekļa hipersaites";
-$langWorks = "Pievienot saturam patstāvīgos darbus";
+$Works = "Pievienot saturam patstāvīgos darbus";
 $Forums = "Ievietot mācību saturā, Kursa Forumos apspriežamu tematu";
-$langExercices = "Testi / Kontroldarbi";
-$langCreateDir = "Izveidot mapi";
+$Exercices = "Testi / Kontroldarbi";
+$CreateDir = "Izveidot mapi";
 $Name = "Nosaukums/vārds (aktivitātei; elementam)";
-$langComment = "Papildus komentārs";
-$langVisible = "Redzams";
-$langNewDir = "Jaunās mapes nosaukums";
-$langDirCr = "Mape ir izveidota";
+$Comment = "Papildus komentārs";
+$Visible = "Redzams";
+$NewDir = "Jaunās mapes nosaukums";
+$DirCr = "Mape ir izveidota";
 $Download = "Lejupielāde";
-$langGroup = "Kursantu grupas";
-$langEdit = "Labot";
-$langGroupForum = "Grupas diskusija";
+$Group = "Kursantu grupas";
+$Edit = "Labot";
+$GroupForum = "Grupas diskusija";
 $Language = "Valoda";
 $LoginName = "Lietotājvārds";
 $AutostartMp3 = "Vai Jūs vēlaties, lai audio fails sāktos automātiski?";
 $Assignments = "Referāti / Mājas darbi";
 $Forum = "Diskusijas kursā";
-$langDelImage = "Dzēst attēlu";
-$langCode = "Kursa kods";
-$langUp = "Augšup";
-$Down = "Lejup";
+$DelImage = "Dzēst attēlu";
+$Code = "Kursa kods";
 $Up = "Augšup";
+$Down = "Lejup";
 $Theme = "Darba loga vizuālais izskats";
 $TheListIsEmpty = "Saraksts ir tukšs";
-$langUniqueSelect = "Vienas atbildes izvēle no vairākām";
+$UniqueSelect = "Vienas atbildes izvēle no vairākām";
 $CreateCategory = "Pievienot Kategoriju";
 $SendFile = "Augšupielādēt dokumentu";
 $SaveChanges = "Saglabāt izmaiņas";
 $SearchTerm = "Meklēt vārdu";
 $TooShort = "Par īsu";
-$langCourseCreate = "<b>Izveidot</b> jaunu Kursu";
-$langTodo = "Uzdevumi";
+$CourseCreate = "<b>Izveidot</b> jaunu Kursu";
+$Todo = "Uzdevumi";
 $UserName = "Lietotājvārds";
-$lang_show_hide = "Redzams / neredzams";
-$langCategoryMod = "Rediģēt kursu kategorijas";
+$CategoryMod = "Rediģēt kursu kategorijas";
 $Hide = "Paslēpt";
-$langDear = "Cien.";
-$langArchive = "arhīvs";
-$langCourseCode = "Kursa kods";
-$langNoDescription = "nav apraksta";
-$langOfficialCode = "Dienesta kods";
+$Dear = "Cien.";
+$Archive = "arhīvs";
+$CourseCode = "Kursa kods";
+$NoDescription = "nav apraksta";
+$OfficialCode = "Dienesta kods";
 $FirstName = "Vārds";
 $LastName = "Uzvārds";
 $Status = "Statuss";
-$langEmail = "e-pasts";
+$Email = "e-pasts";
 $SlideshowConversion = "Slaidu demonstrācijas konvertācija";
 $UploadFile = "Failu augšupielāde";
 $AvailableFrom = "Pieejams no";
@@ -71,7 +69,6 @@ $Type = "Veids";
 $EmailAddress = "E-pasta adrese";
 $Organisation = "Organizācija";
 $Reporting = "Atskaites";
-$Code = "Kods";
 $Update = "Atjaunināt";
 $SelectQuestionType = "Izvēlēties jautājuma veidu";
 $CurrentCourse = "Pašreizējais kurss";
@@ -101,58 +98,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "Jā";
-$langNo = "Nē!";
+$Yes = "Jā";
+$No = "Nē!";
 $Next = "Nākošais";
-$langAllowed = "Atļauts";
-$langBackHome = "Uz sākumlapu";
-$langPropositions = "Ieteikumi uzlabojumu veikšanai";
-$langMaj = "Atjaunot";
-$langModify = "Veikt izmaiņas";
-$langDelete = "Izdzēst";
-$langInvisible = "Padarīt neredzamu";
-$langSave = "Saglabāt";
-$langMove = "Pārvietot";
+$Allowed = "Atļauts";
+$BackHome = "Uz sākumlapu";
+$Propositions = "Ieteikumi uzlabojumu veikšanai";
+$Maj = "Atjaunot";
+$Modify = "Veikt izmaiņas";
+$Invisible = "Padarīt neredzamu";
+$Save = "Saglabāt";
+$Move = "Pārvietot";
 $Help = "Palīgs";
-$langOk = "Darīts!";
-$langAdd = "Pievienot";
-$langAddIntro = "Pievienot Kursa ievada tekstu un attēlus";
-$langBackList = "Atpakaļ uz sarakstu";
-$langText = "Teksts";
-$langEmpty = "Jūs atstājāt dažus laukus tukšus.<br>Izmantojiet <b>Atpakaļ</b> pogu pārlūkprogrammā un mēģiniet vēlreiz. <br>Ja jūs neziniet Jūsu kursa kodu, skatieties Kursu Programmā.";
-$langConfirmYourChoice = "Lūdzu, apstipriniet savu izvēli";
-$langAnd = "un";
-$langChoice = "Jūsu izvēle";
-$langFinish = "Pabeigt !";
-$langCancel = "Atcelt!";
-$langNotAllowed = "<b>Jūsu sesijas pieejas laiks ir beidzies</b>, <br>vai arī, Jums nav pieejas tiesību. <br><br><b>Lūdzu, autorizējieties atkārtoti!</b>";
-$langNotLogged = "Jūs neesat autorizējies šim kursam";
-$langManager = "Platformas vadība";
-$langOptional = "Izvēles";
+$Ok = "Darīts!";
+$Add = "Pievienot";
+$AddIntro = "Pievienot Kursa ievada tekstu un attēlus";
+$BackList = "Atpakaļ uz sarakstu";
+$Text = "Teksts";
+$Empty = "Jūs atstājāt dažus laukus tukšus.<br>Izmantojiet <b>Atpakaļ</b> pogu pārlūkprogrammā un mēģiniet vēlreiz. <br>Ja jūs neziniet Jūsu kursa kodu, skatieties Kursu Programmā.";
+$ConfirmYourChoice = "Lūdzu, apstipriniet savu izvēli";
+$And = "un";
+$Choice = "Jūsu izvēle";
+$Finish = "Pabeigt !";
+$Cancel = "Atcelt!";
+$NotAllowed = "<b>Jūsu sesijas pieejas laiks ir beidzies</b>, <br>vai arī, Jums nav pieejas tiesību. <br><br><b>Lūdzu, autorizējieties atkārtoti!</b>";
+$NotLogged = "Jūs neesat autorizējies šim kursam";
+$Manager = "Platformas vadība";
+$Optional = "Izvēles";
 $NextPage = "Nākošā lapa";
 $PreviousPage = "Iepriekšējā lapa";
-$langUse = "Lietot";
-$langTotal = "Kopumā";
-$langTake = "paņem";
-$langOne = "Viens";
-$langSeveral = "Vairāki";
-$langNotice = "Piezīme";
-$langDate = "Datums";
-$langAmong = "starp";
-$langShow = "Parādīt";
-$langMyCourses = "Mani kursi";
-$langModifyProfile = "Dati par mani";
-$langMyStats = "Statistika par manām darbībām kursos";
-$langLogout = "Beigt darbu!";
-$langMyAgenda = "Mans plānotājs";
-$langCourseHomepage = "Uz Kursa sākuma lapu";
-$langCourseManagerview = "Skatīt, kā Lektoram";
-$langStudentView = "Skatīt, kā Kursantam";
+$Use = "Lietot";
+$Total = "Kopumā";
+$Take = "paņem";
+$One = "Viens";
+$Several = "Vairāki";
+$Notice = "Piezīme";
+$Date = "Datums";
+$Among = "starp";
+$Show = "Parādīt";
+$MyCourses = "Mani kursi";
+$ModifyProfile = "Dati par mani";
+$MyStats = "Statistika par manām darbībām kursos";
+$Logout = "Beigt darbu!";
+$MyAgenda = "Mans plānotājs";
+$CourseHomepage = "Uz Kursa sākuma lapu";
+$CourseManagerview = "Skatīt, kā Lektoram";
+$StudentView = "Skatīt, kā Kursantam";
 $AddResource = "Pievienot to";
 $AddedResources = "Pielikumi";
-$lang_modify_resource = "Izmainīt / Pievienot avotus";
-$lang_resource = "Avots";
-$lang_resources = "Avoti";
 $langNameOfLang['arabic'] = "ar&#257;bu";
 $langNameOfLang['brazilian'] = "braz&#299;&#316;u";
 $langNameOfLang['bulgarian'] = "bulg&#257;ru";
@@ -176,27 +169,27 @@ $langNameOfLang['russian'] = "krievu";
 $langNameOfLang['simpl_chinese'] = "vienk_ķīniešu";
 $langNameOfLang['spanish'] = "sp&#257;&#326;u";
 $Close = "aizvērt";
-$langPlatform = "Platforma";
+$Platform = "Platforma";
 $localLangName = "valoda";
 $email = "e-pasts";
-$langCourseCodeAlreadyExists = "Hmm, bet šis kursa kods jau eksistē. Lūdzu izvēlies citu codu.";
+$CourseCodeAlreadyExists = "Hmm, bet šis kursa kods jau eksistē. Lūdzu izvēlies citu codu.";
 $Statistics = "Statistika";
-$langGrouplist = "grupas saraksts";
-$langPrevious = "iepriekšējo";
+$Grouplist = "grupas saraksts";
+$Previous = "iepriekšējo";
 $DestDirectoryDoesntExist = "Saņēmēj direktorija neeksistē";
 $Courses = "kursi";
 $In = "iekš";
-$langShowAll = "Parādīt visu";
-$langPage = "Lapa";
+$ShowAll = "Parādīt visu";
+$Page = "Lapa";
 $englishLangName = "Angļu";
 $Home = "Mana profila lapas sākums";
-$langAreYouSureToDelete = "Vai esat pārliecināti par dzēšanas nepieciešamību ?";
+$AreYouSureToDelete = "Vai esat pārliecināti par dzēšanas nepieciešamību ?";
 $SelectAll = "<b>Iezīmēt</b> visu";
 $UnSelectAll = "<b>Atcelt</b> iezīmējumu";
 $WithSelected = "Ar iezīmēto";
-$langOnLine = "Tiešsaistē";
-$langUsers = "Lietotāji";
-$langPlatformAdmin = "Platformas administrēšana";
+$OnLine = "Tiešsaistē";
+$Users = "Lietotāji";
+$PlatformAdmin = "Platformas administrēšana";
 $langNameOfLang['hungarian'] = "ung&#257;ru";
 $langNameOfLang['indonesian'] = "indonēziešu";
 $langNameOfLang['malay'] = "malaiziešu";
@@ -207,21 +200,20 @@ $langNameOfLang['thai'] = "taizemiešu";
 $langNameOfLang['turkce'] = "turku";
 $langNameOfLang['vietnamese'] = "vjetnamiešu";
 $UserInfo = "Informācija par lietotāju";
-$langModifyQuestion = "Saglabāt jautājumu";
-$langCheckAll = "Atzīmēt visus";
-$langNbAnnoucement = "Paziņojums";
-$lang_no_access_here = "JUMS NAV PIEEJAS TIESĪBU!";
-$langOtherCourses = "citi kursi";
+$ModifyQuestion = "Saglabāt jautājumu";
+$CheckAll = "Atzīmēt visus";
+$NbAnnoucement = "Paziņojums";
+$OtherCourses = "citi kursi";
 $Doc = "Kurss";
 $PlataformAdmin = "Platformas administrators";
 $Groups = "Grupas";
 $GroupManagement = "Grupu administrēšana";
 $All = "Visi vienā sarakstā";
 $None = "neviens";
-$langSorry = "Izvēlieties vispirms kursu";
-$langDenied = "Šī funkcija ir pieejama tikai kursa administratoriem";
+$Sorry = "Izvēlieties vispirms kursu";
+$Denied = "Šī funkcija ir pieejama tikai kursa administratoriem";
 $Today = "Šodien";
-$langCourseHomepageLink = "Atgriezties kursa sākuma lapā";
+$CourseHomepageLink = "Atgriezties kursa sākuma lapā";
 $Attachment = "pielikums";
 $User = "Lietotājvārds";
 $MondayInit = "P";
@@ -281,10 +273,10 @@ $SeptemberLong = "Septembris";
 $OctoberLong = "Oktobris";
 $NovemberLong = "Novembris";
 $DecemberLong = "Decembris";
-$langMyCompetences = "Manas kompetences";
-$langMyDiplomas = "Mani sasniegumi / diplomi";
-$langMyPersonalOpenArea = "Papildus informācija, ko vēlos sniegt par sevi";
-$langMyTeach = "Papildus informācija:<br>- Kādus priekšmetus es varu mācīt? <br>- Kādas vēl ir manas prasmes?";
+$MyCompetences = "Manas kompetences";
+$MyDiplomas = "Mani sasniegumi / diplomi";
+$MyPersonalOpenArea = "Papildus informācija, ko vēlos sniegt par sevi";
+$MyTeach = "Papildus informācija:<br>- Kādus priekšmetus es varu mācīt? <br>- Kādas vēl ir manas prasmes?";
 $Agenda = "Kursa notikumu plānotājs";
 $HourShort = "st.";
 $PleaseTryAgain = "Lūdzu, mēģiniet vēlreiz!";
@@ -294,7 +286,7 @@ $UplNotAZip = "Dokuments, ko izvēlējāties, nav ZIP fails.";
 $UplUploadSucceeded = "Fails augšupielādēts veiksmīgi!";
 $ExportAsCSV = "Izeksportēt kā CSV failu";
 $ExportAsXLS = "Izeksportēt kā XLS failu";
-$langOpenarea = "Personīgais lauciņš";
+$Openarea = "Personīgais lauciņš";
 $Done = "Darīts!";
 $Documents = "Mape “Dokumenti” (html,doc,pdf,attēlu,mediju u.c. faili)";
 $DocumentAdded = "Dokuments pievienots";
@@ -308,7 +300,7 @@ $Link = "Hipersaites";
 $Announcement = "Paziņojumi kursa lietotājiem";
 $Dropbox = "Dokumentu / failu apmaiņa";
 $Quiz = "Ievietot saturā jaunu kontroldarbu / testu, jeb ievietot jau iepriekš izveidotu";
-$langChat = "Tērzēšana";
+$Chat = "Tērzēšana";
 $Conference = "Konference";
 $Student_publication = "Patstāvīgi veicams, mājas darbs";
 $Tracking = "Atskaites";
@@ -321,8 +313,8 @@ $StartDate = "Sākuma datums";
 $EndDate = "Beigu datums";
 $StartTime = "Sākšanas laiks";
 $EndTime = "Beigšanas laiks";
-$langYouWereCalled = "Jūs uz sarunu uzaicināja";
-$langDoYouAccept = "Vai Jūs tam piekrītat?";
+$YouWereCalled = "Jūs uz sarunu uzaicināja";
+$DoYouAccept = "Vai Jūs tam piekrītat?";
 $Everybody = "Visi kursā reģistrētie";
 $SentTo = "Pieejams";
 $Export = "Eksportēt";
@@ -346,7 +338,7 @@ $FormHasErrorsPleaseComplete = "Formas lauciņos norādīti nekorekti dati, vai
 $StartDateShouldBeBeforeEndDate = "Sākuma datumam vajadzētu būt norādītam agrāk par beigu datumu";
 $InvalidDate = "Nekorekts datums";
 $OnlyLettersAndNumbersAllowed = "Ir atļauti tikai burti un cipari";
-$langBasicOverview = "Pamat pārskats";
+$BasicOverview = "Pamat pārskats";
 $CourseAdminRole = "Kursa administrators";
 $UserRole = "Loma";
 $OnlyImagesAllowed = "Tikai PNG, JPG vai GIF formāta attēli ir atļauti";
@@ -356,16 +348,14 @@ $DeleteRight = "Dzēst";
 $OverviewCourseRights = "Lomu & tiesību pārskats";
 $SeeAllRightsAllLocationsForSpecificRole = "Fokuss uz lomu";
 $SeeAllRolesAllLocationsForSpecificRight = "Fokuss uz tiesībām";
-$langAdvanced = "Papildus iespējas";
+$Advanced = "Papildus iespējas";
 $RightValueModified = "Vērtība tika izmainīta.";
 $course_rights = "Lomu & tiesību pārskats";
 $Visio_conference = "Virtuālā konference";
 $CourseAdminRoleDescription = "Lektors";
-$Move = "Pārvietot";
 $MoveTo = "Pārvietot uz";
 $Delete = "Dzēst";
 $MoveFileTo = "Pārvietot failu uz";
-$Save = "Saglabāt";
 $Error = "Kļūda";
 $Anonymous = "Aptauja ir anonīma";
 $h = "h";
@@ -381,9 +371,9 @@ $YouHaveNewMessage = "Tev ir vēstule !";
 $myActiveSessions = "Manas aktīvās sesijas";
 $myInactiveSessions = "Manas neaktīvās sesijas";
 $FileUpload = "Faila augšupielādēšana";
-$langMyActiveSessions = "Manas aktīvās sesijas";
-$langMyInActiveSessions = "Manas neaktīvās sesijas";
-$langMySpace = "Atskaites par padarīto manos kursos";
+$MyActiveSessions = "Manas aktīvās sesijas";
+$MyInActiveSessions = "Manas neaktīvās sesijas";
+$MySpace = "Atskaites par padarīto manos kursos";
 $ExtensionActivedButNotYetOperational = "Šis paplašinājums ir aktivizēts, bet šajā brīdī nav pielietojams";
 $MyStudents = "Mani Kursanti";
 $Progress = "Apgūtais apjoms";
@@ -803,7 +793,7 @@ $InvitationDenied = "Uzaicinājums liegts";
 $UserAdded = "Lietotājs ir pievienots";
 $UpdatedIn = "Atjaunināts";
 $Metadata = "Metadati";
-$langAddMetadata = "Skatīt / Labot Metadatus";
+$AddMetadata = "Skatīt / Labot Metadatus";
 $SendMessage = "Sūtīt vēstuli";
 $SeeForum = "Skatīt forumu";
 $SeeMore = "Skatīt vairāk";

+ 92 - 102
main/lang/lithuanian/trad4all.inc.php

@@ -9,48 +9,46 @@ $Title = "Antraštė";
 $By = "By";
 $UsersOnline = "Prisijungę vartotojai";
 $Remove = "Remove";
-$langEnter = "Atgal į kursų sąrašą";
+$Enter = "Atgal į kursų sąrašą";
 $Description = "Aprašymas";
 $Links = "Nuorodos";
-$langWorks = "Studentų publikacijos";
+$Works = "Studentų publikacijos";
 $Forums = "Forumai";
-$langExercices = "Testai";
-$langCreateDir = "Create a folder";
+$Exercices = "Testai";
+$CreateDir = "Create a folder";
 $Name = "Vardas";
-$langComment = "Komentaras";
-$langVisible = "Matomas/nematomas";
-$langNewDir = "Naujo katalogo pavadinimas";
-$langDirCr = "Katalogas sukurtas";
+$Comment = "Komentaras";
+$Visible = "Matomas/nematomas";
+$NewDir = "Naujo katalogo pavadinimas";
+$DirCr = "Katalogas sukurtas";
 $Download = "Parsisiųsti";
-$langGroup = "Grupės";
-$langEdit = "redaguoti";
-$langGroupForum = "Grupės Forumas";
+$Group = "Grupės";
+$Edit = "redaguoti";
+$GroupForum = "Grupės Forumas";
 $Language = "Kalba";
 $LoginName = "Prisijungimo vardas";
 $Assignments = "Studentų publikacijos";
 $Forum = "Forumai";
-$langDelImage = "Pašalinti nuotrauką";
-$langCode = "Course code";
-$langUp = "Viršun";
+$DelImage = "Pašalinti nuotrauką";
+$Code = "Course code";
+$Up = "Viršun";
 $Down = "žemyn";
-$Up = "aukštyn";
 $TheListIsEmpty = "Sąrašas tuščias.";
-$langUniqueSelect = "Vieno atsakymo pasirinkimas";
-$langCourseCreate = "Sukurti kurso tinklapį";
-$langTodo = "Ką daryti";
+$UniqueSelect = "Vieno atsakymo pasirinkimas";
+$CourseCreate = "Sukurti kurso tinklapį";
+$Todo = "Ką daryti";
 $UserName = "Vartotojo vardas";
-$lang_show_hide = "Rodyti / slėpti";
-$langCategoryMod = "Redaguoti kategoriją";
+$CategoryMod = "Redaguoti kategoriją";
 $Hide = "Paslėpti";
-$langDear = "Gerbiamasis (-oji)";
-$langArchive = "archyvas";
-$langCourseCode = "Kurso kodas";
-$langNoDescription = "Nėra aprašymo";
-$langOfficialCode = "Oficialus kodas";
+$Dear = "Gerbiamasis (-oji)";
+$Archive = "archyvas";
+$CourseCode = "Kurso kodas";
+$NoDescription = "Nėra aprašymo";
+$OfficialCode = "Oficialus kodas";
 $FirstName = "Vardas";
 $LastName = "Pavardė";
 $Status = "Būsena";
-$langEmail = "El. paštas";
+$Email = "El. paštas";
 $SlideshowConversion = "Skaidrių konvertavimas";
 $UploadFile = "Įkelti failą";
 $AvailableFrom = "Prieinamas nuo";
@@ -60,7 +58,6 @@ $Type = "Tipas";
 $EmailAddress = "El. pašto adresas";
 $Organisation = "Organizacija";
 $Reporting = "Reporting";
-$Code = "Kodas";
 $Update = "Atnaujinimas";
 $CurrentCourse = "Esamas Mokymosi kursas";
 $Back = "Back";
@@ -87,96 +84,91 @@ $dateFormatShort = "%y %b %d";
 $dateFormatLong = "%Y %A %B %d";
 $dateTimeFormatLong = "%Y %B %d, %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "taip";
-$langNo = "Ne";
+$Yes = "taip";
+$No = "Ne";
 $Next = "Toliau";
-$langAllowed = "Leidžiama";
-$langBackHome = "atgal į titulinį";
-$langPropositions = "Proposals for an improvement of";
-$langMaj = "Atnaujinti";
-$langModify = "redaguoti";
-$langDelete = "trinti";
-$langInvisible = "Padaryti nematomu";
-$langSave = "Išsaugoti";
-$langMove = "Perkelti";
+$Allowed = "Leidžiama";
+$BackHome = "atgal į titulinį";
+$Propositions = "Proposals for an improvement of";
+$Maj = "Atnaujinti";
+$Modify = "redaguoti";
+$Invisible = "Padaryti nematomu";
+$Save = "Išsaugoti";
+$Move = "Perkelti";
 $Help = "Pagalba";
-$langOk = "Taip";
-$langAdd = "Įrašyti";
-$langAddIntro = "Įdėti įžanginį tekstą";
-$langBackList = "Grįžti į sąrašą";
-$langText = "Tekstas";
-$langEmpty = "You left some fields empty.<br>Use the <b>Back</b> button on your browser and try again.<br>If you ignore your course code, see the Course Program";
-$langConfirmYourChoice = "Prašome patvirtinti pasirinkimą";
-$langAnd = "ir";
-$langChoice = "Jūsų pasirinkimas";
-$langFinish = "Užbaigti";
-$langCancel = "Atsisakyti";
-$langNotAllowed = "Neleidžiama";
-$langNotLogged = "Neprisijungta prie kurso";
-$langManager = "Vadovas";
-$langOptional = "Neprivaloma";
+$Ok = "Taip";
+$Add = "Įrašyti";
+$AddIntro = "Įdėti įžanginį tekstą";
+$BackList = "Grįžti į sąrašą";
+$Text = "Tekstas";
+$Empty = "You left some fields empty.<br>Use the <b>Back</b> button on your browser and try again.<br>If you ignore your course code, see the Course Program";
+$ConfirmYourChoice = "Prašome patvirtinti pasirinkimą";
+$And = "ir";
+$Choice = "Jūsų pasirinkimas";
+$Finish = "Užbaigti";
+$Cancel = "Atsisakyti";
+$NotAllowed = "Neleidžiama";
+$NotLogged = "Neprisijungta prie kurso";
+$Manager = "Vadovas";
+$Optional = "Neprivaloma";
 $NextPage = "Kitas puslapis";
 $PreviousPage = "Ankstesnis puslapis";
-$langUse = "Naudoti";
-$langTotal = "Iš viso";
-$langTake = "imti";
-$langOne = "Vienas";
-$langSeveral = "Keletas";
-$langNotice = "Įspėjimas";
-$langDate = "Data";
-$langAmong = "tarp";
-$langShow = "Rodyti";
-$langMyCourses = "Mano kursai";
-$langModifyProfile = "Mano profilis";
-$langMyStats = "Mano statistika";
-$langLogout = "Atsijungti";
-$langMyAgenda = "Mano darbotvarkė";
-$langCourseHomepage = "Kurso pagrindinis";
-$langCourseManagerview = "Dėstytojo sąsaja";
-$langStudentView = "Studento sąsaja";
+$Use = "Naudoti";
+$Total = "Iš viso";
+$Take = "imti";
+$One = "Vienas";
+$Several = "Keletas";
+$Notice = "Įspėjimas";
+$Date = "Data";
+$Among = "tarp";
+$Show = "Rodyti";
+$MyCourses = "Mano kursai";
+$ModifyProfile = "Mano profilis";
+$MyStats = "Mano statistika";
+$Logout = "Atsijungti";
+$MyAgenda = "Mano darbotvarkė";
+$CourseHomepage = "Kurso pagrindinis";
+$CourseManagerview = "Dėstytojo sąsaja";
+$StudentView = "Studento sąsaja";
 $AddResource = "Pridėti tai";
 $AddedResources = "Prisegti failai";
-$lang_modify_resource = "Redaguoti / pridėti resursus";
-$lang_resource = "Resursas";
-$lang_resources = "Resursai";
 $Close = "uždaryti";
-$langPlatform = "Sistema";
+$Platform = "Sistema";
 $localLangName = "kalba";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Sorry, but that course code already exists. Please choose another one.";
+$CourseCodeAlreadyExists = "Sorry, but that course code already exists. Please choose another one.";
 $Statistics = "Statistika";
-$langGrouplist = "grupių sąrašas";
-$langPrevious = "ankstesnis";
+$Grouplist = "grupių sąrašas";
+$Previous = "ankstesnis";
 $DestDirectoryDoesntExist = "Katalogas neegzistuoja";
 $Courses = "kursai";
 $In = "į";
-$langShowAll = "Rodyti visus";
-$langPage = "Puslapis";
+$ShowAll = "Rodyti visus";
+$Page = "Puslapis";
 $englishLangName = "Angliškai";
 $Home = "Pagrindinis puslapis";
-$langAreYouSureToDelete = "Ar tikrai norite ištrinti";
+$AreYouSureToDelete = "Ar tikrai norite ištrinti";
 $SelectAll = "Pažymėti visas";
 $UnSelectAll = "nužymėti viską";
 $WithSelected = "Su išrinktu";
-$langOnLine = "Prisijungęs";
-$langUsers = "Vartotojai";
-$langPlatformAdmin = "Sistemos administravimas";
+$OnLine = "Prisijungęs";
+$Users = "Vartotojai";
+$PlatformAdmin = "Sistemos administravimas";
 $UserInfo = "vartotojo informacija";
-$langModifyQuestion = "Redaguoti klausimą";
-$langCheckAll = "Tikrinti viską";
-$langNbAnnoucement = "Skelbimas";
-$lang_no_access_here = "Nėra priėjimo";
-$langOtherCourses = "kiti kursai";
+$ModifyQuestion = "Redaguoti klausimą";
+$CheckAll = "Tikrinti viską";
+$NbAnnoucement = "Skelbimas";
+$OtherCourses = "kiti kursai";
 $Doc = "Teorinė medžiaga";
 $PlataformAdmin = "Sistemos administratorius";
 $Groups = "Grupės";
 $GroupManagement = "Grupės valdymas";
 $All = "visi";
 $None = "None";
-$langSorry = "Select a course first";
-$langDenied = "This function is only available for course admins";
+$Sorry = "Select a course first";
+$Denied = "This function is only available for course admins";
 $Today = "šiandien";
-$langCourseHomepageLink = "Kurso pagrindinis";
+$CourseHomepageLink = "Kurso pagrindinis";
 $Attachment = "prisegtas failas";
 $User = "Vartotojai";
 $MondayInit = "P";
@@ -245,7 +237,7 @@ $UplNotAZip = "Jūsų pasirinktas failas nėra zip failas.";
 $UplUploadSucceeded = "Failo įkrovimas sėkmingas!";
 $ExportAsCSV = "Eksportuoti į CSV failą";
 $ExportAsXLS = "Eksportuoti į XLS failą";
-$langOpenarea = "Privati atvira sritis";
+$Openarea = "Privati atvira sritis";
 $Done = "Įvykdyta";
 $Documents = "Dokumentai";
 $DocumentAdded = "Dokumentas sukurtas";
@@ -258,7 +250,7 @@ $Link = "Nuorodos";
 $Announcement = "Skelbimai";
 $Dropbox = "Failų saugykla";
 $Quiz = "Testai";
-$langChat = "Pokalbių kambarys";
+$Chat = "Pokalbių kambarys";
 $Conference = "Konferencija";
 $Student_publication = "Studentų publikacijos";
 $Tracking = "Veiklos sekimas";
@@ -271,8 +263,8 @@ $StartDate = "Pradžios data";
 $EndDate = "Pabaigos data";
 $StartTime = "Pabaigos laikas";
 $EndTime = "Pradžios laikas";
-$langYouWereCalled = "Jus pakvietė pokalbiui su";
-$langDoYouAccept = "Pattvirtinate ?";
+$YouWereCalled = "Jus pakvietė pokalbiui su";
+$DoYouAccept = "Pattvirtinate ?";
 $Everybody = "Kiekvienas";
 $SentTo = "Matomas kam";
 $Export = "Eksportuoti";
@@ -295,7 +287,7 @@ $FormHasErrorsPleaseComplete = "Ši forma nepilnai ar neteisingai užpildyta. Pr
 $StartDateShouldBeBeforeEndDate = "Pradžios data turi būti ankstesnė nei pabaigos data";
 $InvalidDate = "Neteisinga data";
 $OnlyLettersAndNumbersAllowed = "Tiktai raidės ir skaičiai leidžiami";
-$langBasicOverview = "Tvarkymas";
+$BasicOverview = "Tvarkymas";
 $CourseAdminRole = "Kurso administratorius";
 $UserRole = "Vaidmuo";
 $OnlyImagesAllowed = "Tiktai PNG, JPG ar GIF paveikslėliai leidžiami";
@@ -305,16 +297,14 @@ $DeleteRight = "Trinti";
 $OverviewCourseRights = "Vaidmenų ir teisių apžvalga";
 $SeeAllRightsAllLocationsForSpecificRole = "Įsidėmėti vaidmenį";
 $SeeAllRolesAllLocationsForSpecificRight = "Atkreipti dėmesį į dešinę";
-$langAdvanced = "Sudarymas";
+$Advanced = "Sudarymas";
 $RightValueModified = "Reikšmė buvo modifikuota.";
 $course_rights = "Vaidmenų ir teisių apžvalga";
 $Visio_conference = "Vaizdo konferencijos";
 $CourseAdminRoleDescription = "Kurso administratorius";
-$Move = "Perkelti";
 $MoveTo = "Perkelti į";
 $Delete = "Ištrinti";
 $MoveFileTo = "Failą perkelti į";
-$Save = "Išsaugoti";
 $Error = "Error";
 $Anonymous = "Anoniminis";
 $h = "h";
@@ -330,9 +320,9 @@ $YouHaveNewMessage = "Jums atėjo nauja žinutė!";
 $myActiveSessions = "Mano aktyvios sesijos";
 $myInactiveSessions = "Mano naktyvios sesijos";
 $FileUpload = "Failo įkrovimas";
-$langMyActiveSessions = "Mano aktyvios sesijos";
-$langMyInActiveSessions = "Mano neaktyvios sesijos";
-$langMySpace = "Ataskaita";
+$MyActiveSessions = "Mano aktyvios sesijos";
+$MyInActiveSessions = "Mano neaktyvios sesijos";
+$MySpace = "Ataskaita";
 $ExtensionActivedButNotYetOperational = "Šis plėtinys aktyvuotas, bet kol kas neveikiantis.";
 $MyStudents = "Mano studentai";
 $Progress = "Progresas";

+ 96 - 106
main/lang/macedonian/trad4all.inc.php

@@ -9,48 +9,46 @@ $Title = "Наслов";
 $By = "Од";
 $UsersOnline = "Највени корисници";
 $Remove = "Отстрани";
-$langEnter = "Назад на мојот список на курсеви";
+$Enter = "Назад на мојот список на курсеви";
 $Description = "Опис";
 $Links = "Линкови";
-$langWorks = "Публикации на курсистот";
+$Works = "Публикации на курсистот";
 $Forums = "Форуми";
-$langExercices = "Тестови";
-$langCreateDir = "Креирај директориум";
+$Exercices = "Тестови";
+$CreateDir = "Креирај директориум";
 $Name = "Име";
-$langComment = "Коментар";
-$langVisible = "Видливо/невидливо";
-$langNewDir = "Име на новата папка";
-$langDirCr = "Директориумот е креиран";
+$Comment = "Коментар";
+$Visible = "Видливо/невидливо";
+$NewDir = "Име на новата папка";
+$DirCr = "Директориумот е креиран";
 $Download = "Симнување";
-$langGroup = "Групи";
-$langEdit = "уредување";
-$langGroupForum = "Форум на групата";
+$Group = "Групи";
+$Edit = "уредување";
+$GroupForum = "Форум на групата";
 $Language = "Јазик";
 $LoginName = "Корисничко име";
 $Assignments = "Публикации на курсистите";
 $Forum = "Форуми";
-$langDelImage = "Отстрани ја сликата";
-$langCode = "Шифра на курсот";
-$langUp = "Горе";
+$DelImage = "Отстрани ја сликата";
+$Code = "Шифра на курсот";
+$Up = "Горе";
 $Down = "долу";
-$Up = "горе";
 $TheListIsEmpty = "Списокот е празен.";
-$langUniqueSelect = "Повеќечлен избор";
-$langCourseCreate = "Создај ја веб страната на курсот";
-$langTodo = "Да се направи";
+$UniqueSelect = "Повеќечлен избор";
+$CourseCreate = "Создај ја веб страната на курсот";
+$Todo = "Да се направи";
 $UserName = "Корисничко_име";
-$lang_show_hide = "Покажи / сокриј";
-$langCategoryMod = "Менувај Категорија";
+$CategoryMod = "Менувај Категорија";
 $Hide = "Скриј";
-$langDear = "Почитувани";
-$langArchive = "архива";
-$langCourseCode = "Шифра на курсот";
-$langNoDescription = "Нема опис";
-$langOfficialCode = "Официјална Шифра";
+$Dear = "Почитувани";
+$Archive = "архива";
+$CourseCode = "Шифра на курсот";
+$NoDescription = "Нема опис";
+$OfficialCode = "Официјална Шифра";
 $FirstName = "Име";
 $LastName = "Презиме";
 $Status = "Статус";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $SlideshowConversion = "Претворање на слајд-шоу";
 $UploadFile = "Качи ја датотеката";
 $AvailableFrom = "Достапно од";
@@ -60,7 +58,6 @@ $Type = "Вид";
 $EmailAddress = "e-mail адреси";
 $Organisation = "Организација";
 $Reporting = "Извештаи";
-$Code = "Шифра";
 $Update = "Ажурирање";
 $CurrentCourse = "Тековен курс";
 $Back = "Назад";
@@ -89,58 +86,54 @@ $dateFormatShort = "%d. %b. %y";
 $dateFormatLong = "%A %d %B, %Y";
 $dateTimeFormatLong = "%d %B, %Y во %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "да";
-$langNo = "Не";
+$Yes = "да";
+$No = "Не";
 $Next = "Следно";
-$langAllowed = "Допуштено";
-$langBackHome = "Враќање кон почетната страница";
-$langPropositions = "Предлог за докажување на";
-$langMaj = "Ажурирање";
-$langModify = "измени";
-$langDelete = "избриши";
-$langInvisible = "Направи невидливо";
-$langSave = "Зачувај";
-$langMove = "Премести";
+$Allowed = "Допуштено";
+$BackHome = "Враќање кон почетната страница";
+$Propositions = "Предлог за докажување на";
+$Maj = "Ажурирање";
+$Modify = "измени";
+$Invisible = "Направи невидливо";
+$Save = "Зачувај";
+$Move = "Премести";
 $Help = "Помош";
-$langOk = "Добро";
-$langAdd = "Додај";
-$langAddIntro = "Додај воведен текст";
-$langBackList = "Врати се на списокот";
-$langText = "Текст";
-$langEmpty = "Оставивте некои полиња празни.Опотребете го копчето <b>Назад (Back)</b> на Вашиот пребарувач и обидете се повторно.Ако не ја знаете шифрата на Вашиот курс, видете Програма_на_курсот";
-$langConfirmYourChoice = "Ве молиме потврдете го Вашиот избор";
-$langAnd = "и";
-$langChoice = "Вашиот избор";
-$langFinish = "Заврши";
-$langCancel = "Откажи";
-$langNotAllowed = "Не е допуштено.";
-$langNotLogged = "Не сте најавени на курсот";
-$langManager = "Раководител";
-$langOptional = "Незадолжително";
+$Ok = "Добро";
+$Add = "Додај";
+$AddIntro = "Додај воведен текст";
+$BackList = "Врати се на списокот";
+$Text = "Текст";
+$Empty = "Оставивте некои полиња празни.Опотребете го копчето <b>Назад (Back)</b> на Вашиот пребарувач и обидете се повторно.Ако не ја знаете шифрата на Вашиот курс, видете Програма_на_курсот";
+$ConfirmYourChoice = "Ве молиме потврдете го Вашиот избор";
+$And = "и";
+$Choice = "Вашиот избор";
+$Finish = "Заврши";
+$Cancel = "Откажи";
+$NotAllowed = "Не е допуштено.";
+$NotLogged = "Не сте најавени на курсот";
+$Manager = "Раководител";
+$Optional = "Незадолжително";
 $NextPage = "Следна страна";
 $PreviousPage = "Претходна страна";
-$langUse = "Употреба";
-$langTotal = "Вкупно";
-$langTake = "земи";
-$langOne = "Едно";
-$langSeveral = "Неколку";
-$langNotice = "Забелешка";
-$langDate = "Датум";
-$langAmong = "меѓу";
-$langShow = "Покажи";
-$langMyCourses = "Мои курсеви";
-$langModifyProfile = "Мојот профил";
-$langMyStats = "Прикажи ги моите статистики";
-$langLogout = "Одјавување";
-$langMyAgenda = "Мој календар";
-$langCourseHomepage = "Почетна страна на Курсот";
-$langCourseManagerview = "Поглед за Учителот";
-$langStudentView = "Поглед за курсистот";
+$Use = "Употреба";
+$Total = "Вкупно";
+$Take = "земи";
+$One = "Едно";
+$Several = "Неколку";
+$Notice = "Забелешка";
+$Date = "Датум";
+$Among = "меѓу";
+$Show = "Покажи";
+$MyCourses = "Мои курсеви";
+$ModifyProfile = "Мојот профил";
+$MyStats = "Прикажи ги моите статистики";
+$Logout = "Одјавување";
+$MyAgenda = "Мој календар";
+$CourseHomepage = "Почетна страна на Курсот";
+$CourseManagerview = "Поглед за Учителот";
+$StudentView = "Поглед за курсистот";
 $AddResource = "Додај го";
 $AddedResources = "Прикачени";
-$lang_modify_resource = "Менувај/Додавај ресурси";
-$lang_resource = "Ресурс";
-$lang_resources = "Ресурси";
 $langNameOfLang['arabic'] = "&#1072;&#1088;&#1072;&#1087;&#1089;&#1082;&#1080;";
 $langNameOfLang['brazilian'] = "&#1073;&#1088;&#1072;&#1079;&#1080;&#1083;&#1089;&#1082;&#1080;";
 $langNameOfLang['bulgarian'] = "&#1073;&#1091;&#1075;&#1072;&#1088;&#1089;&#1082;&#1080;";
@@ -164,27 +157,27 @@ $langNameOfLang['russian'] = "&#1088;&#1091;&#1089;&#1082;&#1080;";
 $langNameOfLang['simpl_chinese'] = "&#1077;&#1076;&#1085;&#1086;&#1089;&#1090;&#1072;&#1074;&#1077;&#1085;_&#1082;&#1080;&#1085;&#1077;&#1089;&#1082;&#1080;";
 $langNameOfLang['spanish'] = "&#1096;&#1087;&#1072;&#1085;&#1089;&#1082;&#1080;";
 $Close = "затвори";
-$langPlatform = "Платформа";
+$Platform = "Платформа";
 $localLangName = "јазик";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Жалам, но шифрата на курсот веќе постои. Ве молам изберете друга шифра.";
+$CourseCodeAlreadyExists = "Жалам, но шифрата на курсот веќе постои. Ве молам изберете друга шифра.";
 $Statistics = "Статистика";
-$langGrouplist = "список на групи";
-$langPrevious = "претходно";
+$Grouplist = "список на групи";
+$Previous = "претходно";
 $DestDirectoryDoesntExist = "Посочениот директориум не постои";
 $Courses = "курсеви";
 $In = "во";
-$langShowAll = "Покажи се'";
-$langPage = "Страна";
+$ShowAll = "Покажи се'";
+$Page = "Страна";
 $englishLangName = "Англиски";
 $Home = "Почеток";
-$langAreYouSureToDelete = "Сигурни ли сте дека сакате да се избрише?";
+$AreYouSureToDelete = "Сигурни ли сте дека сакате да се избрише?";
 $SelectAll = "Селектирај се'";
 $UnSelectAll = "отселектирај се'";
 $WithSelected = "Со селектираното";
-$langOnLine = "Најавени";
-$langUsers = "Корисници";
-$langPlatformAdmin = "Управување со Платформата";
+$OnLine = "Најавени";
+$Users = "Корисници";
+$PlatformAdmin = "Управување со Платформата";
 $langNameOfLang['hungarian'] = "&#1091;&#1085;&#1075;&#1072;&#1088;&#1089;&#1082;&#1080;";
 $langNameOfLang['indonesian'] = "&#1080;&#1085;&#1076;&#1086;&#1085;&#1077;&#1079;&#1080;&#1089;&#1082;&#1080;";
 $langNameOfLang['malay'] = "&#1084;&#1072;&#1083;&#1072;&#1112;&#1089;&#1082;&#1080;";
@@ -195,21 +188,20 @@ $langNameOfLang['thai'] = "&#1090;&#1072;&#1080;";
 $langNameOfLang['turkce'] = "&#1090;&#1091;&#1088;&#1089;&#1082;&#1080;";
 $langNameOfLang['vietnamese'] = "&#1074;&#1080;&#1077;&#1090;&#1085;&#1072;&#1084;&#1089;&#1082;&#1080;";
 $UserInfo = "информација за корисникот";
-$langModifyQuestion = "Измени го прашањето";
-$langCheckAll = "Маркирај се'";
-$langNbAnnoucement = "Соопштение";
-$lang_no_access_here = "Немате пристап тука";
-$langOtherCourses = "други курсеви";
+$ModifyQuestion = "Измени го прашањето";
+$CheckAll = "Маркирај се'";
+$NbAnnoucement = "Соопштение";
+$OtherCourses = "други курсеви";
 $Doc = "Патека_на_учењето";
 $PlataformAdmin = "Управувач со Платформата";
 $Groups = "Групи";
 $GroupManagement = "Управување со групата";
 $All = "Сите";
 $None = "ништо";
-$langSorry = "Прво изберете курс";
-$langDenied = "&#1054;&#1074;&#1072;&#1072; &#1092;&#1091;&#1085;&#1082;&#1094;&#1080;&#1112;&#1072; &#1077; &#1076;&#1086;&#1089;&#1090;&#1072;&#1087;&#1085;&#1072; &#1089;&#1072;&#1084;&#1086; &#1089;&#1072; &#1091;&#1087;&#1088;&#1072;&#1074;&#1091;&#1074;&#1072;&#10";
+$Sorry = "Прво изберете курс";
+$Denied = "&#1054;&#1074;&#1072;&#1072; &#1092;&#1091;&#1085;&#1082;&#1094;&#1080;&#1112;&#1072; &#1077; &#1076;&#1086;&#1089;&#1090;&#1072;&#1087;&#1085;&#1072; &#1089;&#1072;&#1084;&#1086; &#1089;&#1072; &#1091;&#1087;&#1088;&#1072;&#1074;&#1091;&#1074;&#1072;&#10";
 $Today = "&#1076;&#1077;&#1085;&#1077;&#1089;";
-$langCourseHomepageLink = "Почетна страна на Курсот";
+$CourseHomepageLink = "Почетна страна на Курсот";
 $Attachment = "прикачи";
 $User = "Корисници";
 $MondayInit = "П";
@@ -269,10 +261,10 @@ $SeptemberLong = "Септември";
 $OctoberLong = "Октомври";
 $NovemberLong = "Ноември";
 $DecemberLong = "Декември";
-$langMyCompetences = "Мои компетенции";
-$langMyDiplomas = "Мои дипломи";
-$langMyPersonalOpenArea = "Моо лично отвоерно опкружување";
-$langMyTeach = "За што сум оспособен да подучувам";
+$MyCompetences = "Мои компетенции";
+$MyDiplomas = "Мои дипломи";
+$MyPersonalOpenArea = "Моо лично отвоерно опкружување";
+$MyTeach = "За што сум оспособен да подучувам";
 $Agenda = "Календар";
 $HourShort = "ч";
 $PleaseTryAgain = "Ве молиме обидете се повторно!";
@@ -282,7 +274,7 @@ $UplNotAZip = "Датотеката која ја означивте не е к
 $UplUploadSucceeded = "Качувањето на датотеката беше успешно!";
 $ExportAsCSV = "Извези како CSV-датотека";
 $ExportAsXLS = "Извези како XLS-датотека";
-$langOpenarea = "Лично отворено опкружување";
+$Openarea = "Лично отворено опкружување";
 $Done = "Сторено";
 $Documents = "Документи";
 $DocumentAdded = "Документот е додаден";
@@ -295,7 +287,7 @@ $Link = "Врска";
 $Announcement = "Известување";
 $Dropbox = "Размена на документи и пораки";
 $Quiz = "Вежби";
-$langChat = "Муабет";
+$Chat = "Муабет";
 $Conference = "Конференција";
 $Student_publication = "Публикации на курситите";
 $Tracking = "Следење";
@@ -308,8 +300,8 @@ $StartDate = "Почетен датум";
 $EndDate = "Краен датум";
 $StartTime = "Почетно време";
 $EndTime = "Крајно време";
-$langYouWereCalled = "Поканети сте на муабет со";
-$langDoYouAccept = "Прифаќате ли?";
+$YouWereCalled = "Поканети сте на муабет со";
+$DoYouAccept = "Прифаќате ли?";
 $Everybody = "Сите";
 $SentTo = "Видливо за";
 $Export = "Извези";
@@ -333,7 +325,7 @@ $FormHasErrorsPleaseComplete = "Формата содржи неточни ил
 $StartDateShouldBeBeforeEndDate = "Почетниот датум мора да е порано од крајниот";
 $InvalidDate = "Погрешен датум";
 $OnlyLettersAndNumbersAllowed = "Допуштени се само букви и цифри";
-$langBasicOverview = "Организирај";
+$BasicOverview = "Организирај";
 $CourseAdminRole = "Управувач со курсот";
 $UserRole = "Улога";
 $OnlyImagesAllowed = "Допуштени се само слики од типот PNG, JPG или GIF";
@@ -343,16 +335,14 @@ $DeleteRight = "Избриши";
 $OverviewCourseRights = "Улоги & преглед на правата";
 $SeeAllRightsAllLocationsForSpecificRole = "Прецизирање на улога";
 $SeeAllRolesAllLocationsForSpecificRight = "Фокусирај на правилното";
-$langAdvanced = "Гради";
+$Advanced = "Гради";
 $RightValueModified = "Вредноста е променета";
 $course_rights = "Улоги & преглед на правата";
 $Visio_conference = "Виртуелен состанок";
 $CourseAdminRoleDescription = "Управувачот на курсот";
-$Move = "Премести";
 $MoveTo = "Премести во";
 $Delete = "Избриши";
 $MoveFileTo = "Премести датотека во";
-$Save = "Сними";
 $Error = "Грешка";
 $Anonymous = "Анонимус";
 $h = "ч";
@@ -368,9 +358,9 @@ $YouHaveNewMessage = "Имате нова порака!";
 $myActiveSessions = "Мои активни Сесии";
 $myInactiveSessions = "Мои неактивни Сесии";
 $FileUpload = "Качување на датотека";
-$langMyActiveSessions = "Мои активни Сесии";
-$langMyInActiveSessions = "Мои неактивни Сесии";
-$langMySpace = "Поднесување на извештаи";
+$MyActiveSessions = "Мои активни Сесии";
+$MyInActiveSessions = "Мои неактивни Сесии";
+$MySpace = "Поднесување на извештаи";
 $ExtensionActivedButNotYetOperational = "Оваа наставка беше активна, но не може да биде оперативна во моментов.";
 $MyStudents = "Мои курсисти";
 $Progress = "Напредување";

+ 51 - 52
main/lang/malay/trad4all.inc.php

@@ -3,31 +3,31 @@
 for more information: see languages.txt in the lang folder.
 */
 $Remove = "Padam";
-$langEnter = "Kembali ke senarai subjek";
+$Enter = "Kembali ke senarai subjek";
 $Description = "Penerangan";
 $Links = "Pautan";
-$langWorks = "Tugasan";
+$Works = "Tugasan";
 $Forums = "Forum";
-$langExercices = "Latihan";
-$langCreateDir = "Bina Direktori";
+$Exercices = "Latihan";
+$CreateDir = "Bina Direktori";
 $Name = "Nama";
-$langComment = "Komen";
-$langVisible = "Papar/Tidak Papar";
-$langNewDir = "Nama direktori baru";
-$langDirCr = "Direktori dibina";
-$langGroup = "Kumpulan";
-$langEdit = "Ubahsuai";
-$langGroupForum = "Forum";
+$Comment = "Komen";
+$Visible = "Papar/Tidak Papar";
+$NewDir = "Nama direktori baru";
+$DirCr = "Direktori dibina";
+$Group = "Kumpulan";
+$Edit = "Ubahsuai";
+$GroupForum = "Forum";
 $Language = "Bahasa";
 $Assignments = "Assignments";
 $Forum = "Forum";
-$langCode = "Kod Subjek";
-$langUp = "Atas";
-$langUniqueSelect = "Pelbagai Jawapan (Satu Jawapan)";
-$langCourseCreate = "Bina Laman Subjek";
-$langTodo = "Cadangan Penambahbaikan";
+$Code = "Kod Subjek";
+$Up = "Atas";
+$UniqueSelect = "Pelbagai Jawapan (Satu Jawapan)";
+$CourseCreate = "Bina Laman Subjek";
+$Todo = "Cadangan Penambahbaikan";
 $UserName = "ID Pengguna";
-$langDear = "Terima kasih";
+$Dear = "Terima kasih";
 $iso639_2_code = "en";
 $iso639_1_code = "eng";
 $charset = "iso-8859-1";
@@ -40,44 +40,43 @@ $dateFormatShort = "%d, %b %y";
 $dateFormatLong = "%A, %d %B %Y";
 $dateTimeFormatLong = "Tarikh hari ini :%d %B %Y Masa:%I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "Ya";
-$langNo = "Tidak";
+$Yes = "Ya";
+$No = "Tidak";
 $Next = "Seterusnya";
-$langAllowed = "Dibenarkan";
-$langBackHome = "Kembali ke Laman Subjek";
-$langPropositions = "Cadangan untuk meningkatkan";
-$langMaj = "Kemaskini";
-$langModify = "Ubahsuai";
-$langDelete = "Padam";
-$langMove = "Pindah";
+$Allowed = "Dibenarkan";
+$BackHome = "Kembali ke Laman Subjek";
+$Propositions = "Cadangan untuk meningkatkan";
+$Maj = "Kemaskini";
+$Modify = "Ubahsuai";
+$Move = "Pindah";
 $Help = "Bantuan";
-$langOk = "Proses";
-$langAdd = "Tambah";
-$langAddIntro = "Tambah pengenalan";
-$langBackList = "Kembali ke senarai";
-$langText = "Teks";
-$langEmpty = "Ruang kosong belum diisi sepenuhnya.<br>Use the <b>Back</b> button on your browser and try again.<br>If you ignore your course's code, see the Course Program";
-$langConfirmYourChoice = "Anda pasti untuk memadam pilihan anda ?";
-$langAnd = "dan";
-$langChoice = "Pilihan anda";
-$langFinish = "Selesai";
-$langCancel = "Batal";
-$langNotAllowed = "Tidak dibenarkan";
-$langManager = "Pentadbir Sistem";
-$langOptional = "Pilihan";
+$Ok = "Proses";
+$Add = "Tambah";
+$AddIntro = "Tambah pengenalan";
+$BackList = "Kembali ke senarai";
+$Text = "Teks";
+$Empty = "Ruang kosong belum diisi sepenuhnya.<br>Use the <b>Back</b> button on your browser and try again.<br>If you ignore your course's code, see the Course Program";
+$ConfirmYourChoice = "Anda pasti untuk memadam pilihan anda ?";
+$And = "dan";
+$Choice = "Pilihan anda";
+$Finish = "Selesai";
+$Cancel = "Batal";
+$NotAllowed = "Tidak dibenarkan";
+$Manager = "Pentadbir Sistem";
+$Optional = "Pilihan";
 $NextPage = "Laman seterusnya";
 $PreviousPage = "Laman sebelumnya";
-$langUse = "Guna";
-$langTotal = "Jumlah";
-$langTake = "ambil";
-$langOne = "Satu";
-$langSeveral = "Banyak";
-$langNotice = "Pemberitahuan";
-$langDate = "Tarikh";
-$langAmong = "diantara";
-$langMyCourses = "Senarai Subjek";
-$langModifyProfile = "Kemaskini Butir Peribadi";
-$langMyStats = "Papar Statistik";
-$langLogout = "Keluar";
+$Use = "Guna";
+$Total = "Jumlah";
+$Take = "ambil";
+$One = "Satu";
+$Several = "Banyak";
+$Notice = "Pemberitahuan";
+$Date = "Tarikh";
+$Among = "diantara";
+$MyCourses = "Senarai Subjek";
+$ModifyProfile = "Kemaskini Butir Peribadi";
+$MyStats = "Papar Statistik";
+$Logout = "Keluar";
 $NextWeek = "Minggu Seterusnya";
 ?>

+ 78 - 85
main/lang/norwegian/trad4all.inc.php

@@ -6,37 +6,36 @@ $NoTimeLimits = "Ingen tidsbegrensning";
 $Title = "Tittel";
 $UsersOnline = "Brukere online";
 $Remove = "Fjern";
-$langEnter = "Logg inn";
+$Enter = "Logg inn";
 $Description = "Beskrivelse";
 $Forums = "Forum";
-$langCreateDir = "Opprett en mappe";
+$CreateDir = "Opprett en mappe";
 $Name = "Navn";
-$langComment = "Kommentar";
-$langVisible = "Synlig/usynlig";
+$Comment = "Kommentar";
+$Visible = "Synlig/usynlig";
 $Download = "Last opp";
-$langGroup = "Gruppe";
-$langEdit = "rediger";
+$Group = "Gruppe";
+$Edit = "rediger";
 $Language = "Språk";
 $LoginName = "Pålogging";
 $Forum = "Forum";
-$langDelImage = "Fjern bilde";
-$langCode = "Kurskode";
-$langUp = "forrige nivå";
+$DelImage = "Fjern bilde";
+$Code = "Kurskode";
+$Up = "forrige nivå";
 $Down = "ned";
-$Up = "opp";
 $Theme = "Utseende";
 $TheListIsEmpty = "Listen er tom";
-$langCourseCreate = "Opprett ett kursnettsted";
-$langTodo = "Gjøremål";
+$CourseCreate = "Opprett ett kursnettsted";
+$Todo = "Gjøremål";
 $UserName = "Brukernavn";
 $Hide = "Skjul";
-$langArchive = "arkiver";
-$langCourseCode = "Kurs kode";
-$langOfficialCode = "Offisiell kode";
+$Archive = "arkiver";
+$CourseCode = "Kurs kode";
+$OfficialCode = "Offisiell kode";
 $FirstName = "Fornavn";
 $LastName = "Etternavn";
 $Status = "Status";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $EmailAddress = "Mail adresse";
 $Reporting = "Rapportering";
 $iso639_2_code = "no";
@@ -51,58 +50,54 @@ $dateFormatShort = " %d. %b. %y";
 $dateFormatLong = " %A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "ja";
-$langNo = "Nei";
+$Yes = "ja";
+$No = "Nei";
 $Next = "Neste";
-$langAllowed = "Tillatt";
-$langBackHome = "Til hjemmesiden for kurset";
-$langPropositions = "Forslag til en forbedring av";
-$langMaj = "Oppdater";
-$langModify = "rediger";
-$langDelete = "slett";
-$langInvisible = "Gjør usynlig";
-$langSave = "Lagre";
-$langMove = "Flytte";
+$Allowed = "Tillatt";
+$BackHome = "Til hjemmesiden for kurset";
+$Propositions = "Forslag til en forbedring av";
+$Maj = "Oppdater";
+$Modify = "rediger";
+$Invisible = "Gjør usynlig";
+$Save = "Lagre";
+$Move = "Flytte";
 $Help = "Hjelp";
-$langOk = "OK";
-$langAdd = "Legg til";
-$langAddIntro = "Opprett en introduksjonstekst";
-$langBackList = "Retur til listen";
-$langText = "Tekst";
-$langEmpty = "Tom";
-$langConfirmYourChoice = "Bekreft ditt valg";
-$langAnd = "og";
-$langChoice = "Ditt valg";
-$langFinish = "Avslutt";
-$langCancel = "Avbryt";
-$langNotAllowed = "Du har ikke tilgang her eller din sesjon har utløpt.  Logg på igjen.";
-$langNotLogged = "Du er ikke pålogget et kurs";
-$langManager = "Administrator";
-$langOptional = "Valgfri";
+$Ok = "OK";
+$Add = "Legg til";
+$AddIntro = "Opprett en introduksjonstekst";
+$BackList = "Retur til listen";
+$Text = "Tekst";
+$Empty = "Tom";
+$ConfirmYourChoice = "Bekreft ditt valg";
+$And = "og";
+$Choice = "Ditt valg";
+$Finish = "Avslutt";
+$Cancel = "Avbryt";
+$NotAllowed = "Du har ikke tilgang her eller din sesjon har utløpt.  Logg på igjen.";
+$NotLogged = "Du er ikke pålogget et kurs";
+$Manager = "Administrator";
+$Optional = "Valgfri";
 $NextPage = "Neste side";
 $PreviousPage = "Forrige side";
-$langUse = "Bruk";
-$langTotal = "Totalt";
-$langTake = "ta";
-$langOne = "En";
-$langSeveral = "Flere";
-$langNotice = "Notis";
-$langDate = "Dato";
-$langAmong = "blandt";
-$langShow = "Vis";
-$langMyCourses = "Mine kurs";
-$langModifyProfile = "Min profile";
-$langMyStats = "Vis min statistikk";
-$langLogout = "Logg av";
-$langMyAgenda = "Min agenda";
-$langCourseHomepage = "Kursets hjemmeside";
-$langCourseManagerview = "Lærervisning";
-$langStudentView = "Studentvisning";
+$Use = "Bruk";
+$Total = "Totalt";
+$Take = "ta";
+$One = "En";
+$Several = "Flere";
+$Notice = "Notis";
+$Date = "Dato";
+$Among = "blandt";
+$Show = "Vis";
+$MyCourses = "Mine kurs";
+$ModifyProfile = "Min profile";
+$MyStats = "Vis min statistikk";
+$Logout = "Logg av";
+$MyAgenda = "Min agenda";
+$CourseHomepage = "Kursets hjemmeside";
+$CourseManagerview = "Lærervisning";
+$StudentView = "Studentvisning";
 $AddResource = "Legg til";
 $AddedResources = "Vedlegg";
-$lang_modify_resource = "Endre / legge til ressurser";
-$lang_resource = "Ressurs";
-$lang_resources = "Ressurser";
 $langNameOfLang['arabic'] = "Arabisk";
 $langNameOfLang['brazilian'] = "Brasilsk";
 $langNameOfLang['bulgarian'] = "Bulgarsk";
@@ -125,24 +120,24 @@ $langNameOfLang['portuguese'] = "Portugisisk";
 $langNameOfLang['russian'] = "Russisk";
 $langNameOfLang['simpl_chinese'] = "Vanlig kinesisk";
 $langNameOfLang['spanish'] = "Spansk";
-$langPlatform = "Platform";
+$Platform = "Platform";
 $localLangName = "språk";
 $email = "e-post";
-$langCourseCodeAlreadyExists = "Denne kurskoden finnes allerede.  Benytt en annen";
+$CourseCodeAlreadyExists = "Denne kurskoden finnes allerede.  Benytt en annen";
 $Statistics = "Statistikk";
-$langGrouplist = "liste grupper";
-$langPrevious = "forrige";
+$Grouplist = "liste grupper";
+$Previous = "forrige";
 $Courses = "kurs";
 $In = "i";
-$langShowAll = "Vis alle";
-$langPage = "Side";
+$ShowAll = "Vis alle";
+$Page = "Side";
 $englishLangName = "Engelsk";
 $SelectAll = "velg alle";
 $UnSelectAll = "fravelg alle";
 $WithSelected = "Med valgte";
-$langOnLine = "Online";
-$langUsers = "Brukere";
-$langPlatformAdmin = "Plattformadministrator";
+$OnLine = "Online";
+$Users = "Brukere";
+$PlatformAdmin = "Plattformadministrator";
 $langNameOfLang['hungarian'] = "ungarsk";
 $langNameOfLang['indonesian'] = "indonesisk";
 $langNameOfLang['malay'] = "malaisisk";
@@ -153,16 +148,15 @@ $langNameOfLang['thai'] = "thailandsk";
 $langNameOfLang['turkce'] = "tyrkisk";
 $langNameOfLang['vietnamese'] = "vietnamesisk";
 $UserInfo = "Brukerinformasjon";
-$langCheckAll = "Velg alle";
-$langNbAnnoucement = "Annonsering";
-$lang_no_access_here = "Ingen adgang her";
-$langOtherCourses = "Andre kurs";
+$CheckAll = "Velg alle";
+$NbAnnoucement = "Annonsering";
+$OtherCourses = "Andre kurs";
 $Doc = "dokument";
 $PlataformAdmin = "Plattformadministrasjon";
 $Groups = "Grupper";
 $GroupManagement = "Gruppehåndtering";
 $Today = "idag";
-$langCourseHomepageLink = "Nåværende kurs";
+$CourseHomepageLink = "Nåværende kurs";
 $Attachment = "Vedlegg";
 $User = "Bruker";
 $MondayInit = "M";
@@ -222,9 +216,9 @@ $SeptemberLong = "September";
 $OctoberLong = "Oktober";
 $NovemberLong = "November";
 $DecemberLong = "Desember";
-$langMyCompetences = "Min kompetanse";
-$langMyDiplomas = "Mine diplomer";
-$langMyPersonalOpenArea = "Om meg selv";
+$MyCompetences = "Min kompetanse";
+$MyDiplomas = "Mine diplomer";
+$MyPersonalOpenArea = "Om meg selv";
 $Agenda = "Kalender";
 $HourShort = "t";
 $PleaseTryAgain = "Prøv igjen!";
@@ -232,7 +226,7 @@ $UplNotAZip = "Filen du valgte er ikke en zip-fil.";
 $UplUploadSucceeded = "Filopplasting korrekt!";
 $ExportAsCSV = "Eksporter som CSV-fil";
 $ExportAsXLS = "Eksporter som XLS-fil";
-$langOpenarea = "Personlig åpent område";
+$Openarea = "Personlig åpent område";
 $Done = "Utført";
 $Documents = "Dokumenter";
 $DocumentAdded = "Dokument lagt til";
@@ -245,7 +239,7 @@ $Link = "Lenke";
 $Announcement = "Annonseringer";
 $Dropbox = "Dropboks";
 $Quiz = "Øvelser";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Konferanse";
 $Student_publication = "Studentpublikasjoner";
 $Tracking = "Sporing";
@@ -258,8 +252,8 @@ $StartDate = "Startdato";
 $EndDate = "Sluttdato";
 $StartTime = "Starttid";
 $EndTime = "Slutt-tid";
-$langYouWereCalled = "Du ble invitert til chat med";
-$langDoYouAccept = "Aksepterer du dette?";
+$YouWereCalled = "Du ble invitert til chat med";
+$DoYouAccept = "Aksepterer du dette?";
 $Everybody = "Alle";
 $SentTo = "Synlig for";
 $Export = "Eksporter";
@@ -293,7 +287,6 @@ $SeeAllRolesAllLocationsForSpecificRight = "Fokus på rettigheter";
 $RightValueModified = "Verdien er endret";
 $course_rights = "Oversikt over roller og rettigheter";
 $CourseAdminRoleDescription = "Kursadministrator";
-$Save = "Lagre";
 $CreateNewGlobalRole = "Opprett ny global rolle";
 $CreateNewLocalRole = "Opprett ny lokal rolle";
 $Actions = "Handling";
@@ -301,7 +294,7 @@ $Inbox = "Innboks";
 $ComposeMessage = "Komponer melding";
 $Other = "Annen";
 $CampusHomepage = "Innloggingssiden";
-$langMySpace = "Rapportering";
+$MySpace = "Rapportering";
 $Progress = "Fremdrift";
 $MyProgress = "Min fremdrift";
 $MyGradebook = "Min karakterbok";

+ 69 - 76
main/lang/occitan/trad4all.inc.php

@@ -6,32 +6,30 @@ $UsersOnline = "Usanciers connectats";
 $Remove = "Eliminar";
 $Description = "Descripcion";
 $Links = "Liames";
-$langWorks = "Pretzfachs deis estudiants";
+$Works = "Pretzfachs deis estudiants";
 $Forums = "Fòrums";
-$langExercices = "Exercicis";
-$langCreateDir = "Crear un dorsier";
+$Exercices = "Exercicis";
+$CreateDir = "Crear un dorsier";
 $Name = "Nom";
-$langComment = "Comentar";
-$langVisible = "Visible/invisible";
-$langDirCr = "Dorsier creat";
+$Comment = "Comentar";
+$Visible = "Visible/invisible";
+$DirCr = "Dorsier creat";
 $Download = "Mandar";
-$langGroup = "Grop";
-$langEdit = "Editar";
-$langGroupForum = "Fòrum";
+$Group = "Grop";
+$Edit = "Editar";
+$GroupForum = "Fòrum";
 $Language = "Lengatge";
 $LoginName = "Nom d'usancier";
 $Assignments = "Pretzfachs";
 $Forum = "Fòrum";
-$langCode = "Còde dau cors";
-$langUp = "Amont";
+$Code = "Còde dau cors";
+$Up = "Amont";
 $Down = "Avau";
-$Up = "amont";
 $TheListIsEmpty = "La lista es completa";
-$langCourseCreate = "Crear un cors web";
-$langTodo = "Activitats de complir";
+$CourseCreate = "Crear un cors web";
+$Todo = "Activitats de complir";
 $UserName = "Nom d'usancier";
-$lang_show_hide = "Monstrar/ Escondre";
-$langCategoryMod = "Modificar la categoria";
+$CategoryMod = "Modificar la categoria";
 $iso639_2_code = "oc";
 $iso639_1_code = "oc";
 $charset = "iso-8859-1";
@@ -44,82 +42,77 @@ $dateFormatShort = "%d %b, %y";
 $dateFormatLong = "%A, %d de %B de %Y";
 $dateTimeFormatLong = "%A, %d de %B del %Y a  %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "Òc";
-$langNo = "Non";
+$Yes = "Òc";
+$No = "Non";
 $Next = "Seguent";
-$langAllowed = "Permés";
-$langBackHome = "Tornar a la Pagina d'Intrada de";
-$langPropositions = "Prepausa de melhorar";
-$langMaj = "Actualizar";
-$langModify = "Modificar";
-$langDelete = "Eliminar";
-$langInvisible = "Faire venir invisible";
-$langSave = "Servar";
-$langMove = "Mòure";
+$Allowed = "Permés";
+$BackHome = "Tornar a la Pagina d'Intrada de";
+$Propositions = "Prepausa de melhorar";
+$Maj = "Actualizar";
+$Modify = "Modificar";
+$Invisible = "Faire venir invisible";
+$Save = "Servar";
+$Move = "Mòure";
 $Help = "Ajuda";
-$langOk = "D'acòrd";
-$langAddIntro = "Ajustar un tèxt d'introduccion";
-$langBackList = "Tornar a la lista";
-$langText = "Tèxt";
-$langEmpty = "D'airaus son demorats vuejes !<br>Emplegatz lo boton <b>Arrier</b> de vòstre navigator e assajatz tornarmai.<br>Se conoissètz pas lo còdi dau cors, vos fau anar veire lo catalòg deis cors";
-$langConfirmYourChoice = "Confirmar la causida";
-$langAnd = "e";
-$langChoice = "Vòstra causida";
-$langFinish = "Acabar";
-$langCancel = "Anullar";
-$langNotAllowed = "Accès defendut. Regardatz veire de vos tornar connectar";
-$langNotLogged = "Siatz pas autentificat per lo cors";
-$langManager = "Administrator";
-$langOptional = "Opcionau";
+$Ok = "D'acòrd";
+$AddIntro = "Ajustar un tèxt d'introduccion";
+$BackList = "Tornar a la lista";
+$Text = "Tèxt";
+$Empty = "D'airaus son demorats vuejes !<br>Emplegatz lo boton <b>Arrier</b> de vòstre navigator e assajatz tornarmai.<br>Se conoissètz pas lo còdi dau cors, vos fau anar veire lo catalòg deis cors";
+$ConfirmYourChoice = "Confirmar la causida";
+$And = "e";
+$Choice = "Vòstra causida";
+$Finish = "Acabar";
+$Cancel = "Anullar";
+$NotAllowed = "Accès defendut. Regardatz veire de vos tornar connectar";
+$NotLogged = "Siatz pas autentificat per lo cors";
+$Manager = "Administrator";
+$Optional = "Opcionau";
 $NextPage = "Pagina seguenta";
 $PreviousPage = "Pagina precedenta";
-$langUse = "Emplegar";
-$langTotal = "Totau";
-$langTake = "causir";
-$langOne = "Un";
-$langSeveral = "Mai d'un(a)";
-$langNotice = "Avís";
-$langAmong = "entre";
-$langShow = "Mostrar";
-$langMyCourses = "Ma lista de cors";
-$langModifyProfile = "Modificar mon perfiu";
-$langMyStats = "Veire meis estadisticas";
-$langLogout = "Sortir";
-$langMyAgenda = "Mon agenda";
-$langCourseHomepage = "Acuelh";
-$langCourseManagerview = "Vista dau professor";
-$langStudentView = "Vista de l'estudiant";
+$Use = "Emplegar";
+$Total = "Totau";
+$Take = "causir";
+$One = "Un";
+$Several = "Mai d'un(a)";
+$Notice = "Avís";
+$Among = "entre";
+$Show = "Mostrar";
+$MyCourses = "Ma lista de cors";
+$ModifyProfile = "Modificar mon perfiu";
+$MyStats = "Veire meis estadisticas";
+$Logout = "Sortir";
+$MyAgenda = "Mon agenda";
+$CourseHomepage = "Acuelh";
+$CourseManagerview = "Vista dau professor";
+$StudentView = "Vista de l'estudiant";
 $AddedResources = "Apondons";
-$lang_modify_resource = "Modificar / ajustar de ressorsas";
-$lang_resource = "Ressorsa";
-$lang_resources = "Ressorsas";
 $Close = "Plegar";
-$langPlatform = "Plataforma";
+$Platform = "Plataforma";
 $localLangName = "lenga";
 $email = "corriel";
-$langCourseCodeAlreadyExists = "O planhem, mai aqueste còdi de cors ja existís. Causir un autre, per plaser.";
+$CourseCodeAlreadyExists = "O planhem, mai aqueste còdi de cors ja existís. Causir un autre, per plaser.";
 $Statistics = "Estadisticas";
-$langPrevious = "en rèire";
+$Previous = "en rèire";
 $In = "en";
-$langShowAll = "Tot mostrar";
-$langPage = "Pagina";
+$ShowAll = "Tot mostrar";
+$Page = "Pagina";
 $englishLangName = "Anglés";
 $SelectAll = "Tot causir";
 $UnSelectAll = "tot desmarcar";
 $WithSelected = "Ambe la causida";
-$langOnLine = "En linha";
-$langUsers = "Usanciers";
+$OnLine = "En linha";
+$Users = "Usanciers";
 $UserInfo = "Informacions de l'usancier";
-$langModifyQuestion = "Modificar la demanda";
-$langCheckAll = "Tot verificar";
-$langNbAnnoucement = "Anóncia";
-$lang_no_access_here = "Ges d'accès";
-$langOtherCourses = "Autrei cors";
+$ModifyQuestion = "Modificar la demanda";
+$CheckAll = "Tot verificar";
+$NbAnnoucement = "Anóncia";
+$OtherCourses = "Autrei cors";
 $Doc = "Document";
 $Groups = "Grops";
 $GroupManagement = "Administracion dau grop";
 $Today = "uei";
-$langCourseHomepageLink = "Pagina d'intrada dau cors";
+$CourseHomepageLink = "Pagina d'intrada dau cors";
 $Attachment = "Apondons";
 $User = "Usancier";
 $MondayInit = "Ln";
@@ -195,7 +188,7 @@ $Link = "Liames";
 $Announcement = "Anóncias";
 $Dropbox = "Escambi";
 $Quiz = "Espròvas";
-$langChat = "Barjacar";
+$Chat = "Barjacar";
 $Conference = "Conferéncia";
 $Student_publication = "Publicacions deis estudiants";
 $Tracking = "Seguit";
@@ -208,8 +201,8 @@ $StartDate = "Data de començament";
 $EndDate = "Data de fin";
 $StartTime = "Ora de començament";
 $EndTime = "Ora de fin";
-$langYouWereCalled = "Vos sònan per barjacar amb";
-$langDoYouAccept = "O consentas ?";
+$YouWereCalled = "Vos sònan per barjacar amb";
+$DoYouAccept = "O consentas ?";
 $Everybody = "Totei leis usanciers dau cors";
 $SentTo = "Visible per";
 $Export = "Exportar";

+ 96 - 106
main/lang/persian/trad4all.inc.php

@@ -15,55 +15,53 @@ $Title = "عنوان";
 $By = "توسط";
 $UsersOnline = "کاربران آنلاین";
 $Remove = "حذف";
-$langEnter = "بازگشت به فهرست دروس";
+$Enter = "بازگشت به فهرست دروس";
 $Description = "توضیحات";
 $Links = "پیوندها";
-$langWorks = "تکالیف";
+$Works = "تکالیف";
 $Forums = "انجمن ها";
-$langExercices = "آزمون ها";
-$langCreateDir = "ساخت پوشه جدید";
+$Exercices = "آزمون ها";
+$CreateDir = "ساخت پوشه جدید";
 $Name = "نام";
-$langComment = "دیدگاه";
-$langVisible = "آشکار کردن";
-$langNewDir = "نام پوشه جدید";
-$langDirCr = "پوشه جدید ساخته شد";
+$Comment = "دیدگاه";
+$Visible = "آشکار کردن";
+$NewDir = "نام پوشه جدید";
+$DirCr = "پوشه جدید ساخته شد";
 $Download = "دانلود";
-$langGroup = "گروه";
-$langEdit = "ویرایش";
-$langGroupForum = "انجمن گروه";
+$Group = "گروه";
+$Edit = "ویرایش";
+$GroupForum = "انجمن گروه";
 $Language = "زبان";
 $LoginName = "نام کاربری";
 $AutostartMp3 = "آیا می خواهید پرونده صوتی اتوماتیک شروع شود؟";
 $Assignments = "تکالیف";
 $Forum = "انجمن";
-$langDelImage = "حذف تصاویر";
-$langCode = "کد درس";
-$langUp = "بالا";
-$Down = "پایین";
+$DelImage = "حذف تصاویر";
+$Code = "کد درس";
 $Up = "بالا";
+$Down = "پایین";
 $Theme = "پوسته گرافیکی";
 $TheListIsEmpty = "خالی";
-$langUniqueSelect = "چند گزینه ای";
+$UniqueSelect = "چند گزینه ای";
 $CreateCategory = "ساخت دسته";
 $SendFile = "آپلود سند";
 $SaveChanges = "ذخیره تغییرات";
 $SearchTerm = "جستجوی ترم";
 $TooShort = "خیلی کوتاه";
-$langCourseCreate = "ساخت یک درس";
-$langTodo = "فعالیت های انجام نشده";
+$CourseCreate = "ساخت یک درس";
+$Todo = "فعالیت های انجام نشده";
 $UserName = "نام کاربری";
-$lang_show_hide = "نمایش دادن / پنهان کردن";
-$langCategoryMod = "ویرایش دسته بندی";
+$CategoryMod = "ویرایش دسته بندی";
 $Hide = "مخفی";
-$langDear = "گرامی";
-$langArchive = "آرشیو";
-$langCourseCode = "کد";
-$langNoDescription = "بدون توضیحات";
-$langOfficialCode = "کد";
+$Dear = "گرامی";
+$Archive = "آرشیو";
+$CourseCode = "کد";
+$NoDescription = "بدون توضیحات";
+$OfficialCode = "کد";
 $FirstName = "نام";
 $LastName = "نام خانوادگی";
 $Status = "وضعیت";
-$langEmail = "پست الکترونیک";
+$Email = "پست الکترونیک";
 $SlideshowConversion = "تبدیل اسلایدشو";
 $UploadFile = "آپلود پرونده";
 $AvailableFrom = "دسترسی از طریق";
@@ -73,7 +71,6 @@ $Type = "نوع";
 $EmailAddress = "پست الکترونیک";
 $Organisation = "شرکت";
 $Reporting = "گزارش گیری";
-$Code = "کد";
 $Update = "بروز رسانی";
 $SelectQuestionType = "انتخاب نوع سوال";
 $CurrentCourse = "درس جاری";
@@ -102,58 +99,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "بله";
-$langNo = "خیر";
+$Yes = "بله";
+$No = "خیر";
 $Next = "بعدی";
-$langAllowed = "اجازه داده شده";
-$langBackHome = "بازگشت به صفحۀ اصلی";
-$langPropositions = "پیشنهادات برای بهبود";
-$langMaj = "بروز رسانی";
-$langModify = "ویرایش";
-$langDelete = "حذف";
-$langInvisible = "پنهان کردن";
-$langSave = "ارسال پیام";
-$langMove = "جابجایی";
+$Allowed = "اجازه داده شده";
+$BackHome = "بازگشت به صفحۀ اصلی";
+$Propositions = "پیشنهادات برای بهبود";
+$Maj = "بروز رسانی";
+$Modify = "ویرایش";
+$Invisible = "پنهان کردن";
+$Save = "ارسال پیام";
+$Move = "جابجایی";
 $Help = "راهنمایی";
-$langOk = "تأیید";
-$langAdd = "اضافه کردن";
-$langAddIntro = "اضافه کردن متن مقدمه";
-$langBackList = "بازگشت به لیست";
-$langText = "متن";
-$langEmpty = "ظاهراً بعضی از خانه ها را پر نکرده اید. لطفاً با استفاده ازدکمۀ بازگشت بر روی مرورگر خود به عقب بازگشته و همۀ خانه ها را پر کنید";
-$langConfirmYourChoice = "لطفاً انتخاب خود را تأیید کنید";
-$langAnd = "و";
-$langChoice = "انتخاب شما";
-$langFinish = "پایان";
-$langCancel = "لغو کردن";
-$langNotAllowed = "شما مجاز به دیدن این صفحه نیستید.";
-$langNotLogged = "شما به هیچ درسی وارد نشده اید";
-$langManager = "مدير";
-$langOptional = "اختیاری";
+$Ok = "تأیید";
+$Add = "اضافه کردن";
+$AddIntro = "اضافه کردن متن مقدمه";
+$BackList = "بازگشت به لیست";
+$Text = "متن";
+$Empty = "ظاهراً بعضی از خانه ها را پر نکرده اید. لطفاً با استفاده ازدکمۀ بازگشت بر روی مرورگر خود به عقب بازگشته و همۀ خانه ها را پر کنید";
+$ConfirmYourChoice = "لطفاً انتخاب خود را تأیید کنید";
+$And = "و";
+$Choice = "انتخاب شما";
+$Finish = "پایان";
+$Cancel = "لغو کردن";
+$NotAllowed = "شما مجاز به دیدن این صفحه نیستید.";
+$NotLogged = "شما به هیچ درسی وارد نشده اید";
+$Manager = "مدير";
+$Optional = "اختیاری";
 $NextPage = "صفحۀ بعد";
 $PreviousPage = "صفحۀ قبل";
-$langUse = "استفاده";
-$langTotal = "کل";
-$langTake = "گذراندن آزمون";
-$langOne = "یک";
-$langSeveral = "چند";
-$langNotice = "توجه";
-$langDate = "تاریخ";
-$langAmong = "در میان";
-$langShow = "نشان دادن";
-$langMyCourses = "فهرست دروس من";
-$langModifyProfile = "مشخصات من";
-$langMyStats = "دیدن روند پیشرفت";
-$langLogout = "خروج";
-$langMyAgenda = "تقویم من";
-$langCourseHomepage = "صفحۀ اصلی درس";
-$langCourseManagerview = "نمای استاد";
-$langStudentView = "نمای دانشجو";
+$Use = "استفاده";
+$Total = "کل";
+$Take = "گذراندن آزمون";
+$One = "یک";
+$Several = "چند";
+$Notice = "توجه";
+$Date = "تاریخ";
+$Among = "در میان";
+$Show = "نشان دادن";
+$MyCourses = "فهرست دروس من";
+$ModifyProfile = "مشخصات من";
+$MyStats = "دیدن روند پیشرفت";
+$Logout = "خروج";
+$MyAgenda = "تقویم من";
+$CourseHomepage = "صفحۀ اصلی درس";
+$CourseManagerview = "نمای استاد";
+$StudentView = "نمای دانشجو";
 $AddResource = "این را بی افزایید";
 $AddedResources = "منابع مورد نظر افزوده شد";
-$lang_modify_resource = "ویرایش/افزودن منابع";
-$lang_resource = "منبع";
-$lang_resources = "منابع";
 $langNameOfLang['arabic'] = "&#1593;&#1585;&#1576;&#1740;";
 $langNameOfLang['brazilian'] = "&#1576;&#1585;&#1586;&#1740;&#1604;&#1740;";
 $langNameOfLang['bulgarian'] = "&#1576;&#1604;&#1594;&#1575;&#1585;&#1740;";
@@ -177,27 +170,27 @@ $langNameOfLang['russian'] = "&#1585;&#1608;&#1587;&#1740;";
 $langNameOfLang['simpl_chinese'] = "&#1670;&#1740;&#1606;&#1740; &#1587;&#1575;&#1583;&#1607;";
 $langNameOfLang['spanish'] = "&#1575;&#1587;&#1662;&#1575;&#1606;&#1740;&#1575;&#1740;&#1740;";
 $Close = "بستن";
-$langPlatform = "پرتال";
+$Platform = "پرتال";
 $localLangName = "فرانسوی";
 $email = "پست الکترونیک";
-$langCourseCodeAlreadyExists = "کددرس  مورد نظر شما قبلاً توسط فرد دیگری استفاده شده است. لطفاً کد دیگری انتخاب کنید";
+$CourseCodeAlreadyExists = "کددرس  مورد نظر شما قبلاً توسط فرد دیگری استفاده شده است. لطفاً کد دیگری انتخاب کنید";
 $Statistics = "آمار";
-$langGrouplist = "لیست گروه ها";
-$langPrevious = "قبلی";
+$Grouplist = "لیست گروه ها";
+$Previous = "قبلی";
 $DestDirectoryDoesntExist = "پوشه مقصد وجود ندارد";
 $Courses = "دروس";
 $In = "در";
-$langShowAll = "نمایش همه";
-$langPage = "صفحه";
+$ShowAll = "نمایش همه";
+$Page = "صفحه";
 $englishLangName = "انگلیسی";
 $Home = "صفحه اصلی";
-$langAreYouSureToDelete = "آیا واقعاً میخواهید حذف کنید؟";
+$AreYouSureToDelete = "آیا واقعاً میخواهید حذف کنید؟";
 $SelectAll = "انتخاب همه موارد";
 $UnSelectAll = "لغو انتخاب ها";
 $WithSelected = "با انتخاب شده ها";
-$langOnLine = "آنلاین";
-$langUsers = "کاربران";
-$langPlatformAdmin = "مدیریت";
+$OnLine = "آنلاین";
+$Users = "کاربران";
+$PlatformAdmin = "مدیریت";
 $langNameOfLang['hungarian'] = "&#1605;&#1580;&#1575;&#1585;&#1587;&#1578;&#1575;&#1606;&#1740;";
 $langNameOfLang['indonesian'] = "&#1575;&#1606;&#1583;&#1608;&#1606;&#1586;&#1740;&#1575;&#1740;&#1740;";
 $langNameOfLang['malay'] = "&#1605;&#1575;&#1604;&#1586;&#1740;&#1575;&#1740;&#1740;";
@@ -208,22 +201,21 @@ $langNameOfLang['thai'] = "&#1578;&#1575;&#1740;&#1604;&#1606;&#1583;&#1740;";
 $langNameOfLang['turkce'] = "&#1578;&#1585;&#1705;&#1740;";
 $langNameOfLang['vietnamese'] = "&#1608;&#1740;&#1578;&#1606;&#1575;&#1605;&#1740;";
 $UserInfo = "اطلاعات کاربر";
-$langModifyQuestion = "ذخیره کردن سوال";
+$ModifyQuestion = "ذخیره کردن سوال";
 $Example = "نمونه";
-$langCheckAll = "انتخاب همه";
-$langNbAnnoucement = "اطلاعیه ها";
-$lang_no_access_here = "دسترسی غیر ممکن است";
-$langOtherCourses = "دیگر دروس";
+$CheckAll = "انتخاب همه";
+$NbAnnoucement = "اطلاعیه ها";
+$OtherCourses = "دیگر دروس";
 $Doc = "آموزش";
 $PlataformAdmin = "پرتال مدیر";
 $Groups = "گروه ها";
 $GroupManagement = "مدیریت گروه ها";
 $All = "همه";
 $None = "هیچ";
-$langSorry = "ابتدا یک درس انتخاب کنید";
-$langDenied = "این امکان فقط برای اساتید فعال هست";
+$Sorry = "ابتدا یک درس انتخاب کنید";
+$Denied = "این امکان فقط برای اساتید فعال هست";
 $Today = "&#1575;&#1605;&#1585;&#1608;&#1586;";
-$langCourseHomepageLink = "صفحه اصلی درس";
+$CourseHomepageLink = "صفحه اصلی درس";
 $Attachment = "پیوست";
 $User = "کاربر";
 $MondayInit = "د";
@@ -283,10 +275,10 @@ $SeptemberLong = "سپتامبر";
 $OctoberLong = "اکتبر";
 $NovemberLong = "نوامبر";
 $DecemberLong = "دسامبر";
-$langMyCompetences = "توانایی های من";
-$langMyDiplomas = "دیپلم های من";
-$langMyPersonalOpenArea = "فضای شخصی من";
-$langMyTeach = "من قادر به تدریس هستم";
+$MyCompetences = "توانایی های من";
+$MyDiplomas = "دیپلم های من";
+$MyPersonalOpenArea = "فضای شخصی من";
+$MyTeach = "من قادر به تدریس هستم";
 $Agenda = "تقویم";
 $HourShort = ":";
 $PleaseTryAgain = "لطفاً این عمل را دوباره انجام دهید";
@@ -296,7 +288,7 @@ $UplNotAZip = "فایلی را که انتخاب کرده اید، یک فایل
 $UplUploadSucceeded = "فایل با موفقیت آپلود گردید";
 $ExportAsCSV = "CSV برون ریزی";
 $ExportAsXLS = "بروز رسانی اکسل";
-$langOpenarea = "محیط شخصی";
+$Openarea = "محیط شخصی";
 $Done = "انجام شد";
 $Documents = "مستندات";
 $DocumentAdded = "فایل مورد نظر اضافه گردید";
@@ -310,7 +302,7 @@ $Link = "پیوند ها";
 $Announcement = "اطلاعیه ها";
 $Dropbox = "تبادل مدارک";
 $Quiz = "آزمون ها";
-$langChat = "گفتگو";
+$Chat = "گفتگو";
 $Conference = "کنفرانس";
 $Student_publication = "تکالیف";
 $Tracking = "گزارش گیری";
@@ -323,8 +315,8 @@ $StartDate = "تاریخ شروع";
 $EndDate = "تاریخ پایان";
 $StartTime = "ساعت شروع";
 $EndTime = "ساعت پایان";
-$langYouWereCalled = "شما از سوی فرد مقابل برای گفتگو دعوت شده اید";
-$langDoYouAccept = "آیا این درخواست را می پذیرید؟";
+$YouWereCalled = "شما از سوی فرد مقابل برای گفتگو دعوت شده اید";
+$DoYouAccept = "آیا این درخواست را می پذیرید؟";
 $Everybody = "همه";
 $SentTo = "قابل نمایش به";
 $Export = "برون ریزی";
@@ -348,7 +340,7 @@ $FormHasErrorsPleaseComplete = "ظاهرا مورد یا موارد نادرست
 $StartDateShouldBeBeforeEndDate = "اولین داده باید قبل از آخرین داده قرار گیرد";
 $InvalidDate = "تاریخ غیر معتبر";
 $OnlyLettersAndNumbersAllowed = "تنها حروف و اعداد پذیرفته می شوند";
-$langBasicOverview = "سازماندهی";
+$BasicOverview = "سازماندهی";
 $CourseAdminRole = "مدیر درس";
 $UserRole = "نقش";
 $OnlyImagesAllowed = "فقط تصویرهایی با نوع PNG,JPG یا GIFاجازه بارگذاری دارند";
@@ -358,16 +350,14 @@ $DeleteRight = "حذف کردن";
 $OverviewCourseRights = "مروری بر حقوق و قانونها";
 $SeeAllRightsAllLocationsForSpecificRole = "تمرکز بر قانون";
 $SeeAllRolesAllLocationsForSpecificRight = "مشاهده تمامي نقش ها و قسمت ها در جستجوي اختياري خاص";
-$langAdvanced = "نوشتن";
+$Advanced = "نوشتن";
 $RightValueModified = "ارزش مورد نظر تغییر یافت";
 $course_rights = "مروری بر حقوق و قانونها";
 $Visio_conference = "جلسه مجازی";
 $CourseAdminRoleDescription = "استاد";
-$Move = "جابجایی";
 $MoveTo = "انتقال به";
 $Delete = "حذف کردن";
 $MoveFileTo = "انتقال فایل به";
-$Save = "ذخیره کردن";
 $Error = "خطا";
 $Anonymous = "بی نام";
 $h = "h";
@@ -383,9 +373,9 @@ $YouHaveNewMessage = "شما یک پیام جدید دارید!";
 $myActiveSessions = "جلسات فعال من";
 $myInactiveSessions = "جلسات غیر فعال من";
 $FileUpload = "آپلود فایل";
-$langMyActiveSessions = "جلسات فعال من";
-$langMyInActiveSessions = "جلسات غیر فعال من";
-$langMySpace = "گزارش دهی";
+$MyActiveSessions = "جلسات فعال من";
+$MyInActiveSessions = "جلسات غیر فعال من";
+$MySpace = "گزارش دهی";
 $ExtensionActivedButNotYetOperational = "این ماژول فعال شده است ولی در حال حاضر قادر به اجرا نمی باشد.";
 $MyStudents = "دانشجویان من";
 $Progress = "روند پیشرفت";

+ 97 - 107
main/lang/polish/trad4all.inc.php

@@ -32,55 +32,53 @@ $Title = "Tytuł";
 $By = "przez";
 $UsersOnline = "Użytkownicy online";
 $Remove = "Usuń";
-$langEnter = "Powrót do listy kursów";
+$Enter = "Powrót do listy kursów";
 $Description = "Opis";
 $Links = "Linki";
-$langWorks = "Prace studentów";
+$Works = "Prace studentów";
 $Forums = "Forum";
-$langExercices = "Testy";
-$langCreateDir = "Utwórz katalog";
+$Exercices = "Testy";
+$CreateDir = "Utwórz katalog";
 $Name = "Nazwa";
-$langComment = "Komentarz";
-$langVisible = "Pokaż/ukryj";
-$langNewDir = "Nazwa nowego katalogu";
-$langDirCr = "Katalog utworzony";
+$Comment = "Komentarz";
+$Visible = "Pokaż/ukryj";
+$NewDir = "Nazwa nowego katalogu";
+$DirCr = "Katalog utworzony";
 $Download = "Pobierz";
-$langGroup = "Grupa";
-$langEdit = "Edytuj";
-$langGroupForum = "Forum dyskusyjne";
+$Group = "Grupa";
+$Edit = "Edytuj";
+$GroupForum = "Forum dyskusyjne";
 $Language = "Język";
 $LoginName = "Login";
 $AutostartMp3 = "Chcesz by  plik audio uruchamiał się automatycznie?";
 $Assignments = "Zadania";
 $Forum = "Fora";
-$langDelImage = "Usuń obrazek";
-$langCode = "Kod kursu";
-$langUp = "W górę";
+$DelImage = "Usuń obrazek";
+$Code = "Kod kursu";
+$Up = "W górę";
 $Down = "Na dół";
-$Up = "Do góry";
 $Theme = "Temat";
 $TheListIsEmpty = "Ta lista jest pusta";
-$langUniqueSelect = "Wielokrotny wybór";
+$UniqueSelect = "Wielokrotny wybór";
 $CreateCategory = "Utwórz kategorię";
 $SendFile = "Prześlij dokument";
 $SaveChanges = "Zapisz zmiany";
 $SearchTerm = "Szukaj wyrażenia";
 $TooShort = "Za krótkie";
-$langCourseCreate = "Utwórz nowy kurs";
-$langTodo = "Do zrobienia";
+$CourseCreate = "Utwórz nowy kurs";
+$Todo = "Do zrobienia";
 $UserName = "Nazwa użytkownika";
-$lang_show_hide = "Pokaż / Ukryj";
-$langCategoryMod = "Edytuj kategorię";
+$CategoryMod = "Edytuj kategorię";
 $Hide = "Ukryj";
-$langDear = "Szanowna/y";
-$langArchive = "archiwum";
-$langCourseCode = "Kod kursu";
-$langNoDescription = "Brak opisu";
-$langOfficialCode = "Oficjalny Kod";
+$Dear = "Szanowna/y";
+$Archive = "archiwum";
+$CourseCode = "Kod kursu";
+$NoDescription = "Brak opisu";
+$OfficialCode = "Oficjalny Kod";
 $FirstName = "Imię";
 $LastName = "Nazwisko";
 $Status = "Status";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $SlideshowConversion = "Konwersja prezentacji";
 $UploadFile = "Załaduj plik";
 $AvailableFrom = "Dostępny(a) od";
@@ -90,7 +88,6 @@ $Type = "Typ";
 $EmailAddress = "Adres e-mail";
 $Organisation = "Organizacja";
 $Reporting = "Raporty";
-$Code = "Kod";
 $Update = "Aktualizuj";
 $SelectQuestionType = "Wybierz typ pytania";
 $CurrentCourse = "Aktualny kurs";
@@ -120,58 +117,54 @@ $dateFormatShort = "%b %d, %Y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "Tak";
-$langNo = "Nie";
+$Yes = "Tak";
+$No = "Nie";
 $Next = "Dalej";
-$langAllowed = "Dozwolone";
-$langBackHome = "Powrót do strony głównej";
-$langPropositions = "Sugestie poprawek";
-$langMaj = "Aktualizacja";
-$langModify = "Edytuj";
-$langDelete = "usuń";
-$langInvisible = "Niewidoczny";
-$langSave = "Wyślij wiadomość";
-$langMove = "Przenieś";
+$Allowed = "Dozwolone";
+$BackHome = "Powrót do strony głównej";
+$Propositions = "Sugestie poprawek";
+$Maj = "Aktualizacja";
+$Modify = "Edytuj";
+$Invisible = "Niewidoczny";
+$Save = "Wyślij wiadomość";
+$Move = "Przenieś";
 $Help = "Pomoc";
-$langOk = "OK";
-$langAdd = "Dodaj";
-$langAddIntro = "Dodaj tekst";
-$langBackList = "Powrót do listy";
-$langText = "Tekst";
-$langEmpty = "Zostawiłeś niewypełnione pola.<br>Użyj przycisku Wstecz i spróbuj jeszcze raz.<br>Jeśli zignorujesz Kod kursu spójrz do Programu kursu";
-$langConfirmYourChoice = "Potwierdź swój wybór";
-$langAnd = "i";
-$langChoice = "Twój wybór";
-$langFinish = "Zakończ";
-$langCancel = "Anuluj";
-$langNotAllowed = "Nie masz uprawnień, aby zobaczyć tę stronę. Albo połączenie wygasło lub próbujesz uzyskać dostęp do strony, do której nie masz wystarczających uprawnień.";
-$langNotLogged = "Nie jesteś zalogowany(a) do kursu";
-$langManager = "Administrator";
-$langOptional = "Opcja";
+$Ok = "OK";
+$Add = "Dodaj";
+$AddIntro = "Dodaj tekst";
+$BackList = "Powrót do listy";
+$Text = "Tekst";
+$Empty = "Zostawiłeś niewypełnione pola.<br>Użyj przycisku Wstecz i spróbuj jeszcze raz.<br>Jeśli zignorujesz Kod kursu spójrz do Programu kursu";
+$ConfirmYourChoice = "Potwierdź swój wybór";
+$And = "i";
+$Choice = "Twój wybór";
+$Finish = "Zakończ";
+$Cancel = "Anuluj";
+$NotAllowed = "Nie masz uprawnień, aby zobaczyć tę stronę. Albo połączenie wygasło lub próbujesz uzyskać dostęp do strony, do której nie masz wystarczających uprawnień.";
+$NotLogged = "Nie jesteś zalogowany(a) do kursu";
+$Manager = "Administrator";
+$Optional = "Opcja";
 $NextPage = "Następna strona";
 $PreviousPage = "Poprzednia strona";
-$langUse = "Użyj";
-$langTotal = "całkowita";
-$langTake = "brać (przystepować)";
-$langOne = "Jeden";
-$langSeveral = "Kilka";
-$langNotice = "Uwaga";
-$langDate = "Data";
-$langAmong = "spośród";
-$langShow = "Pokaż";
-$langMyCourses = "Lista moich kursów";
-$langModifyProfile = "Modyfikuj mój profil";
-$langMyStats = "Pokaż moje statystyki";
-$langLogout = "Wyloguj";
-$langMyAgenda = "Mój kalendarz";
-$langCourseHomepage = "Strona główna kursu";
-$langCourseManagerview = "Widok administratora";
-$langStudentView = "Widok studenta";
+$Use = "Użyj";
+$Total = "całkowita";
+$Take = "brać (przystepować)";
+$One = "Jeden";
+$Several = "Kilka";
+$Notice = "Uwaga";
+$Date = "Data";
+$Among = "spośród";
+$Show = "Pokaż";
+$MyCourses = "Lista moich kursów";
+$ModifyProfile = "Modyfikuj mój profil";
+$MyStats = "Pokaż moje statystyki";
+$Logout = "Wyloguj";
+$MyAgenda = "Mój kalendarz";
+$CourseHomepage = "Strona główna kursu";
+$CourseManagerview = "Widok administratora";
+$StudentView = "Widok studenta";
 $AddResource = "Dodaj to";
 $AddedResources = "Załączniki";
-$lang_modify_resource = "Modyfikuj / Dodaj zasoby";
-$lang_resource = "Zasób";
-$lang_resources = "Zasoby";
 $langNameOfLang['arabic'] = "arabski";
 $langNameOfLang['brazilian'] = "brazylijski";
 $langNameOfLang['bulgarian'] = "bu&#322;garski";
@@ -195,27 +188,27 @@ $langNameOfLang['russian'] = "rosyjski";
 $langNameOfLang['simpl_chinese'] = "chi&#324;ski uproszczony";
 $langNameOfLang['spanish'] = "hiszpa&#324;ski";
 $Close = "zamknij";
-$langPlatform = "Platforma";
+$Platform = "Platforma";
 $localLangName = "język";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Kod kursu już istnieje. Wybierz inny.";
+$CourseCodeAlreadyExists = "Kod kursu już istnieje. Wybierz inny.";
 $Statistics = "Statystyki";
-$langGrouplist = "Lista grup";
-$langPrevious = "Poprzedni";
+$Grouplist = "Lista grup";
+$Previous = "Poprzedni";
 $DestDirectoryDoesntExist = "Docelowy folder nie istnieje";
 $Courses = "Kursy";
 $In = "w";
-$langShowAll = "Pokaż wszystkie";
-$langPage = "Strona";
+$ShowAll = "Pokaż wszystkie";
+$Page = "Strona";
 $englishLangName = "angielski";
 $Home = "Strona główna";
-$langAreYouSureToDelete = "Usunąć? Jesteś pewien?";
+$AreYouSureToDelete = "Usunąć? Jesteś pewien?";
 $SelectAll = "Zaznacz wszystko";
 $UnSelectAll = "Odznacz wszystko";
 $WithSelected = "Z zaznaczonymi";
-$langOnLine = "Online";
-$langUsers = "Użytkownicy";
-$langPlatformAdmin = "Administrator platformy";
+$OnLine = "Online";
+$Users = "Użytkownicy";
+$PlatformAdmin = "Administrator platformy";
 $langNameOfLang['hungarian'] = "w&#281;gierski";
 $langNameOfLang['indonesian'] = "indonezyjski";
 $langNameOfLang['malay'] = "malajski";
@@ -226,22 +219,21 @@ $langNameOfLang['thai'] = "tajski";
 $langNameOfLang['turkce'] = "turecki";
 $langNameOfLang['vietnamese'] = "wietnamski";
 $UserInfo = "dane użytkownika";
-$langModifyQuestion = "Zapisz pytanie";
+$ModifyQuestion = "Zapisz pytanie";
 $Example = "Przykład";
-$langCheckAll = "Zaznacz wszystkie";
-$langNbAnnoucement = "Ogłoszenie";
-$lang_no_access_here = "Nie ma dostępu";
-$langOtherCourses = "inne kursy";
+$CheckAll = "Zaznacz wszystkie";
+$NbAnnoucement = "Ogłoszenie";
+$OtherCourses = "inne kursy";
 $Doc = "Kurs";
 $PlataformAdmin = "Platforma administratora";
 $Groups = "Grupy";
 $GroupManagement = "Zarządzanie grupami";
 $All = "Wszystkie";
 $None = "Żadne";
-$langSorry = "Najpierw wybierz kurs";
-$langDenied = "Ta funkcja jest dost&#281;pna jedynie dla administratorów kursu";
+$Sorry = "Najpierw wybierz kurs";
+$Denied = "Ta funkcja jest dost&#281;pna jedynie dla administratorów kursu";
 $Today = "Dziś";
-$langCourseHomepageLink = "Bieżący kurs";
+$CourseHomepageLink = "Bieżący kurs";
 $Attachment = "załącznik";
 $User = "Użytkownik";
 $MondayInit = "Pn";
@@ -301,10 +293,10 @@ $SeptemberLong = "Wrzesień";
 $OctoberLong = "Październik";
 $NovemberLong = "Listopad";
 $DecemberLong = "Grudzień";
-$langMyCompetences = "Moje kompetencje";
-$langMyDiplomas = "Moje dyplomy";
-$langMyPersonalOpenArea = "Moje otwarte pole osobiste";
-$langMyTeach = "Czego jestem w stanie uczyć";
+$MyCompetences = "Moje kompetencje";
+$MyDiplomas = "Moje dyplomy";
+$MyPersonalOpenArea = "Moje otwarte pole osobiste";
+$MyTeach = "Czego jestem w stanie uczyć";
 $Agenda = "Terminarz";
 $HourShort = "godz";
 $PleaseTryAgain = "Proszę spróbować ponownie!";
@@ -314,7 +306,7 @@ $UplNotAZip = "Wybrany plik nie jest archiwum .zip";
 $UplUploadSucceeded = "Załadowanie pliku powiodło się!";
 $ExportAsCSV = "Eksportuj jako plik CSV";
 $ExportAsXLS = "Eksportuj jako plik XLS";
-$langOpenarea = "Otwarte pole osobiste";
+$Openarea = "Otwarte pole osobiste";
 $Done = "Wykonano";
 $Documents = "Dokumenty";
 $DocumentAdded = "Dokument dodano";
@@ -328,7 +320,7 @@ $Link = "Link";
 $Announcement = "Ogłoszenia";
 $Dropbox = "Skrzynka nadawcza";
 $Quiz = "Ćwiczenia";
-$langChat = "Czat";
+$Chat = "Czat";
 $Conference = "Konferencja";
 $Student_publication = "Prace studentów";
 $Tracking = "Śledzenie";
@@ -341,8 +333,8 @@ $StartDate = "Data początkowa";
 $EndDate = "Data końcowa";
 $StartTime = "Czas rozpoczęcia";
 $EndTime = "Czas zakończenia";
-$langYouWereCalled = "Zaproszono Cię do czatowania z";
-$langDoYouAccept = "Akceptujesz?";
+$YouWereCalled = "Zaproszono Cię do czatowania z";
+$DoYouAccept = "Akceptujesz?";
 $Everybody = "Wszyscy";
 $SentTo = "Widoczne dla";
 $Export = "Eksport";
@@ -366,7 +358,7 @@ $FormHasErrorsPleaseComplete = "Formularz zawiera niekompletne lub nieprawidłow
 $StartDateShouldBeBeforeEndDate = "Pierwsza data powinna być wcześniejsza niż końcowa";
 $InvalidDate = "Zła data";
 $OnlyLettersAndNumbersAllowed = "Dozwolone są tylko litery i liczby";
-$langBasicOverview = "Organizuj";
+$BasicOverview = "Organizuj";
 $CourseAdminRole = "Administrator kursu";
 $UserRole = "Rola";
 $OnlyImagesAllowed = "Tylko obrazy w formatach PNG, JPG lub GIF są dozwolone";
@@ -376,16 +368,14 @@ $DeleteRight = "Usuń";
 $OverviewCourseRights = "Przegląd ról i praw dostępu";
 $SeeAllRightsAllLocationsForSpecificRole = "Skup się na roli";
 $SeeAllRolesAllLocationsForSpecificRight = "Skup się na uprawnieniach";
-$langAdvanced = "Buduj";
+$Advanced = "Buduj";
 $RightValueModified = "Wartość została zmodyfikowana.";
 $course_rights = "Przegląd ról i uprawnień";
 $Visio_conference = "Wirtualne spotkanie";
 $CourseAdminRoleDescription = "Administrator kursu";
-$Move = "Przenieś";
 $MoveTo = "Przenieś do";
 $Delete = "Usuń";
 $MoveFileTo = "Przenieś plik do";
-$Save = "Zapisz";
 $Error = "Błąd";
 $Anonymous = "Anonim";
 $h = "h";
@@ -401,9 +391,9 @@ $YouHaveNewMessage = "Masz nową wiadomość !";
 $myActiveSessions = "Moje aktywne sesje";
 $myInactiveSessions = "Moje nieaktywne sesje";
 $FileUpload = "Załaduj plik";
-$langMyActiveSessions = "Moje aktywne Sesje";
-$langMyInActiveSessions = "Moje nieaktywne sesje";
-$langMySpace = "Raporty";
+$MyActiveSessions = "Moje aktywne Sesje";
+$MyInActiveSessions = "Moje nieaktywne sesje";
+$MySpace = "Raporty";
 $ExtensionActivedButNotYetOperational = "Rozszerzenie zostało uaktywnione ale nie może być użyte w tym momencie.";
 $MyStudents = "Moi studenci";
 $Progress = "Postęp";
@@ -822,7 +812,7 @@ $InvitationDenied = "Zaproszenie odrzucone";
 $UserAdded = "Użytkownik został dodany";
 $UpdatedIn = "Zaktualizowany";
 $Metadata = "Metadane";
-$langAddMetadata = "Zobacz/Edytuj metadane";
+$AddMetadata = "Zobacz/Edytuj metadane";
 $SendMessage = "Wyślij wiadomość";
 $SeeForum = "Zobacz forum";
 $SeeMore = "Zobacz więcej";

+ 96 - 106
main/lang/portuguese/trad4all.inc.php

@@ -111,55 +111,53 @@ $Title = "Título";
 $By = "Por";
 $UsersOnline = "Utilizadores online";
 $Remove = "Remover";
-$langEnter = "Voltar para a lista de cursos";
+$Enter = "Voltar para a lista de cursos";
 $Description = "Descrição";
 $Links = "Ligações/links";
-$langWorks = "Tarefas/Trabalhos";
+$Works = "Tarefas/Trabalhos";
 $Forums = "Fóruns";
-$langExercices = "Exercícios";
-$langCreateDir = "Criar uma pasta/directório";
+$Exercices = "Exercícios";
+$CreateDir = "Criar uma pasta/directório";
 $Name = "Nome";
-$langComment = "Comentário";
-$langVisible = "Visível";
-$langNewDir = "Nome da nova pasta/directório";
-$langDirCr = "Pasta/directório criado";
+$Comment = "Comentário";
+$Visible = "Visível";
+$NewDir = "Nome da nova pasta/directório";
+$DirCr = "Pasta/directório criado";
 $Download = "Descarregar";
-$langGroup = "Grupos";
-$langEdit = "Editar";
-$langGroupForum = "Fórum do Grupo";
+$Group = "Grupos";
+$Edit = "Editar";
+$GroupForum = "Fórum do Grupo";
 $Language = "Idioma";
 $LoginName = "Login/acesso";
 $AutostartMp3 = "Deseja o ficheiro de audio a INICIAR automaticamente?";
 $Assignments = "Tarefas/Trabalhos";
 $Forum = "Fóruns";
-$langDelImage = "Remover imagem";
-$langCode = "Código do curso";
-$langUp = "Acima";
+$DelImage = "Remover imagem";
+$Code = "Código do curso";
+$Up = "Acima";
 $Down = "abaixo";
-$Up = "acima";
 $Theme = "Tema gráfico";
 $TheListIsEmpty = "Vazio";
-$langUniqueSelect = "Escolha múltipla";
+$UniqueSelect = "Escolha múltipla";
 $CreateCategory = "Criar pasta/directório";
 $SendFile = "Enviar ficheiro";
 $SaveChanges = "Guardar alterações";
 $SearchTerm = "Pesquisar termo";
 $TooShort = "Demasiado curto";
-$langCourseCreate = "Criar um Curso";
-$langTodo = "A realizar";
+$CourseCreate = "Criar um Curso";
+$Todo = "A realizar";
 $UserName = "Login/acesso";
-$lang_show_hide = "Mostrar / ocultar";
-$langCategoryMod = "Editar Categoria";
+$CategoryMod = "Editar Categoria";
 $Hide = "Ocultar";
-$langDear = "Caro(a)";
-$langArchive = "Arquivo";
-$langCourseCode = "Código";
-$langNoDescription = "Nenhuma descrição";
-$langOfficialCode = "Código Oficial";
+$Dear = "Caro(a)";
+$Archive = "Arquivo";
+$CourseCode = "Código";
+$NoDescription = "Nenhuma descrição";
+$OfficialCode = "Código Oficial";
 $FirstName = "Primeiro Nome";
 $LastName = "Último Nome";
 $Status = "Perfil";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $SlideshowConversion = "Conversão da apresentação de diapositivos";
 $UploadFile = "Envio do ficheiro";
 $AvailableFrom = "Disponível desde";
@@ -169,7 +167,6 @@ $Type = "Tipo";
 $EmailAddress = "Endereço de e-mail";
 $Organisation = "Organização";
 $Reporting = "Relatório";
-$Code = "Código";
 $Update = "Actualizar";
 $SelectQuestionType = "Seleccione o tipo de pergunta";
 $CurrentCourse = "Curso actual";
@@ -199,58 +196,54 @@ $dateFormatShort = "%d %b, %y";
 $dateFormatLong = "%A, %d de %B de %Y";
 $dateTimeFormatLong = "%d de %B de %Y às %H:%M";
 $timeNoSecFormat = "%H:%M %R";
-$langYes = "Sim";
-$langNo = "Não";
+$Yes = "Sim";
+$No = "Não";
 $Next = "Seguinte";
-$langAllowed = "Autorizado";
-$langBackHome = "Voltar para a página inicial do";
-$langPropositions = "Propostas de sugestão de melhoria de";
-$langMaj = "Actualizar";
-$langModify = "Editar";
-$langDelete = "eliminar";
-$langInvisible = "invisível";
-$langSave = "Enviar mensagem";
-$langMove = "Mover";
+$Allowed = "Autorizado";
+$BackHome = "Voltar para a página inicial do";
+$Propositions = "Propostas de sugestão de melhoria de";
+$Maj = "Actualizar";
+$Modify = "Editar";
+$Invisible = "invisível";
+$Save = "Enviar mensagem";
+$Move = "Mover";
 $Help = "Ajuda";
-$langOk = "Validar";
-$langAdd = "Adicionar";
-$langAddIntro = "Adicionar texto introdutório";
-$langBackList = "Regressar à lista";
-$langText = "Texto";
-$langEmpty = "Esqueceu-se de preencher alguns campos.<br>Utilize o botão <b>Voltar</b> do seu browser/navegador e tente novamente.Se ignorar o seu código de curso, consulte o Programa do Curso";
-$langConfirmYourChoice = "Por favor confirme a sua escolha";
-$langAnd = "e";
-$langChoice = "A sua escolha";
-$langFinish = "Fechar exercício";
-$langCancel = "Cancelar";
-$langNotAllowed = "Não autorizado";
-$langNotLogged = "Não se encontra autenticado";
-$langManager = "Gestor";
-$langOptional = "Opcional";
+$Ok = "Validar";
+$Add = "Adicionar";
+$AddIntro = "Adicionar texto introdutório";
+$BackList = "Regressar à lista";
+$Text = "Texto";
+$Empty = "Esqueceu-se de preencher alguns campos.<br>Utilize o botão <b>Voltar</b> do seu browser/navegador e tente novamente.Se ignorar o seu código de curso, consulte o Programa do Curso";
+$ConfirmYourChoice = "Por favor confirme a sua escolha";
+$And = "e";
+$Choice = "A sua escolha";
+$Finish = "Fechar exercício";
+$Cancel = "Cancelar";
+$NotAllowed = "Não autorizado";
+$NotLogged = "Não se encontra autenticado";
+$Manager = "Gestor";
+$Optional = "Opcional";
 $NextPage = "Página seguinte";
 $PreviousPage = "Página anterior";
-$langUse = "Utilizar";
-$langTotal = "Total";
-$langTake = "Escolher";
-$langOne = "Um";
-$langSeveral = "Vários";
-$langNotice = "Anúncio";
-$langDate = "Data";
-$langAmong = "entre";
-$langShow = "Mostrar";
-$langMyCourses = "Cursos";
-$langModifyProfile = "Perfil";
-$langMyStats = "Visualizar o meu progresso";
-$langLogout = "Sair";
-$langMyAgenda = "Agenda pessoal";
-$langCourseHomepage = "Página principal do curso";
-$langCourseManagerview = "Modo de visualização do Instrutor";
-$langStudentView = "Modo de visualização do Aluno";
+$Use = "Utilizar";
+$Total = "Total";
+$Take = "Escolher";
+$One = "Um";
+$Several = "Vários";
+$Notice = "Anúncio";
+$Date = "Data";
+$Among = "entre";
+$Show = "Mostrar";
+$MyCourses = "Cursos";
+$ModifyProfile = "Perfil";
+$MyStats = "Visualizar o meu progresso";
+$Logout = "Sair";
+$MyAgenda = "Agenda pessoal";
+$CourseHomepage = "Página principal do curso";
+$CourseManagerview = "Modo de visualização do Instrutor";
+$StudentView = "Modo de visualização do Aluno";
 $AddResource = "Adicioná-lo";
 $AddedResources = "Anexos";
-$lang_modify_resource = "Editar / Adicionar recursos";
-$lang_resource = "Recurso";
-$lang_resources = "Recursos";
 $langNameOfLang['arabic'] = "árabe";
 $langNameOfLang['brazilian'] = "brasileiro";
 $langNameOfLang['bulgarian'] = "búlgaro";
@@ -274,27 +267,27 @@ $langNameOfLang['russian'] = "russo";
 $langNameOfLang['simpl_chinese'] = "chinês_simples";
 $langNameOfLang['spanish'] = "espanhol";
 $Close = "fechar";
-$langPlatform = "Portal";
+$Platform = "Portal";
 $localLangName = "idioma";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Lamentamos, mas esse código de curso já existe. Por favor, escolha outro.";
+$CourseCodeAlreadyExists = "Lamentamos, mas esse código de curso já existe. Por favor, escolha outro.";
 $Statistics = "Estatísticas";
-$langGrouplist = "Lista dos grupos";
-$langPrevious = "anterior";
+$Grouplist = "Lista dos grupos";
+$Previous = "anterior";
 $DestDirectoryDoesntExist = "A pasta/directório de destino não existe";
 $Courses = "Cursos";
 $In = "em";
-$langShowAll = "Mostrar tudo";
-$langPage = "Página";
+$ShowAll = "Mostrar tudo";
+$Page = "Página";
 $englishLangName = "Inglês";
 $Home = "Ínicio";
-$langAreYouSureToDelete = "Tem a certeza que deseja eliminar";
+$AreYouSureToDelete = "Tem a certeza que deseja eliminar";
 $SelectAll = "Seleccionar todas";
 $UnSelectAll = "Desceleccionar todos";
 $WithSelected = "Com o seleccionado";
-$langOnLine = "Online";
-$langUsers = "Utilizadores";
-$langPlatformAdmin = "Administração";
+$OnLine = "Online";
+$Users = "Utilizadores";
+$PlatformAdmin = "Administração";
 $langNameOfLang['hungarian'] = "húngaro";
 $langNameOfLang['indonesian'] = "indonésio";
 $langNameOfLang['malay'] = "malaio";
@@ -305,21 +298,20 @@ $langNameOfLang['thai'] = "tailandês";
 $langNameOfLang['turkce'] = "turco";
 $langNameOfLang['vietnamese'] = "vietnamita";
 $UserInfo = "informação do utilizador";
-$langModifyQuestion = "Guardar a pergunta";
-$langCheckAll = "Verificar todos";
-$langNbAnnoucement = "Anúncio";
-$lang_no_access_here = "Sem acesso aqui";
-$langOtherCourses = "outros cursos";
+$ModifyQuestion = "Guardar a pergunta";
+$CheckAll = "Verificar todos";
+$NbAnnoucement = "Anúncio";
+$OtherCourses = "outros cursos";
 $Doc = "Curso";
 $PlataformAdmin = "Administração do Portal";
 $Groups = "Grupos";
 $GroupManagement = "Gestão de grupos";
 $All = "Todos";
 $None = "nenhum";
-$langSorry = "Seleccione primeiro um curso";
-$langDenied = "Esta função só se encontra disponível para instrutores";
+$Sorry = "Seleccione primeiro um curso";
+$Denied = "Esta função só se encontra disponível para instrutores";
 $Today = "hoje";
-$langCourseHomepageLink = "Página inicial do Curso";
+$CourseHomepageLink = "Página inicial do Curso";
 $Attachment = "anexos";
 $User = "Utilizador";
 $MondayInit = "S";
@@ -379,10 +371,10 @@ $SeptemberLong = "Setembro";
 $OctoberLong = "Outubro";
 $NovemberLong = "Novembro";
 $DecemberLong = "Dezembro";
-$langMyCompetences = "Minhas competências";
-$langMyDiplomas = "Meus diplomas";
-$langMyPersonalOpenArea = "Minha área pessoal partilhada";
-$langMyTeach = "Habilitações/O que eu sou capaz de ensinar";
+$MyCompetences = "Minhas competências";
+$MyDiplomas = "Meus diplomas";
+$MyPersonalOpenArea = "Minha área pessoal partilhada";
+$MyTeach = "Habilitações/O que eu sou capaz de ensinar";
 $Agenda = "Agenda";
 $HourShort = "h";
 $PleaseTryAgain = "Por favor, tente novamente !";
@@ -392,7 +384,7 @@ $UplNotAZip = "O ficheiro seleccionado não é um ficheiro ZIP.";
 $UplUploadSucceeded = "Envio do ficheiro bem sucedido!";
 $ExportAsCSV = "Exportar para CSV";
 $ExportAsXLS = "Exportar para Excel";
-$langOpenarea = "Área pessoal";
+$Openarea = "Área pessoal";
 $Done = "Concluído";
 $Documents = "Documentos";
 $DocumentAdded = "Documento adicionado";
@@ -405,7 +397,7 @@ $Link = "Ligações/links";
 $Announcement = "Anúncios";
 $Dropbox = "Caixa de entrega";
 $Quiz = "Exercícios";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Conferência";
 $Student_publication = "Tarefas/Trabalhos";
 $Tracking = "Relatórios";
@@ -418,8 +410,8 @@ $StartDate = "Data de Início";
 $EndDate = "Data Final";
 $StartTime = "Hora de Início";
 $EndTime = "Hora de Conclusão";
-$langYouWereCalled = "Foi convidado(a) para uma sessão de chat com";
-$langDoYouAccept = "Deseja aceitar?";
+$YouWereCalled = "Foi convidado(a) para uma sessão de chat com";
+$DoYouAccept = "Deseja aceitar?";
 $Everybody = "Todos";
 $SentTo = "Visivel para";
 $Export = "Exportar";
@@ -443,7 +435,7 @@ $FormHasErrorsPleaseComplete = "Este formulário contém dados incorrectos ou in
 $StartDateShouldBeBeforeEndDate = "A data de início deve ser anterior à data final";
 $InvalidDate = "Data inválida";
 $OnlyLettersAndNumbersAllowed = "Apenas é permitido utilizar letras e números";
-$langBasicOverview = "Organize";
+$BasicOverview = "Organize";
 $CourseAdminRole = "Administrador do curso";
 $UserRole = "Função";
 $OnlyImagesAllowed = "Apenas são permitidas imagens PNG, JPG ou GIF";
@@ -453,16 +445,14 @@ $DeleteRight = "Eliminar";
 $OverviewCourseRights = "Vista geral das funções e permissões";
 $SeeAllRightsAllLocationsForSpecificRole = "Focalizar na função";
 $SeeAllRolesAllLocationsForSpecificRight = "Realçar à direita";
-$langAdvanced = "Autoría";
+$Advanced = "Autoría";
 $RightValueModified = "O valor foi modificado.";
 $course_rights = "Vista geral das funções e permissões";
 $Visio_conference = "Reunião virtual";
 $CourseAdminRoleDescription = "Instrutor";
-$Move = "Mover";
 $MoveTo = "Mover para";
 $Delete = "Eliminar";
 $MoveFileTo = "Mover ficheiro para";
-$Save = "Guardar";
 $Error = "Erro";
 $Anonymous = "Anónimo";
 $h = "h";
@@ -478,9 +468,9 @@ $YouHaveNewMessage = "Tem uma nova mensagem!";
 $myActiveSessions = "Minhas sessões activas";
 $myInactiveSessions = "Minhas sessões inactivas";
 $FileUpload = "Envio do ficheiro";
-$langMyActiveSessions = "Minhas sessões activas";
-$langMyInActiveSessions = "Minhas sessões inactivas";
-$langMySpace = "Relatórios";
+$MyActiveSessions = "Minhas sessões activas";
+$MyInActiveSessions = "Minhas sessões inactivas";
+$MySpace = "Relatórios";
 $ExtensionActivedButNotYetOperational = "Esta extensão foi activada mas neste momento não se encontra operacional.";
 $MyStudents = "Meus utilizadores";
 $Progress = "Progresso";

+ 95 - 105
main/lang/quechua_cusco/trad4all.inc.php

@@ -9,54 +9,52 @@ $Title = "Sutinchaynin";
 $By = "Pi churarun";
 $UsersOnline = "Haykan kashanku";
 $Remove = "Wañuchiy";
-$langEnter = "Kutiy yachachinakuna sinriyman";
+$Enter = "Kutiy yachachinakuna sinriyman";
 $Description = "Nisqasqa";
 $Links = "Waskhanakuna";
-$langWorks = "Llank'aykuna";
+$Works = "Llank'aykuna";
 $Forums = "Rimarinakuykuna";
-$langExercices = "Llank'anapaqkuna";
-$langCreateDir = "Wayaqata kamariy";
+$Exercices = "Llank'anapaqkuna";
+$CreateDir = "Wayaqata kamariy";
 $Name = "Suti";
-$langComment = "Ima nisqakuna";
-$langVisible = "Rikurisqa";
-$langDirCr = "Wayaqa kamarisqa";
+$Comment = "Ima nisqakuna";
+$Visible = "Rikurisqa";
+$DirCr = "Wayaqa kamarisqa";
 $Download = "Urayachiy";
-$langGroup = "Huñusqakuna";
-$langEdit = "Ruwapay";
-$langGroupForum = "Huñusqamanta k'itirimanan";
+$Group = "Huñusqakuna";
+$Edit = "Ruwapay";
+$GroupForum = "Huñusqamanta k'itirimanan";
 $Language = "Simi";
 $LoginName = "Haykuqmasi";
 $AutostartMp3 = "Chaskiy nisqata q'apiy, pachanmanta uyariyta munaspaqa";
 $Assignments = "Llank'aykuna";
 $Forum = "Rimarinakuykuna";
-$langDelImage = "Wankita horqoy";
-$langCode = "Yachachinaq chinpun";
-$langUp = "Wichaypi";
+$DelImage = "Wankita horqoy";
+$Code = "Yachachinaq chinpun";
+$Up = "Wichaypi";
 $Down = "Urayachiy";
-$Up = "Wichachiy";
 $Theme = "Imamanta";
 $TheListIsEmpty = "Yupaychasqaqa chinmi kashan";
-$langUniqueSelect = "Sapa kutichiy";
+$UniqueSelect = "Sapa kutichiy";
 $CreateCategory = "Kamay mitata";
 $SendFile = "Apachiy khiputa";
 $SaveChanges = "Allachay t'jrasqaykunata";
 $SearchTerm = "Simi maskhanapaq";
 $TooShort = "Demasiado corto";
-$langCourseCreate = "Kamachiy huy yachachinata";
-$langTodo = "Ima rimariykuna";
+$CourseCreate = "Kamachiy huy yachachinata";
+$Todo = "Ima rimariykuna";
 $UserName = "Haykuqmasi";
-$lang_show_hide = "Qhawarichiy / pakay";
-$langCategoryMod = "T'ijrapay mitata";
+$CategoryMod = "T'ijrapay mitata";
 $Hide = "Pakay";
-$langDear = "Munasqa";
-$langArchive = "khipu";
-$langCourseCode = "Yachachinaq chinpun";
-$langNoDescription = "Mana nisqasqawan";
-$langOfficialCode = "Chinpu kamachisqa";
+$Dear = "Munasqa";
+$Archive = "khipu";
+$CourseCode = "Yachachinaq chinpun";
+$NoDescription = "Mana nisqasqawan";
+$OfficialCode = "Chinpu kamachisqa";
 $FirstName = "Suti";
 $LastName = "Mamatayta suti";
 $Status = "Ima kay";
-$langEmail = "E-chaski";
+$Email = "E-chaski";
 $SlideshowConversion = "Rikuchinapa t'ijraynin";
 $UploadFile = "Apachiy khiputa";
 $AvailableFrom = "Maykanmanta kashan";
@@ -66,7 +64,6 @@ $Type = "Ima niraq";
 $EmailAddress = "E-chaski";
 $Organisation = "May wasi";
 $Reporting = "Willaykuna";
-$Code = "Chinpu";
 $Update = "Kunanyachiy";
 $CurrentCourse = "Kunan yachachina";
 $Back = "Volver";
@@ -95,96 +92,91 @@ $dateFormatShort = "%d %b %y";
 $dateFormatLong = "%A %d %B de %Y";
 $dateTimeFormatLong = "%d %B %Y, %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "arí";
-$langNo = "Mana";
+$Yes = "arí";
+$No = "Mana";
 $Next = "Qatiq";
-$langAllowed = "Saqellanapaq";
-$langBackHome = "Kutiy kaypa raphi qallariyninman";
-$langPropositions = "Allinyanachipaq";
-$langMaj = "Kunanyachiy";
-$langModify = "t'ijrapay";
-$langDelete = "Pichay";
-$langInvisible = "mana rikuriq";
-$langSave = "Allchay";
-$langMove = "Kuyuchiy";
+$Allowed = "Saqellanapaq";
+$BackHome = "Kutiy kaypa raphi qallariyninman";
+$Propositions = "Allinyanachipaq";
+$Maj = "Kunanyachiy";
+$Modify = "t'ijrapay";
+$Invisible = "mana rikuriq";
+$Save = "Allchay";
+$Move = "Kuyuchiy";
 $Help = "Yanapay";
-$langOk = "Chaskiy";
-$langAdd = "yapay";
-$langAddIntro = "Yapay hoq qelqa qallariyta";
-$langBackList = "Kutiy sinriman";
-$langText = "Qelqa";
-$langEmpty = "Manan hunt'achinkichu llapan kanchakunata.<br>wanp'uqninkipi kutispa hoqmanta qallariy.<br> Sichus mana reqsinki yachachiyniykiq chinp'unta, chayqa tapurikuy yachachinaq programanta";
-$langConfirmYourChoice = "Ama hina kaychu, cheqaychay ajllasqaykita";
-$langAnd = "chaymantari";
-$langChoice = "Ajllasqayki";
-$langFinish = "Tukuy";
-$langCancel = "Pichay";
-$langNotAllowed = "Mana reqsisqachu kashanki manuchakuq hina kay yachachinapiqa";
-$langNotLogged = "Mana haykunkichu yachachinaman haykuqmasi hina";
-$langManager = "Manuchakuq";
-$langOptional = "Munaspapas";
+$Ok = "Chaskiy";
+$Add = "yapay";
+$AddIntro = "Yapay hoq qelqa qallariyta";
+$BackList = "Kutiy sinriman";
+$Text = "Qelqa";
+$Empty = "Manan hunt'achinkichu llapan kanchakunata.<br>wanp'uqninkipi kutispa hoqmanta qallariy.<br> Sichus mana reqsinki yachachiyniykiq chinp'unta, chayqa tapurikuy yachachinaq programanta";
+$ConfirmYourChoice = "Ama hina kaychu, cheqaychay ajllasqaykita";
+$And = "chaymantari";
+$Choice = "Ajllasqayki";
+$Finish = "Tukuy";
+$Cancel = "Pichay";
+$NotAllowed = "Mana reqsisqachu kashanki manuchakuq hina kay yachachinapiqa";
+$NotLogged = "Mana haykunkichu yachachinaman haykuqmasi hina";
+$Manager = "Manuchakuq";
+$Optional = "Munaspapas";
 $NextPage = "Qatiqnin raphi";
 $PreviousPage = "Ñaupaqnin raphi";
-$langUse = "Hapipay";
-$langTotal = "Llipin";
-$langTake = "tomar";
-$langOne = "Huj";
-$langSeveral = "Askha";
-$langNotice = "Willay";
-$langDate = "Ima pacha";
-$langAmong = "entre";
-$langShow = "Whawachiy";
-$langMyCourses = "Noqapaq yachachiykuna";
-$langModifyProfile = "Noqamanta";
-$langMyStats = "Qhawariy yupanaykunata";
-$langLogout = "Lloqsiy";
-$langMyAgenda = "Ruwanay";
-$langCourseHomepage = "Yachachinamanta raphi qallariy";
-$langCourseManagerview = "Yachachiq qhawariynin";
-$langStudentView = "Yachaqe qhawariynin";
+$Use = "Hapipay";
+$Total = "Llipin";
+$Take = "tomar";
+$One = "Huj";
+$Several = "Askha";
+$Notice = "Willay";
+$Date = "Ima pacha";
+$Among = "entre";
+$Show = "Whawachiy";
+$MyCourses = "Noqapaq yachachiykuna";
+$ModifyProfile = "Noqamanta";
+$MyStats = "Qhawariy yupanaykunata";
+$Logout = "Lloqsiy";
+$MyAgenda = "Ruwanay";
+$CourseHomepage = "Yachachinamanta raphi qallariy";
+$CourseManagerview = "Yachachiq qhawariynin";
+$StudentView = "Yachaqe qhawariynin";
 $AddResource = "Yapay yanapaysinata";
 $AddedResources = "Yanapaysikuna yapasqa";
-$lang_modify_resource = "Ti'rachiy / yapay yanapaysikunata";
-$lang_resource = "Yanapaysina";
-$lang_resources = "Yanapaysinakuna";
 $Close = "wisqay";
-$langPlatform = "Hanp'ara";
+$Platform = "Hanp'ara";
 $localLangName = "simi";
 $email = "e-chaski";
-$langCourseCodeAlreadyExists = "kay chinpuqa kashanña. Hoqta ajllaspa malliy.";
+$CourseCodeAlreadyExists = "kay chinpuqa kashanña. Hoqta ajllaspa malliy.";
 $Statistics = "Yupanakuna";
-$langGrouplist = "huñusqakunaq sinrin";
-$langPrevious = "Ñaupaq";
+$Grouplist = "huñusqakunaq sinrin";
+$Previous = "Ñaupaq";
 $DestDirectoryDoesntExist = "Wayaqepi allchanapaqqa mana kanchu";
 $Courses = "yachachinakuna";
 $In = "kaypi";
-$langShowAll = "Llapanta qhawachiy";
-$langPage = "Raphi";
+$ShowAll = "Llapanta qhawachiy";
+$Page = "Raphi";
 $englishLangName = "Inglés simipi";
 $Home = "Qallariq";
-$langAreYouSureToDelete = " Cheqaychu wañuchinki ?";
+$AreYouSureToDelete = " Cheqaychu wañuchinki ?";
 $SelectAll = "Ajllay llipinta";
 $UnSelectAll = "Wañuchiy ajllay llapanta nisqa";
 $WithSelected = "Ajllasqawan";
-$langOnLine = "Haykan kashanku";
-$langUsers = "Haykuqmasikuna";
-$langPlatformAdmin = "Hanp'araq kamachina";
+$OnLine = "Haykan kashanku";
+$Users = "Haykuqmasikuna";
+$PlatformAdmin = "Hanp'araq kamachina";
 $UserInfo = "haykuqmasimanta willay";
-$langModifyQuestion = "T'ijrapay taputa";
-$langCheckAll = "cheqaqchay";
-$langNbAnnoucement = "Willaykuna";
-$lang_no_access_here = "Manan kayman haykuwaqchu";
-$langOtherCourses = "hoq yachachinakuna";
+$ModifyQuestion = "T'ijrapay taputa";
+$CheckAll = "cheqaqchay";
+$NbAnnoucement = "Willaykuna";
+$OtherCourses = "hoq yachachinakuna";
 $Doc = "qelqa khipu";
 $PlataformAdmin = "Hanp'araq kamachina";
 $Groups = "Huñusqakuna";
 $GroupManagement = "Huñusqakunaq kamachiy";
 $All = "Llapan";
 $None = "Ch'usaq";
-$langSorry = "Ñaupaqqa ajllay huj yachachiyta";
-$langDenied = "Kay ruwayqa manan kashanchu yachachina kamaqkunapaqqa";
+$Sorry = "Ñaupaqqa ajllay huj yachachiyta";
+$Denied = "Kay ruwayqa manan kashanchu yachachina kamaqkunapaqqa";
 $Today = "kunan";
-$langCourseHomepageLink = "Yachachinamanta raphi qallariy";
+$CourseHomepageLink = "Yachachinamanta raphi qallariy";
 $Attachment = "Yapay";
 $User = "Haykuqmasikuna";
 $MondayInit = "k";
@@ -244,10 +236,10 @@ $SeptemberLong = "Septiembre";
 $OctoberLong = "Octubre";
 $NovemberLong = "Noviembre";
 $DecemberLong = "Diciembre";
-$langMyCompetences = "Atipanaykuna";
-$langMyDiplomas = "Sutinchachiykuna";
-$langMyPersonalOpenArea = "Runakunapaq k'itiy";
-$langMyTeach = "Imata yachachiyman";
+$MyCompetences = "Atipanaykuna";
+$MyDiplomas = "Sutinchachiykuna";
+$MyPersonalOpenArea = "Runakunapaq k'itiy";
+$MyTeach = "Imata yachachiyman";
 $Agenda = "Ima ruway";
 $HourShort = "h";
 $PleaseTryAgain = "¡ Ama hina kaychu, hoqmanta ruwaruy !";
@@ -257,7 +249,7 @@ $UplNotAZip = "Archivo ajllasqaqa manan archivo zip. nisqachu";
 $UplUploadSucceeded = "Khipuqa apachisqaña !";
 $ExportAsCSV = "Apachiy CSV khipuman";
 $ExportAsXLS = "Apachiy XLS khipuman";
-$langOpenarea = "Llapan runakunapaq kancha";
+$Openarea = "Llapan runakunapaq kancha";
 $Done = "Ruwasqa";
 $Documents = "Qelqa khipukuna";
 $DocumentAdded = "Qelqa khipu yapasqa";
@@ -270,7 +262,7 @@ $Link = "Waskhana";
 $Announcement = "Willaykuna";
 $Dropbox = "Qelqa khipukunata t'aqapay";
 $Quiz = "Llank'aynakuna";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Huñurinakuy internetpi";
 $Student_publication = "Llank'aykuna";
 $Tracking = "Willakuna";
@@ -283,8 +275,8 @@ $StartDate = "P'unchay qallariy";
 $EndDate = "P'unchay tukukuy";
 $StartTime = "Tuy qallariy";
 $EndTime = "Tuy tukukuy";
-$langYouWereCalled = "Waqhashasunki hoqwan  rimakunaykipaq";
-$langDoYouAccept = "Chaskinkichu?";
+$YouWereCalled = "Waqhashasunki hoqwan  rimakunaykipaq";
+$DoYouAccept = "Chaskinkichu?";
 $Everybody = "yachachinaq llapan haykuqmasikuna";
 $SentTo = "Pipaqman apachikunqa";
 $Export = "Apachiy";
@@ -308,7 +300,7 @@ $FormHasErrorsPleaseComplete = "Kaypi imaymana qelqasqaykiqa mana allichu utaq m
 $StartDateShouldBeBeforeEndDate = "P'unchay tukukunamantaqa ñaupaqninpi kanqapuni p'unchay qallarina";
 $InvalidDate = "Pacha mana allin churasqa";
 $OnlyLettersAndNumbersAllowed = "Seq'ekunallata yupaykunallatawan chaskin";
-$langBasicOverview = "Organizar";
+$BasicOverview = "Organizar";
 $CourseAdminRole = "Yachachina kamachiq";
 $UserRole = "Ruwaynin";
 $OnlyImagesAllowed = "Wankikunataqa kay hinallapi churanaqa PNG, JPG, GIF nisqakunapi";
@@ -318,16 +310,14 @@ $DeleteRight = "Pichay";
 $OverviewCourseRights = "Ruwayninmanta huñichaymantawan nisqaynin";
 $SeeAllRightsAllLocationsForSpecificRole = "Ruwaynin";
 $SeeAllRolesAllLocationsForSpecificRight = "Ver todos los perfiles y lugares para un permiso específico";
-$langAdvanced = "Avanzado";
+$Advanced = "Avanzado";
 $RightValueModified = "Este valor ha sido modificado.";
 $course_rights = "Ruwayninmanta huñichaymantawan kamachiynin";
 $Visio_conference = "Huñunakuy video-rimarinakuypi";
 $CourseAdminRoleDescription = "Yachachina kamachiq";
-$Move = "Kuyurichiy";
 $MoveTo = "Kuyuchiy kayman";
 $Delete = "Pichay";
 $MoveFileTo = "Kuyuchiy khiputa kayman";
-$Save = "Allchay";
 $Error = "Error";
 $Anonymous = "Mana sutiyuq";
 $h = "h";
@@ -343,9 +333,9 @@ $YouHaveNewMessage = "Musuq willanaykin kashan";
 $myActiveSessions = "Sesiones nisqaykuna hap'ichisqa";
 $myInactiveSessions = "Sesiones nisqaykuna mana hap'ichisqa";
 $FileUpload = "Khipu apachiy";
-$langMyActiveSessions = "Sesiones nisqaykuna hap'ichisqa";
-$langMyInActiveSessions = "Sesiones nisqaykuna mana hap'ichisqa";
-$langMySpace = "Willakuna";
+$MyActiveSessions = "Sesiones nisqaykuna hap'ichisqa";
+$MyInActiveSessions = "Sesiones nisqaykuna mana hap'ichisqa";
+$MySpace = "Willakuna";
 $ExtensionActivedButNotYetOperational = "Kay extensión nisqaqa hap'ichisqañan, ichaqa kunanqa manaraq kanqachu hap'ichasqa.";
 $MyStudents = "Yachaqeykuna";
 $Progress = "Purisqa";

+ 96 - 106
main/lang/romanian/trad4all.inc.php

@@ -9,55 +9,53 @@ $Title = "Titlu";
 $By = "De";
 $UsersOnline = "Utilizatori online";
 $Remove = "Indepartati";
-$langEnter = "Inapoi la lista cursurilor";
+$Enter = "Inapoi la lista cursurilor";
 $Description = "Descriere";
 $Links = "Linkuri";
-$langWorks = "Publicatiile studentilor";
+$Works = "Publicatiile studentilor";
 $Forums = "Forumuri";
-$langExercices = "Teste";
-$langCreateDir = "Creaza director";
+$Exercices = "Teste";
+$CreateDir = "Creaza director";
 $Name = "Nume";
-$langComment = "Comentariu";
-$langVisible = "Vizibil/invizibil";
-$langNewDir = "Numele noului dosar";
-$langDirCr = "Director creat";
+$Comment = "Comentariu";
+$Visible = "Vizibil/invizibil";
+$NewDir = "Numele noului dosar";
+$DirCr = "Director creat";
 $Download = "Descarca";
-$langGroup = "Grup";
-$langEdit = "editeaza";
-$langGroupForum = "Forumul grupului";
+$Group = "Grup";
+$Edit = "editeaza";
+$GroupForum = "Forumul grupului";
 $Language = "Limba";
 $LoginName = "Login(logare)";
 $AutostartMp3 = "Apasati ok daca doriti ca fisierul audio sa fie redat in mod automat";
 $Assignments = "Publicatiile studentilor";
 $Forum = "Forumuri";
-$langDelImage = "Sterge imaginea";
-$langCode = "Codul cursului";
-$langUp = "Sus";
+$DelImage = "Sterge imaginea";
+$Code = "Codul cursului";
+$Up = "Sus";
 $Down = "jos";
-$Up = "sus";
 $Theme = "Tema";
 $TheListIsEmpty = "Lista este goala.";
-$langUniqueSelect = "Alegere multipla (raspuns unic)";
+$UniqueSelect = "Alegere multipla (raspuns unic)";
 $CreateCategory = "Creaza categorie";
 $SendFile = "Importa documentul";
 $SaveChanges = "Salveaza modificarile";
 $SearchTerm = "Termenul de cautare";
 $TooShort = "Prea scurt";
-$langCourseCreate = "Creaza o pagina web a cursului";
-$langTodo = "De efectuat";
+$CourseCreate = "Creaza o pagina web a cursului";
+$Todo = "De efectuat";
 $UserName = "Nume de utilizator";
-$lang_show_hide = "Arata / ascunde";
-$langCategoryMod = "Modifica categoria";
+$CategoryMod = "Modifica categoria";
 $Hide = "Ascunde";
-$langDear = "Draga";
-$langArchive = "arhiva";
-$langCourseCode = "Codul cursului";
-$langNoDescription = "Fara descriere";
-$langOfficialCode = "Codul oficial";
+$Dear = "Draga";
+$Archive = "arhiva";
+$CourseCode = "Codul cursului";
+$NoDescription = "Fara descriere";
+$OfficialCode = "Codul oficial";
 $FirstName = "Nume";
 $LastName = "Prenume";
 $Status = "Status";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $SlideshowConversion = "Conversia presentatiei";
 $UploadFile = "Încărcare fişier";
 $AvailableFrom = "Valabil de la";
@@ -67,7 +65,6 @@ $Type = "Tip";
 $EmailAddress = "Adresa email";
 $Organisation = "Companie";
 $Reporting = "Reportaj";
-$Code = "Cod";
 $Update = "Actualizeaza";
 $CurrentCourse = "Cursul actual";
 $Back = "Inapoi";
@@ -96,58 +93,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "da";
-$langNo = "Nu";
+$Yes = "da";
+$No = "Nu";
 $Next = "Urmatorul";
-$langAllowed = "Permis";
-$langBackHome = "Inapoi la Pagina Principala a";
-$langPropositions = "Propuneri pentru imbunatatirea";
-$langMaj = "Actualizare";
-$langModify = "modifica";
-$langDelete = "sterge";
-$langInvisible = "Ascunde";
-$langSave = "Salveaza";
-$langMove = "Muta";
+$Allowed = "Permis";
+$BackHome = "Inapoi la Pagina Principala a";
+$Propositions = "Propuneri pentru imbunatatirea";
+$Maj = "Actualizare";
+$Modify = "modifica";
+$Invisible = "Ascunde";
+$Save = "Salveaza";
+$Move = "Muta";
 $Help = "Ajutor";
-$langOk = "OK";
-$langAdd = "Adauga";
-$langAddIntro = "Adauga un text introductiv";
-$langBackList = "Intoarce-te la lista";
-$langText = "Text";
-$langEmpty = "Daca ai lasat unele campuri goale.<br>Foloseste butonul <b>Inapoi</b> al browserului si incearca din nou.<br>Daca ignori codul cursului tau, vezi Programul Cursului";
-$langConfirmYourChoice = "Va rugam confirmati alegerea facuta";
-$langAnd = "si";
-$langChoice = "Alegerea ta";
-$langFinish = "Termina";
-$langCancel = "Anuleaza";
-$langNotAllowed = "Nepermis";
-$langNotLogged = "Nu sunteti inscris la curs";
-$langManager = "Administrator";
-$langOptional = "Optional";
+$Ok = "OK";
+$Add = "Adauga";
+$AddIntro = "Adauga un text introductiv";
+$BackList = "Intoarce-te la lista";
+$Text = "Text";
+$Empty = "Daca ai lasat unele campuri goale.<br>Foloseste butonul <b>Inapoi</b> al browserului si incearca din nou.<br>Daca ignori codul cursului tau, vezi Programul Cursului";
+$ConfirmYourChoice = "Va rugam confirmati alegerea facuta";
+$And = "si";
+$Choice = "Alegerea ta";
+$Finish = "Termina";
+$Cancel = "Anuleaza";
+$NotAllowed = "Nepermis";
+$NotLogged = "Nu sunteti inscris la curs";
+$Manager = "Administrator";
+$Optional = "Optional";
 $NextPage = "Pagina urmatoare";
 $PreviousPage = "Pagina anterioara";
-$langUse = "Utilizati";
-$langTotal = "Total";
-$langTake = "ia";
-$langOne = "Unu";
-$langSeveral = "Cateva";
-$langNotice = "Notita";
-$langDate = "Data";
-$langAmong = "intre";
-$langShow = "Arata";
-$langMyCourses = "Cursurile mele";
-$langModifyProfile = "Profilul meu";
-$langMyStats = "Vezi statisticile";
-$langLogout = "Iesire";
-$langMyAgenda = "Agenda mea";
-$langCourseHomepage = "Pagina principala a cursului";
-$langCourseManagerview = "Modul de vizualizare al profesorului";
-$langStudentView = "Modul de vizualizare al studentului";
+$Use = "Utilizati";
+$Total = "Total";
+$Take = "ia";
+$One = "Unu";
+$Several = "Cateva";
+$Notice = "Notita";
+$Date = "Data";
+$Among = "intre";
+$Show = "Arata";
+$MyCourses = "Cursurile mele";
+$ModifyProfile = "Profilul meu";
+$MyStats = "Vezi statisticile";
+$Logout = "Iesire";
+$MyAgenda = "Agenda mea";
+$CourseHomepage = "Pagina principala a cursului";
+$CourseManagerview = "Modul de vizualizare al profesorului";
+$StudentView = "Modul de vizualizare al studentului";
 $AddResource = "Adauga";
 $AddedResources = "Atasamente";
-$lang_modify_resource = "Modificati/ Adaugati resurse";
-$lang_resource = "Resursa";
-$lang_resources = "Resurse";
 $langNameOfLang['arabic'] = "araba";
 $langNameOfLang['brazilian'] = "brazilian";
 $langNameOfLang['bulgarian'] = "bulgarian";
@@ -171,27 +164,27 @@ $langNameOfLang['russian'] = "russian";
 $langNameOfLang['simpl_chinese'] = "simpl_chinese";
 $langNameOfLang['spanish'] = "spanish";
 $Close = "inchide";
-$langPlatform = "Platforma";
+$Platform = "Platforma";
 $localLangName = "limba";
 $email = "email";
-$langCourseCodeAlreadyExists = "Acest cod de curs exista deja, alege altul.";
+$CourseCodeAlreadyExists = "Acest cod de curs exista deja, alege altul.";
 $Statistics = "Statistici";
-$langGrouplist = "lista grup";
-$langPrevious = "anterior";
+$Grouplist = "lista grup";
+$Previous = "anterior";
 $DestDirectoryDoesntExist = "Dosarul de destinatie nu exista";
 $Courses = "cursuri";
 $In = "in";
-$langShowAll = "Arata tot";
-$langPage = "Pagina";
+$ShowAll = "Arata tot";
+$Page = "Pagina";
 $englishLangName = "Engleza";
 $Home = "Acasa";
-$langAreYouSureToDelete = "Esti sigur(a) ca doresti sa stergi";
+$AreYouSureToDelete = "Esti sigur(a) ca doresti sa stergi";
 $SelectAll = "Selecteaza toate";
 $UnSelectAll = "deselectati totul";
 $WithSelected = "Cu zonele selectate";
-$langOnLine = "Online";
-$langUsers = "Utilizatori";
-$langPlatformAdmin = "Administrarea platformei";
+$OnLine = "Online";
+$Users = "Utilizatori";
+$PlatformAdmin = "Administrarea platformei";
 $langNameOfLang['hungarian'] = "hungarian";
 $langNameOfLang['indonesian'] = "indonesian";
 $langNameOfLang['malay'] = "malay";
@@ -202,21 +195,20 @@ $langNameOfLang['thai'] = "thai";
 $langNameOfLang['turkce'] = "turkish";
 $langNameOfLang['vietnamese'] = "vietnamese";
 $UserInfo = "informatii despre utilizator";
-$langModifyQuestion = "Modifica intrebarea";
-$langCheckAll = "Bifeaza toate";
-$langNbAnnoucement = "Anunt";
-$lang_no_access_here = "Nu aveti acces aici";
-$langOtherCourses = "alte cursuri";
+$ModifyQuestion = "Modifica intrebarea";
+$CheckAll = "Bifeaza toate";
+$NbAnnoucement = "Anunt";
+$OtherCourses = "alte cursuri";
 $Doc = "document";
 $PlataformAdmin = "Administratorul platformei";
 $Groups = "Grupuri";
 $GroupManagement = "Administrare grup";
 $All = "Tot";
 $None = "nimic";
-$langSorry = "Alege un curs mai intai";
-$langDenied = "Aceasta functie este disponibila doar pentru administratorii cursului";
+$Sorry = "Alege un curs mai intai";
+$Denied = "Aceasta functie este disponibila doar pentru administratorii cursului";
 $Today = "azi";
-$langCourseHomepageLink = "Pagina cursului";
+$CourseHomepageLink = "Pagina cursului";
 $Attachment = "atasament";
 $User = "Utilizator";
 $MondayInit = "L";
@@ -276,10 +268,10 @@ $SeptemberLong = "Septembrie";
 $OctoberLong = "Octombrie";
 $NovemberLong = "Noiembrie";
 $DecemberLong = "Decembrie";
-$langMyCompetences = "Competentele mele";
-$langMyDiplomas = "Diplomele mele";
-$langMyPersonalOpenArea = "Aria personala";
-$langMyTeach = "Ce sunt dispus sa predau";
+$MyCompetences = "Competentele mele";
+$MyDiplomas = "Diplomele mele";
+$MyPersonalOpenArea = "Aria personala";
+$MyTeach = "Ce sunt dispus sa predau";
 $Agenda = "Agenda";
 $HourShort = "o";
 $PleaseTryAgain = "Va rugam incercati din nou!";
@@ -289,7 +281,7 @@ $UplNotAZip = "Fisierul selectat nu este o arhiva.";
 $UplUploadSucceeded = "Fisierul a fost incarcat cu succes!";
 $ExportAsCSV = "Export ca fisier CSV";
 $ExportAsXLS = "Export ca fisier XLS";
-$langOpenarea = "Zona personala";
+$Openarea = "Zona personala";
 $Done = "Gata";
 $Documents = "Documentatii";
 $DocumentAdded = "Document adaugat";
@@ -302,7 +294,7 @@ $Link = "Link";
 $Announcement = "Anunturi";
 $Dropbox = "Cutie postala";
 $Quiz = "Exercitii";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Conferinta";
 $Student_publication = "Publicatiile studentilor";
 $Tracking = "Urmarire";
@@ -315,8 +307,8 @@ $StartDate = "Data de începere";
 $EndDate = "Data finalizării";
 $StartTime = "Momentul începerii";
 $EndTime = "Momentul finalizării";
-$langYouWereCalled = "Ati fost invitat sa conversati cu";
-$langDoYouAccept = "Acceptati?";
+$YouWereCalled = "Ati fost invitat sa conversati cu";
+$DoYouAccept = "Acceptati?";
 $Everybody = "Toti";
 $SentTo = "Vizibil pentru";
 $Export = "Export";
@@ -340,7 +332,7 @@ $FormHasErrorsPleaseComplete = "Formularul contine date incorecte sau incomplete
 $StartDateShouldBeBeforeEndDate = "Prima data ar trebui sa fie inainte de data finala";
 $InvalidDate = "Data invalida";
 $OnlyLettersAndNumbersAllowed = "Numai litere si numere sunt permise";
-$langBasicOverview = "Privire de ansamblu de baza";
+$BasicOverview = "Privire de ansamblu de baza";
 $CourseAdminRole = "Administrator de curs";
 $UserRole = "Rol";
 $OnlyImagesAllowed = "Doar imagini de tipul PNG, JPG sau GIF permise";
@@ -350,16 +342,14 @@ $DeleteRight = "Stergere";
 $OverviewCourseRights = "Privire de ansamblu cu privire la roluri si drepturi";
 $SeeAllRightsAllLocationsForSpecificRole = "Focalizare pe rol";
 $SeeAllRolesAllLocationsForSpecificRight = "Vizualizarea tuturor rolurilor si locatiilor pentru drept specific";
-$langAdvanced = "Avansat";
+$Advanced = "Avansat";
 $RightValueModified = "Valoarea a fost modificata.";
 $course_rights = "Privire de ansamblu cu privire la roluri si drepturi";
 $Visio_conference = "Visioconferinta";
 $CourseAdminRoleDescription = "Administratorul cursului";
-$Move = "Muta";
 $MoveTo = "Muta la";
 $Delete = "Sterge";
 $MoveFileTo = "Muta fisierul catre";
-$Save = "Salveaza";
 $Error = "Greseala";
 $Anonymous = "Anonim";
 $h = "o";
@@ -375,9 +365,9 @@ $YouHaveNewMessage = "Aveti un mesaj nou!";
 $myActiveSessions = "Sesiunile mele active";
 $myInactiveSessions = "Sesiunile mele inactive";
 $FileUpload = "Incarcare fisier";
-$langMyActiveSessions = "Sesiunile mele active";
-$langMyInActiveSessions = "Sesiunile mele inactive";
-$langMySpace = "Raportare";
+$MyActiveSessions = "Sesiunile mele active";
+$MyInActiveSessions = "Sesiunile mele inactive";
+$MySpace = "Raportare";
 $ExtensionActivedButNotYetOperational = "Aceasta extensie a fost activata dar nu poate fi operationala in acest moment.";
 $MyStudents = "Studentii mei";
 $Progress = "Progres";

+ 96 - 106
main/lang/russian/trad4all.inc.php

@@ -9,49 +9,47 @@ $Title = "Заголовок";
 $By = "касательно";
 $UsersOnline = "Пользователи онлайн (на связи)";
 $Remove = "Удалить";
-$langEnter = "Вернуться к моему списку курсов";
+$Enter = "Вернуться к моему списку курсов";
 $Description = "Описание";
 $Links = "Ссылки";
-$langWorks = "Публикации студента";
+$Works = "Публикации студента";
 $Forums = "Форумы";
-$langExercices = "Тесты";
-$langCreateDir = "Создать папку";
+$Exercices = "Тесты";
+$CreateDir = "Создать папку";
 $Name = "Имя";
-$langComment = "Обратная связь";
-$langVisible = "Видимый/невидимый";
-$langNewDir = "Название новой папки";
-$langDirCr = "Папка создана";
+$Comment = "Обратная связь";
+$Visible = "Видимый/невидимый";
+$NewDir = "Название новой папки";
+$DirCr = "Папка создана";
 $Download = "Загрузить";
-$langGroup = "Группы";
-$langEdit = "редактировать";
-$langGroupForum = "Форум группы";
+$Group = "Группы";
+$Edit = "редактировать";
+$GroupForum = "Форум группы";
 $Language = "Язык";
 $LoginName = "Имя пользователя";
 $AutostartMp3 = "Нажмите ОК, если хотите, чтобы аудио файлы проигрывались автоматически";
 $Assignments = "Задания";
 $Forum = "Форумы";
-$langDelImage = "Удалить рисунок";
-$langCode = "Код курса";
-$langUp = "Вверх";
+$DelImage = "Удалить рисунок";
+$Code = "Код курса";
+$Up = "Вверх";
 $Down = "вниз";
-$Up = "вверх";
 $TheListIsEmpty = "Список пустой.";
-$langUniqueSelect = "Множественный выбор";
-$langCourseCreate = "Создать вебсайт курса";
-$langTodo = "Выполнять";
+$UniqueSelect = "Множественный выбор";
+$CourseCreate = "Создать вебсайт курса";
+$Todo = "Выполнять";
 $UserName = "Имя пользователя";
-$lang_show_hide = "Показать/спрятать";
-$langCategoryMod = "Изменить раздел";
+$CategoryMod = "Изменить раздел";
 $Hide = "Скрыть";
-$langDear = "Уважаемый(ая)";
-$langArchive = "архив";
-$langCourseCode = "Код курса";
-$langNoDescription = "Описания нет";
-$langOfficialCode = "Официальный код";
+$Dear = "Уважаемый(ая)";
+$Archive = "архив";
+$CourseCode = "Код курса";
+$NoDescription = "Описания нет";
+$OfficialCode = "Официальный код";
 $FirstName = "Имя";
 $LastName = "Фамилия";
 $Status = "Статус";
-$langEmail = "Адрес эл. почты";
+$Email = "Адрес эл. почты";
 $SlideshowConversion = "Преобразование Показа слайдов";
 $UploadFile = "Файл загружается";
 $AvailableFrom = "Доступен с (из, от)";
@@ -61,7 +59,6 @@ $Type = "Тип";
 $EmailAddress = "Адрес эл. почты";
 $Organisation = "Организация";
 $Reporting = "Отчет";
-$Code = "Код";
 $Update = "Обновить";
 $CurrentCourse = "Текущий курс";
 $Back = "Назад";
@@ -90,58 +87,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "да";
-$langNo = "Нет";
+$Yes = "да";
+$No = "Нет";
 $Next = "Следующий";
-$langAllowed = "Разрешено";
-$langBackHome = "Вернуться на домашнюю страницу";
-$langPropositions = "Предложения для улучшения";
-$langMaj = "Обновить";
-$langModify = "изменить";
-$langDelete = "удалить";
-$langInvisible = "Сделать невидимым";
-$langSave = "Сохранить";
-$langMove = "Переместить";
+$Allowed = "Разрешено";
+$BackHome = "Вернуться на домашнюю страницу";
+$Propositions = "Предложения для улучшения";
+$Maj = "Обновить";
+$Modify = "изменить";
+$Invisible = "Сделать невидимым";
+$Save = "Сохранить";
+$Move = "Переместить";
 $Help = "Помощь";
-$langOk = "Хорошо (правильно)";
-$langAdd = "Добавить";
-$langAddIntro = "Добавить во введение";
-$langBackList = "Вернуться к списку";
-$langText = "Текст";
-$langEmpty = "Вы оставили какие-то поля пустыми.<br />Используй опцию <b>Назад</b> в окне просмотра и попробуй еще раз.<br />Если Вы не указали код курса, смотрите Программу Курса.";
-$langConfirmYourChoice = "Пожалуйста, подтвердите свой выбор";
-$langAnd = "и";
-$langChoice = "Ваш выбор";
-$langFinish = "Завершить";
-$langCancel = "Отменить";
-$langNotAllowed = "Не разрешено";
-$langNotLogged = "Вы не начали работу на курсе";
-$langManager = "Руководитель";
-$langOptional = "Необязательный";
+$Ok = "Хорошо (правильно)";
+$Add = "Добавить";
+$AddIntro = "Добавить во введение";
+$BackList = "Вернуться к списку";
+$Text = "Текст";
+$Empty = "Вы оставили какие-то поля пустыми.<br />Используй опцию <b>Назад</b> в окне просмотра и попробуй еще раз.<br />Если Вы не указали код курса, смотрите Программу Курса.";
+$ConfirmYourChoice = "Пожалуйста, подтвердите свой выбор";
+$And = "и";
+$Choice = "Ваш выбор";
+$Finish = "Завершить";
+$Cancel = "Отменить";
+$NotAllowed = "Не разрешено";
+$NotLogged = "Вы не начали работу на курсе";
+$Manager = "Руководитель";
+$Optional = "Необязательный";
 $NextPage = "Следующая страница";
 $PreviousPage = "Предыдущая страница";
-$langUse = "Использовать";
-$langTotal = "Всего";
-$langTake = "взять";
-$langOne = "Один";
-$langSeveral = "Несколько";
-$langNotice = "Уведомление";
-$langDate = "Дата";
-$langAmong = "между";
-$langShow = "Показать";
-$langMyCourses = "Мои курсы";
-$langModifyProfile = "Мой профиль";
-$langMyStats = "Просмотреть мою статистику";
-$langLogout = "Выход из системы";
-$langMyAgenda = "Мой порядок дня (расписание)";
-$langCourseHomepage = "Домашняя страница курса";
-$langCourseManagerview = "Вид преподавателя";
-$langStudentView = "Вид студента";
+$Use = "Использовать";
+$Total = "Всего";
+$Take = "взять";
+$One = "Один";
+$Several = "Несколько";
+$Notice = "Уведомление";
+$Date = "Дата";
+$Among = "между";
+$Show = "Показать";
+$MyCourses = "Мои курсы";
+$ModifyProfile = "Мой профиль";
+$MyStats = "Просмотреть мою статистику";
+$Logout = "Выход из системы";
+$MyAgenda = "Мой порядок дня (расписание)";
+$CourseHomepage = "Домашняя страница курса";
+$CourseManagerview = "Вид преподавателя";
+$StudentView = "Вид студента";
 $AddResource = "Добавить это";
 $AddedResources = "Прикрепленные файлы";
-$lang_modify_resource = "Изменить / Добавить ресурсы";
-$lang_resource = "Ресурс";
-$lang_resources = "Ресурсы";
 $langNameOfLang['arabic'] = "арабский";
 $langNameOfLang['brazilian'] = "бразильский";
 $langNameOfLang['bulgarian'] = "болгарский";
@@ -165,27 +158,27 @@ $langNameOfLang['russian'] = "русский";
 $langNameOfLang['simpl_chinese'] = "китайский_упрощенный";
 $langNameOfLang['spanish'] = "испанский";
 $Close = "закрыть";
-$langPlatform = "Платформа";
+$Platform = "Платформа";
 $localLangName = "язык";
 $email = "эл. почта";
-$langCourseCodeAlreadyExists = "Извините, но такой код курса уже существует. Пожалуйста, выберите другой.";
+$CourseCodeAlreadyExists = "Извините, но такой код курса уже существует. Пожалуйста, выберите другой.";
 $Statistics = "Статистика";
-$langGrouplist = "Список группы";
-$langPrevious = "предыдущий";
+$Grouplist = "Список группы";
+$Previous = "предыдущий";
 $DestDirectoryDoesntExist = "Целевая папка не существует";
 $Courses = "курсы";
 $In = "в";
-$langShowAll = "Показать все";
-$langPage = "Страница";
+$ShowAll = "Показать все";
+$Page = "Страница";
 $englishLangName = "Английский";
 $Home = "Начало (домой)";
-$langAreYouSureToDelete = "Вы уверены, что хотите удалить";
+$AreYouSureToDelete = "Вы уверены, что хотите удалить";
 $SelectAll = "Выбрать все";
 $UnSelectAll = "снять выбор со всех";
 $WithSelected = "с отобранным";
-$langOnLine = "Онлайн";
-$langUsers = "Пользователи";
-$langPlatformAdmin = "Управление порталом";
+$OnLine = "Онлайн";
+$Users = "Пользователи";
+$PlatformAdmin = "Управление порталом";
 $langNameOfLang['hungarian'] = "венгерский";
 $langNameOfLang['indonesian'] = "индонезийский";
 $langNameOfLang['malay'] = "малайский";
@@ -196,21 +189,20 @@ $langNameOfLang['thai'] = "тайский";
 $langNameOfLang['turkce'] = "турецкий";
 $langNameOfLang['vietnamese'] = "вьетнамский";
 $UserInfo = "информация пользователя";
-$langModifyQuestion = "Изменить вопрос";
-$langCheckAll = "Проверить все";
-$langNbAnnoucement = "Объявление";
-$lang_no_access_here = "Здесь доступа нет";
-$langOtherCourses = "другие курсы";
+$ModifyQuestion = "Изменить вопрос";
+$CheckAll = "Проверить все";
+$NbAnnoucement = "Объявление";
+$OtherCourses = "другие курсы";
 $Doc = "Учебный план";
 $PlataformAdmin = "Администратор платформы";
 $Groups = "Группы";
 $GroupManagement = "Управление группой";
 $All = "Все";
 $None = "ни один";
-$langSorry = "Сначала выберите курс";
-$langDenied = "Эта функция доступна только для администраторов курса";
+$Sorry = "Сначала выберите курс";
+$Denied = "Эта функция доступна только для администраторов курса";
 $Today = "сегодня";
-$langCourseHomepageLink = "Домашняя страница курса";
+$CourseHomepageLink = "Домашняя страница курса";
 $Attachment = "прикрепленный файл";
 $User = "Пользователь";
 $MondayInit = "П";
@@ -270,10 +262,10 @@ $SeptemberLong = "Сентябрь";
 $OctoberLong = "Октябрь";
 $NovemberLong = "Ноябрь";
 $DecemberLong = "Декабрь";
-$langMyCompetences = "Мои способности";
-$langMyDiplomas = "Мои дипломы";
-$langMyPersonalOpenArea = "Моя личная открытая зона";
-$langMyTeach = "Что я способен преподавать?";
+$MyCompetences = "Мои способности";
+$MyDiplomas = "Мои дипломы";
+$MyPersonalOpenArea = "Моя личная открытая зона";
+$MyTeach = "Что я способен преподавать?";
 $Agenda = "Повестка дня";
 $HourShort = "ч";
 $PleaseTryAgain = "Пожалуйста, попробуйте снова!";
@@ -283,7 +275,7 @@ $UplNotAZip = "Выбранный Вами файл не был zip файлом
 $UplUploadSucceeded = "Файл успешно загружен!";
 $ExportAsCSV = "Экспортировать как CSV файл";
 $ExportAsXLS = "Экспортировать как XLS файл";
-$langOpenarea = "Частная зона";
+$Openarea = "Частная зона";
 $Done = "Выполнено";
 $Documents = "Документы";
 $DocumentAdded = "Документ добавлен";
@@ -296,7 +288,7 @@ $Link = "Ссылки";
 $Announcement = "Объявления";
 $Dropbox = "Ящик для содержимого";
 $Quiz = "Вопросы (короткий тест)";
-$langChat = "Беседа";
+$Chat = "Беседа";
 $Conference = "Конференция";
 $Student_publication = "Задания";
 $Tracking = "Отчет";
@@ -309,8 +301,8 @@ $StartDate = "Дата начала";
 $EndDate = "Дата окончания";
 $StartTime = "Время начала";
 $EndTime = "Время окончания";
-$langYouWereCalled = "Вы приглашены на беседу с";
-$langDoYouAccept = "Вы принимаете это?";
+$YouWereCalled = "Вы приглашены на беседу с";
+$DoYouAccept = "Вы принимаете это?";
 $Everybody = "Каждый";
 $SentTo = "Видимый для";
 $Export = "Экспорт";
@@ -334,7 +326,7 @@ $FormHasErrorsPleaseComplete = "Форма содержит неправильн
 $StartDateShouldBeBeforeEndDate = "Дата начала должна быть перед датой окончания";
 $InvalidDate = "Недействительная дата";
 $OnlyLettersAndNumbersAllowed = "Только буквы и цифры разрешены";
-$langBasicOverview = "Сформировать";
+$BasicOverview = "Сформировать";
 $CourseAdminRole = "Администратор курса";
 $UserRole = "Роль";
 $OnlyImagesAllowed = "Разрешены изображения только в формате PNG, JPG или GIF";
@@ -344,16 +336,14 @@ $DeleteRight = "Удалить";
 $OverviewCourseRights = "Просмотр ролей и прав";
 $SeeAllRightsAllLocationsForSpecificRole = "Сосредоточиться на роли";
 $SeeAllRolesAllLocationsForSpecificRight = "Фокус на право (правоту)";
-$langAdvanced = "Построить";
+$Advanced = "Построить";
 $RightValueModified = "Величена была изменена";
 $course_rights = "Просмотр ролей и прав";
 $Visio_conference = "Виртуальная встреча";
 $CourseAdminRoleDescription = "Администратор курса";
-$Move = "Переместить";
 $MoveTo = "Переместить в";
 $Delete = "Удалить";
 $MoveFileTo = "Переместить файл в";
-$Save = "Сохранить";
 $Error = "Ошибка";
 $Anonymous = "Анонимный";
 $h = "ч";
@@ -369,9 +359,9 @@ $YouHaveNewMessage = "У Вас новое сообщение!";
 $myActiveSessions = "Мои активные сессии";
 $myInactiveSessions = "Мои неактивные сессии";
 $FileUpload = "Файл загружается";
-$langMyActiveSessions = "Мои активные Сессии";
-$langMyInActiveSessions = "Мои неактивные Сессии";
-$langMySpace = "Отчет";
+$MyActiveSessions = "Мои активные Сессии";
+$MyInActiveSessions = "Мои неактивные Сессии";
+$MySpace = "Отчет";
 $ExtensionActivedButNotYetOperational = "Это расширение активно, но на настоящий момент им оперировать нельзя";
 $MyStudents = "Мои студенты";
 $Progress = "Прогресс";

+ 89 - 96
main/lang/serbian/trad4all.inc.php

@@ -8,44 +8,42 @@ $NoTimeLimits = "Bez vremenskog ograničenja";
 $Title = "Naslov";
 $UsersOnline = "Online korisnici";
 $Remove = "Ukloni";
-$langEnter = "Nazad na moju listu kurseva";
+$Enter = "Nazad na moju listu kurseva";
 $Description = "Opis";
 $Links = "Linkovi";
-$langWorks = "Publikacije polaznika";
+$Works = "Publikacije polaznika";
 $Forums = "Forumi";
-$langExercices = "Testovi";
-$langCreateDir = "Kreiraj direktorijum";
+$Exercices = "Testovi";
+$CreateDir = "Kreiraj direktorijum";
 $Name = "Ime";
-$langComment = "Komentar";
-$langVisible = "Vidljiv/Nevidljiv";
-$langNewDir = "Ime novog foldera";
-$langDirCr = "Direktorijum je kreiran";
+$Comment = "Komentar";
+$Visible = "Vidljiv/Nevidljiv";
+$NewDir = "Ime novog foldera";
+$DirCr = "Direktorijum je kreiran";
 $Download = "Učitavanje";
-$langGroup = "Grupa";
-$langEdit = "izmeni";
-$langGroupForum = "Forum grupe";
+$Group = "Grupa";
+$Edit = "izmeni";
+$GroupForum = "Forum grupe";
 $Language = "Jezik";
 $LoginName = "Korisničko ime";
 $AutostartMp3 = "Da li želite da se audio datoteka startuje automatski?";
 $Assignments = "publikacije polaznika";
 $Forum = "Forumi";
-$langDelImage = "Ukloni sliku";
-$langCode = "Šifra kursa";
-$langUp = "Gore";
+$DelImage = "Ukloni sliku";
+$Code = "Šifra kursa";
+$Up = "Gore";
 $Down = "dole";
-$Up = "gore";
 $Theme = "Tema";
 $TheListIsEmpty = "Lista je prazna.";
-$langUniqueSelect = "Više ponuđenih odgovora (jedan tačan odgovor)";
-$langCourseCreate = "Kreiranje Web sajta kursa";
-$langTodo = "Treba uraditi";
+$UniqueSelect = "Više ponuđenih odgovora (jedan tačan odgovor)";
+$CourseCreate = "Kreiranje Web sajta kursa";
+$Todo = "Treba uraditi";
 $UserName = "Korisničko ime";
-$lang_show_hide = "Prikaži/Sakrij";
-$langCategoryMod = "Modifikuj kategoriju";
+$CategoryMod = "Modifikuj kategoriju";
 $Hide = "Sakrij";
-$langDear = "Poštovani";
-$langArchive = "Arhiva";
-$langCourseCode = "Šifra kursa";
+$Dear = "Poštovani";
+$Archive = "Arhiva";
+$CourseCode = "Šifra kursa";
 $FirstName = "Ime";
 $LastName = "Prezime";
 $Reporting = "Izveštaji";
@@ -61,58 +59,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "da";
-$langNo = "Ne";
+$Yes = "da";
+$No = "Ne";
 $Next = "Sledeća";
-$langAllowed = "Dozvoljeno";
-$langBackHome = "Nazad na početnu stranicu";
-$langPropositions = "Predlozi za poboljšanje";
-$langMaj = "Ažuriranje";
-$langModify = "modifikuj";
-$langDelete = "obriši";
-$langInvisible = "Napravi nevidljivim";
-$langSave = "Snimi";
-$langMove = "Premesti";
+$Allowed = "Dozvoljeno";
+$BackHome = "Nazad na početnu stranicu";
+$Propositions = "Predlozi za poboljšanje";
+$Maj = "Ažuriranje";
+$Modify = "modifikuj";
+$Invisible = "Napravi nevidljivim";
+$Save = "Snimi";
+$Move = "Premesti";
 $Help = "Pomoć";
-$langOk = "OK";
-$langAdd = "Dodavanje";
-$langAddIntro = "Dodaj uvodni tekst";
-$langBackList = "Povratak na listu";
-$langText = "Tekst";
-$langEmpty = "Ostavili ste neka polja prazna..<br>Koristite <b>Back</b> dugme u vašem pretraživaču i pokušajte ponovo.<br>";
-$langConfirmYourChoice = "Molim Vas, potvrdite vaš izbor";
-$langAnd = "i";
-$langChoice = "Vaš izbor";
-$langFinish = "Završi";
-$langCancel = "Otkaži";
-$langNotAllowed = "Nije dozvoljeno";
-$langNotLogged = "Niste se prijavili na kurs";
-$langManager = "Administrator";
-$langOptional = "Opcionalno";
+$Ok = "OK";
+$Add = "Dodavanje";
+$AddIntro = "Dodaj uvodni tekst";
+$BackList = "Povratak na listu";
+$Text = "Tekst";
+$Empty = "Ostavili ste neka polja prazna..<br>Koristite <b>Back</b> dugme u vašem pretraživaču i pokušajte ponovo.<br>";
+$ConfirmYourChoice = "Molim Vas, potvrdite vaš izbor";
+$And = "i";
+$Choice = "Vaš izbor";
+$Finish = "Završi";
+$Cancel = "Otkaži";
+$NotAllowed = "Nije dozvoljeno";
+$NotLogged = "Niste se prijavili na kurs";
+$Manager = "Administrator";
+$Optional = "Opcionalno";
 $NextPage = "Sledeća stranica";
 $PreviousPage = "Prethodna stranica";
-$langUse = "Upotrebite";
-$langTotal = "Ukupno";
-$langTake = "uzmi";
-$langOne = "Jedan";
-$langSeveral = "Više";
-$langNotice = "Obaveštenje";
-$langDate = "Datum";
-$langAmong = "između";
-$langShow = "Prikaži";
-$langMyCourses = "Moja lista kurseva";
-$langModifyProfile = "Moj profil";
-$langMyStats = "Pogled na moje statistike";
-$langLogout = "Odjava";
-$langMyAgenda = "Moja agenda";
-$langCourseHomepage = "Početna stranica kursa";
-$langCourseManagerview = "Pogled predavača";
-$langStudentView = "Pogled polaznika";
+$Use = "Upotrebite";
+$Total = "Ukupno";
+$Take = "uzmi";
+$One = "Jedan";
+$Several = "Više";
+$Notice = "Obaveštenje";
+$Date = "Datum";
+$Among = "između";
+$Show = "Prikaži";
+$MyCourses = "Moja lista kurseva";
+$ModifyProfile = "Moj profil";
+$MyStats = "Pogled na moje statistike";
+$Logout = "Odjava";
+$MyAgenda = "Moja agenda";
+$CourseHomepage = "Početna stranica kursa";
+$CourseManagerview = "Pogled predavača";
+$StudentView = "Pogled polaznika";
 $AddResource = "Dodaj";
 $AddedResources = "Resursi su dodati";
-$lang_modify_resource = "Izmeni/Dodaj resurse";
-$lang_resource = "Resurs";
-$lang_resources = "Resursi";
 $langNameOfLang['arabic'] = "arapski";
 $langNameOfLang['brazilian'] = "brazilski";
 $langNameOfLang['bulgarian'] = "bugarski";
@@ -136,26 +130,26 @@ $langNameOfLang['russian'] = "ruski";
 $langNameOfLang['simpl_chinese'] = "kineski";
 $langNameOfLang['spanish'] = "španski";
 $Close = "zatvori";
-$langPlatform = "Platforma";
+$Platform = "Platforma";
 $localLangName = "jezik";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Takva šifra kursa već postoji. Molim Vas, izaberite drugu.";
+$CourseCodeAlreadyExists = "Takva šifra kursa već postoji. Molim Vas, izaberite drugu.";
 $Statistics = "Statistike";
-$langGrouplist = "Lista grupa";
-$langPrevious = "prethodna";
+$Grouplist = "Lista grupa";
+$Previous = "prethodna";
 $Courses = "kursevi";
 $In = "u";
-$langShowAll = "Prikaži sve";
-$langPage = "Stranica";
+$ShowAll = "Prikaži sve";
+$Page = "Stranica";
 $englishLangName = "engleski";
 $Home = "Početak";
-$langAreYouSureToDelete = "Da li ste sigurni da želite da obrišete";
+$AreYouSureToDelete = "Da li ste sigurni da želite da obrišete";
 $SelectAll = "Izaberi sve";
 $UnSelectAll = "deselktuj sve";
 $WithSelected = "Sa selektovanim";
-$langOnLine = "Online";
-$langUsers = "Korisnici";
-$langPlatformAdmin = "Platforma za administraciju";
+$OnLine = "Online";
+$Users = "Korisnici";
+$PlatformAdmin = "Platforma za administraciju";
 $langNameOfLang['hungarian'] = "ma&#273;arski";
 $langNameOfLang['indonesian'] = "indonezijski";
 $langNameOfLang['malay'] = "malezijski";
@@ -166,21 +160,20 @@ $langNameOfLang['thai'] = "tajlandski";
 $langNameOfLang['turkce'] = "turski";
 $langNameOfLang['vietnamese'] = "vijetnamski";
 $UserInfo = "informacija o korisniku";
-$langModifyQuestion = "Izmena putanja";
-$langCheckAll = "Proveri sve";
-$langNbAnnoucement = "Obaveštenje";
-$lang_no_access_here = "Nije dozvoljen pristup";
-$langOtherCourses = "drugi kursevi";
+$ModifyQuestion = "Izmena putanja";
+$CheckAll = "Proveri sve";
+$NbAnnoucement = "Obaveštenje";
+$OtherCourses = "drugi kursevi";
 $Doc = "dokument";
 $PlataformAdmin = "Administratorska platforma";
 $Groups = "Grupe";
 $GroupManagement = "Administracija grupe";
 $All = "Sve";
 $None = "nijedan";
-$langSorry = "Prvo selektujte kurs";
-$langDenied = "Ova opcija je dostupna samo administratorima kursa";
+$Sorry = "Prvo selektujte kurs";
+$Denied = "Ova opcija je dostupna samo administratorima kursa";
 $Today = "danas";
-$langCourseHomepageLink = "Tekući kurs";
+$CourseHomepageLink = "Tekući kurs";
 $Attachment = "prilog";
 $User = "Koristnik";
 $MondayInit = "P";
@@ -240,10 +233,10 @@ $SeptemberLong = "Septembar";
 $OctoberLong = "Oktobar";
 $NovemberLong = "Novembar";
 $DecemberLong = "Decembar";
-$langMyCompetences = "Moje kompetencije";
-$langMyDiplomas = "Moje diplome";
-$langMyPersonalOpenArea = "Moja lična oblasti interesovanja";
-$langMyTeach = "Šta sam u mogućnosti da predajem";
+$MyCompetences = "Moje kompetencije";
+$MyDiplomas = "Moje diplome";
+$MyPersonalOpenArea = "Moja lična oblasti interesovanja";
+$MyTeach = "Šta sam u mogućnosti da predajem";
 $Agenda = "Agenda";
 $HourShort = "h";
 $PleaseTryAgain = "Molim Vas, probajte ponovo!";
@@ -253,7 +246,7 @@ $UplNotAZip = "Fajl koji ste selektovali nije zip fajl.";
 $UplUploadSucceeded = "Uspešno učitavanje fajla!";
 $ExportAsCSV = "Izvezi kao CSV fajl";
 $ExportAsXLS = "Izvezi kao XLS fajl";
-$langOpenarea = "Lično otvoreno okruženje";
+$Openarea = "Lično otvoreno okruženje";
 $Done = "Završeno";
 $Documents = "Dokumenta";
 $DocumentAdded = "Dokument je dodat";
@@ -266,7 +259,7 @@ $Link = "Link";
 $Announcement = "Obaveštenja";
 $Dropbox = "Dropbox";
 $Quiz = "Vežbe";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Konferencija";
 $Student_publication = "Publikacije polaznika";
 $Tracking = "Praćenje";
@@ -279,8 +272,8 @@ $StartDate = "Datum početka";
 $EndDate = "Datum kraja";
 $StartTime = "Vreme početka";
 $EndTime = "Vreme kraja";
-$langYouWereCalled = "Pozvani ste da chat-ujete sa";
-$langDoYouAccept = "Da li prihvatate?";
+$YouWereCalled = "Pozvani ste da chat-ujete sa";
+$DoYouAccept = "Da li prihvatate?";
 $Everybody = "Svi";
 $SentTo = "Poslato";
 $Export = "Izvezi";
@@ -317,7 +310,7 @@ $RightValueModified = "Vrednost je izmenjena.";
 $course_rights = "Pregled uloga i privilegija";
 $CourseAdminRoleDescription = "Administrator kursa";
 $CampusHomepage = "Početna stranica";
-$langMySpace = "Izveštaj";
+$MySpace = "Izveštaj";
 $Phone = "Telefon";
 $CourseSettings = "Podešavanje kursa";
 $EmailNotifications = "Obaveštenja e-mailom";

+ 97 - 107
main/lang/simpl_chinese/trad4all.inc.php

@@ -10,55 +10,53 @@ $Title = "标题";
 $By = "By";
 $UsersOnline = "在线用户";
 $Remove = "删除";
-$langEnter = "返回课程列表";
+$Enter = "返回课程列表";
 $Description = "简介";
 $Links = "链接";
-$langWorks = "作业论文";
+$Works = "作业论文";
 $Forums = "学习论坛";
-$langExercices = "测验";
-$langCreateDir = "创建目录";
+$Exercices = "测验";
+$CreateDir = "创建目录";
 $Name = "名称";
-$langComment = "摘要";
-$langVisible = "显示/隐藏";
-$langNewDir = "新文件夹名称";
-$langDirCr = "目录已经创建";
+$Comment = "摘要";
+$Visible = "显示/隐藏";
+$NewDir = "新文件夹名称";
+$DirCr = "目录已经创建";
 $Download = "下载";
-$langGroup = "小组";
-$langEdit = "编辑";
-$langGroupForum = "小组论坛";
+$Group = "小组";
+$Edit = "编辑";
+$GroupForum = "小组论坛";
 $Language = "语言";
 $LoginName = "登录名";
 $AutostartMp3 = "MP3文件需要自动播放吗?";
 $Assignments = "学生作业";
 $Forum = "论坛";
-$langDelImage = "移除图片";
-$langCode = "代码";
-$langUp = "向上";
-$Down = "向下";
+$DelImage = "移除图片";
+$Code = "代码";
 $Up = "向上";
+$Down = "向下";
 $Theme = "图形主题";
 $TheListIsEmpty = "列表为空.";
-$langUniqueSelect = "单选题";
+$UniqueSelect = "单选题";
 $CreateCategory = "创建分类";
 $SendFile = "上传文档";
 $SaveChanges = "保存修改";
 $SearchTerm = "搜索词语";
 $TooShort = "太短";
-$langCourseCreate = "创建课程";
-$langTodo = "您的建议";
+$CourseCreate = "创建课程";
+$Todo = "您的建议";
 $UserName = "用户名";
-$lang_show_hide = "显示/隐藏";
-$langCategoryMod = "修改分类";
+$CategoryMod = "修改分类";
 $Hide = "隐藏";
-$langDear = "尊敬的";
-$langArchive = "存档";
-$langCourseCode = "课程编号";
-$langNoDescription = "无形容";
-$langOfficialCode = "编号";
+$Dear = "尊敬的";
+$Archive = "存档";
+$CourseCode = "课程编号";
+$NoDescription = "无形容";
+$OfficialCode = "编号";
 $FirstName = "姓";
 $LastName = "名";
 $Status = "状态";
-$langEmail = "电子邮件";
+$Email = "电子邮件";
 $SlideshowConversion = "转换幻灯片";
 $UploadFile = "上传文件";
 $AvailableFrom = "可用";
@@ -68,7 +66,6 @@ $Type = "类型";
 $EmailAddress = "邮件地址";
 $Organisation = "住址机构(单位)";
 $Reporting = "报告";
-$Code = "代码";
 $Update = "更新";
 $SelectQuestionType = "选择问题类型";
 $CurrentCourse = "当前课程";
@@ -98,58 +95,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "确定";
-$langNo = "否";
+$Yes = "确定";
+$No = "否";
 $Next = "下一步";
-$langAllowed = "允许";
-$langBackHome = "返回主页";
-$langPropositions = "提出建议";
-$langMaj = "更新";
-$langModify = "修改";
-$langDelete = "删除";
-$langInvisible = "隐蒇";
-$langSave = "保存";
-$langMove = "移动";
+$Allowed = "允许";
+$BackHome = "返回主页";
+$Propositions = "提出建议";
+$Maj = "更新";
+$Modify = "修改";
+$Invisible = "隐蒇";
+$Save = "保存";
+$Move = "移动";
 $Help = "帮助";
-$langOk = "确定";
-$langAdd = "添加";
-$langAddIntro = "添加介绍文本";
-$langBackList = "返回列表";
-$langText = "内容";
-$langEmpty = "有些项目没有填写。<br /><b>返回重试</b>。<br />如果不想填写课程代码,请参考教学大纲";
-$langConfirmYourChoice = "确定您的选择吗?";
-$langAnd = "和";
-$langChoice = "选择答案";
-$langFinish = "完成";
-$langCancel = "取消";
-$langNotAllowed = "禁用";
-$langNotLogged = "你并没有登录一项课程";
-$langManager = "管理员";
-$langOptional = "可选";
+$Ok = "确定";
+$Add = "添加";
+$AddIntro = "添加介绍文本";
+$BackList = "返回列表";
+$Text = "内容";
+$Empty = "有些项目没有填写。<br /><b>返回重试</b>。<br />如果不想填写课程代码,请参考教学大纲";
+$ConfirmYourChoice = "确定您的选择吗?";
+$And = "和";
+$Choice = "选择答案";
+$Finish = "完成";
+$Cancel = "取消";
+$NotAllowed = "禁用";
+$NotLogged = "你并没有登录一项课程";
+$Manager = "管理员";
+$Optional = "可选";
 $NextPage = "下一页";
 $PreviousPage = "上一页";
-$langUse = "使用";
-$langTotal = "总计";
-$langTake = "参与";
-$langOne = "一个";
-$langSeveral = "多个";
-$langNotice = "注意";
-$langDate = "日期";
-$langAmong = "在";
-$langShow = "显示";
-$langMyCourses = "我的课程";
-$langModifyProfile = "个人资料";
-$langMyStats = "查看状态";
-$langLogout = "退出";
-$langMyAgenda = "日程安排";
-$langCourseHomepage = "课程主页";
-$langCourseManagerview = "教师视角";
-$langStudentView = "学生视角";
+$Use = "使用";
+$Total = "总计";
+$Take = "参与";
+$One = "一个";
+$Several = "多个";
+$Notice = "注意";
+$Date = "日期";
+$Among = "在";
+$Show = "显示";
+$MyCourses = "我的课程";
+$ModifyProfile = "个人资料";
+$MyStats = "查看状态";
+$Logout = "退出";
+$MyAgenda = "日程安排";
+$CourseHomepage = "课程主页";
+$CourseManagerview = "教师视角";
+$StudentView = "学生视角";
 $AddResource = "添加";
 $AddedResources = "附件";
-$lang_modify_resource = "修改/添加资源";
-$lang_resource = "资源";
-$lang_resources = "资源";
 $langNameOfLang['arabic'] = "阿拉伯语";
 $langNameOfLang['brazilian'] = "巴西语";
 $langNameOfLang['bulgarian'] = "保加利亚语";
@@ -173,27 +166,27 @@ $langNameOfLang['russian'] = "俄语";
 $langNameOfLang['simpl_chinese'] = "简体中文";
 $langNameOfLang['spanish'] = "西班牙语";
 $Close = "关闭";
-$langPlatform = "系统";
+$Platform = "系统";
 $localLangName = "语言";
 $email = "电子邮件";
-$langCourseCodeAlreadyExists = "对不起,课程代码已经存在,请选择另外一个";
+$CourseCodeAlreadyExists = "对不起,课程代码已经存在,请选择另外一个";
 $Statistics = "统计";
-$langGrouplist = "群组列表";
-$langPrevious = "上一步";
+$Grouplist = "群组列表";
+$Previous = "上一步";
 $DestDirectoryDoesntExist = "目标文件夹不存在";
 $Courses = "课程";
 $In = "在";
-$langShowAll = "全部显示";
-$langPage = "页";
+$ShowAll = "全部显示";
+$Page = "页";
 $englishLangName = "English";
 $Home = "主页";
-$langAreYouSureToDelete = "确定要删除";
+$AreYouSureToDelete = "确定要删除";
 $SelectAll = "选全部";
 $UnSelectAll = "放弃全选";
 $WithSelected = "已选定";
-$langOnLine = "在线";
-$langUsers = "用户";
-$langPlatformAdmin = "系统管理";
+$OnLine = "在线";
+$Users = "用户";
+$PlatformAdmin = "系统管理";
 $langNameOfLang['hungarian'] = "匈牙利语";
 $langNameOfLang['indonesian'] = "印尼语群";
 $langNameOfLang['malay'] = "马来语";
@@ -204,21 +197,20 @@ $langNameOfLang['thai'] = "泰国语";
 $langNameOfLang['turkce'] = "土耳其语";
 $langNameOfLang['vietnamese'] = "越南语";
 $UserInfo = "用户信息";
-$langModifyQuestion = "修改题目";
-$langCheckAll = "全部选定";
-$langNbAnnoucement = "通知";
-$lang_no_access_here = "不开放";
-$langOtherCourses = "其它课程";
+$ModifyQuestion = "修改题目";
+$CheckAll = "全部选定";
+$NbAnnoucement = "通知";
+$OtherCourses = "其它课程";
 $Doc = "文档";
 $PlataformAdmin = "平台管理";
 $Groups = "小组";
 $GroupManagement = "小组管理";
 $All = "所有";
 $None = "没有";
-$langSorry = "请先选择一门课程";
-$langDenied = "拒绝";
+$Sorry = "请先选择一门课程";
+$Denied = "拒绝";
 $Today = "今天";
-$langCourseHomepageLink = "课程首页";
+$CourseHomepageLink = "课程首页";
 $Attachment = "附件";
 $User = "用户";
 $MondayInit = "周一";
@@ -278,10 +270,10 @@ $SeptemberLong = "九月";
 $OctoberLong = "十月";
 $NovemberLong = "十一月";
 $DecemberLong = "十二月";
-$langMyCompetences = "我的能力";
-$langMyDiplomas = "我的证书";
-$langMyPersonalOpenArea = "我的个人开放区域";
-$langMyTeach = "我能教什么";
+$MyCompetences = "我的能力";
+$MyDiplomas = "我的证书";
+$MyPersonalOpenArea = "我的个人开放区域";
+$MyTeach = "我能教什么";
 $Agenda = "日程";
 $HourShort = "时";
 $PleaseTryAgain = "请重试!";
@@ -291,7 +283,7 @@ $UplNotAZip = "你选定的文件不是压缩文件.";
 $UplUploadSucceeded = "文件上传成功!";
 $ExportAsCSV = "导出为CSV 文件";
 $ExportAsXLS = "导出为 XLS 文件";
-$langOpenarea = "个人开放区";
+$Openarea = "个人开放区";
 $Done = "完成";
 $Documents = "文件";
 $DocumentAdded = "添加文档";
@@ -304,7 +296,7 @@ $Link = "链接";
 $Announcement = "通知";
 $Dropbox = "投递箱";
 $Quiz = "测试";
-$langChat = "聊天";
+$Chat = "聊天";
 $Conference = "会议";
 $Student_publication = "学生的作业";
 $Tracking = "学习跟踪";
@@ -317,8 +309,8 @@ $StartDate = "开始日期";
 $EndDate = "结束日期";
 $StartTime = "开始时间";
 $EndTime = "结束时间";
-$langYouWereCalled = "你应邀聊天, 邀请人";
-$langDoYouAccept = "是否同意?";
+$YouWereCalled = "你应邀聊天, 邀请人";
+$DoYouAccept = "是否同意?";
 $Everybody = "所有人";
 $SentTo = "显示给";
 $Export = "导出";
@@ -342,7 +334,7 @@ $FormHasErrorsPleaseComplete = "资料输入错误或不完整. 请重新检查.
 $StartDateShouldBeBeforeEndDate = "第一个日期必须在结束日期之前";
 $InvalidDate = "非法日期";
 $OnlyLettersAndNumbersAllowed = "只允许字母和数字";
-$langBasicOverview = "基本";
+$BasicOverview = "基本";
 $CourseAdminRole = "课程管理员";
 $UserRole = "角色";
 $OnlyImagesAllowed = "只允许PNG, JPG 或 GIF 格式的图片";
@@ -352,16 +344,14 @@ $DeleteRight = "删除";
 $OverviewCourseRights = "查看角色和权限";
 $SeeAllRightsAllLocationsForSpecificRole = "以角色为准";
 $SeeAllRolesAllLocationsForSpecificRight = "以权限为准";
-$langAdvanced = "高级";
+$Advanced = "高级";
 $RightValueModified = "值已被修改。";
 $course_rights = "查看角色和权限";
 $Visio_conference = "视频会议";
 $CourseAdminRoleDescription = "课程管理员";
-$Move = "搬移";
 $MoveTo = "移到";
 $Delete = "删除";
 $MoveFileTo = "文件搬移到";
-$Save = "保存";
 $Error = "错误";
 $Anonymous = "匿名";
 $h = "时";
@@ -377,9 +367,9 @@ $YouHaveNewMessage = "你有一个新信息!";
 $myActiveSessions = "我的活跃会话";
 $myInactiveSessions = "我的不活跃会话";
 $FileUpload = "文件上传";
-$langMyActiveSessions = "我的活跃会话";
-$langMyInActiveSessions = "我的不活跃会话";
-$langMySpace = "学习进度";
+$MyActiveSessions = "我的活跃会话";
+$MyInActiveSessions = "我的不活跃会话";
+$MySpace = "学习进度";
 $ExtensionActivedButNotYetOperational = "此扩展已经被激活,但是现在不可用";
 $MyStudents = "我的学员";
 $Progress = "进度";
@@ -586,7 +576,7 @@ $AssessmentQuestions = "用户将如何评价? 用什么样的方法才使用户
 $AssessmentInformation = "举例测试问题. 正确标准. 提示以及窍门.";
 $UploadADocument = "上传文档";
 $Metadata = "元数据";
-$langAddMetadata = "查看/编辑 元数据";
+$AddMetadata = "查看/编辑 元数据";
 $TabsDashboard = "资料卡";
 $Dashboard = "资料卡";
 $DashboardPlugins = "资料卡插件";

+ 97 - 107
main/lang/slovak/trad4all.inc.php

@@ -217,55 +217,53 @@ $Title = "Nadpis";
 $By = "Od";
 $UsersOnline = "Používatelia online";
 $Remove = "Odstrániť";
-$langEnter = "Späť na zoznam mojích kurzov";
+$Enter = "Späť na zoznam mojích kurzov";
 $Description = "Popis";
 $Links = "Odkazy";
-$langWorks = "Publikácie študentov";
+$Works = "Publikácie študentov";
 $Forums = "Fórum";
-$langExercices = "Testy";
-$langCreateDir = "Vytvoriť zložku";
+$Exercices = "Testy";
+$CreateDir = "Vytvoriť zložku";
 $Name = "Názov";
-$langComment = "Komentár";
-$langVisible = "Viditelný/neviditelný";
-$langNewDir = "Názov nového priečinku";
-$langDirCr = "Zložka vytvorená";
+$Comment = "Komentár";
+$Visible = "Viditelný/neviditelný";
+$NewDir = "Názov nového priečinku";
+$DirCr = "Zložka vytvorená";
 $Download = "Stiahnutie";
-$langGroup = "Skupina";
-$langEdit = "Upraviť";
-$langGroupForum = "Diskusná skupina";
+$Group = "Skupina";
+$Edit = "Upraviť";
+$GroupForum = "Diskusná skupina";
 $Language = "Jazyk";
 $LoginName = "Prihlasovacie meno";
 $AutostartMp3 = "Kliknite na OK, ak si želáte, aby bol zvukový súbor spustený automaticky.";
 $Assignments = "Zadania";
 $Forum = "Fórum";
-$langDelImage = "Odstrániť obrázok";
-$langCode = "Kód kurzu";
-$langUp = "Hore";
-$Down = "Dole";
+$DelImage = "Odstrániť obrázok";
+$Code = "Kód kurzu";
 $Up = "Hore";
+$Down = "Dole";
 $Theme = "Téma";
 $TheListIsEmpty = "Prázdny zoznam";
-$langUniqueSelect = "Výber z viacerých možností (jediná správna odpoveď)";
+$UniqueSelect = "Výber z viacerých možností (jediná správna odpoveď)";
 $CreateCategory = "Vytvoriť priečinok";
 $SendFile = "Upload dokumentu";
 $SaveChanges = "Uložiť zmeny";
 $SearchTerm = "Vyhľadať výraz";
 $TooShort = "Príliš krátke";
-$langCourseCreate = "Vytvoriť kurz";
-$langTodo = "Urobiť";
+$CourseCreate = "Vytvoriť kurz";
+$Todo = "Urobiť";
 $UserName = "Prihlasovacie meno";
-$lang_show_hide = "Ukázať / skryť";
-$langCategoryMod = "Zmeniť kategóriu";
+$CategoryMod = "Zmeniť kategóriu";
 $Hide = "Skryť";
-$langDear = "Vážená(ý)";
-$langArchive = "archív";
-$langCourseCode = "Kód kurzu";
-$langNoDescription = "Žiadny popis";
-$langOfficialCode = "Oficiálny kód";
+$Dear = "Vážená(ý)";
+$Archive = "archív";
+$CourseCode = "Kód kurzu";
+$NoDescription = "Žiadny popis";
+$OfficialCode = "Oficiálny kód";
 $FirstName = "Krstné meno";
 $LastName = "Priezvisko";
 $Status = "Stav";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $SlideshowConversion = "Konverzia pre slideshow";
 $UploadFile = "Nahratie súboru";
 $AvailableFrom = "Prístupný od";
@@ -275,7 +273,6 @@ $Type = "Typ";
 $EmailAddress = "E-mailová adresa";
 $Organisation = "Organizácia";
 $Reporting = "Hlásenie";
-$Code = "Kód";
 $Update = "Aktualizovať";
 $SelectQuestionType = "Zvoľte typ otázky";
 $CurrentCourse = "Aktuálny kurz";
@@ -305,58 +302,54 @@ $dateFormatShort = "%d %b, %y";
 $dateFormatLong = "%A %d %B, %Y";
 $dateTimeFormatLong = "%d %B, %Y o %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "Áno";
-$langNo = "Nie";
+$Yes = "Áno";
+$No = "Nie";
 $Next = "Ďalej";
-$langAllowed = "Povolené";
-$langBackHome = "Späť na domovskú stránku";
-$langPropositions = "Návrhy na zlepšenie";
-$langMaj = "Aktualizovať";
-$langModify = "Upraviť";
-$langDelete = "zmazať";
-$langInvisible = "skryť";
-$langSave = "Uložiť";
-$langMove = "Presunúť";
+$Allowed = "Povolené";
+$BackHome = "Späť na domovskú stránku";
+$Propositions = "Návrhy na zlepšenie";
+$Maj = "Aktualizovať";
+$Modify = "Upraviť";
+$Invisible = "skryť";
+$Save = "Uložiť";
+$Move = "Presunúť";
 $Help = "Pomoc";
-$langOk = "OK";
-$langAdd = "Pridať";
-$langAddIntro = "Pridať úvodný text";
-$langBackList = "Späť na zoznam";
-$langText = "Text";
-$langEmpty = "Nevyplnili ste niektore políčka.<br>Pomocou gombíka  <b>Späť</b> vo vašom prehliadači sa vráťte a skúste to znovu.<br>If you ignore your course code, see the Course Program";
-$langConfirmYourChoice = "Prosím potvrdiť voľbu";
-$langAnd = "a";
-$langChoice = "Vaša voľba";
-$langFinish = "Ukončiť";
-$langCancel = "Zrušiť";
-$langNotAllowed = "Nepovolené";
-$langNotLogged = "Neprihlásený do kurzu";
-$langManager = "Správca";
-$langOptional = "Volitelné";
+$Ok = "OK";
+$Add = "Pridať";
+$AddIntro = "Pridať úvodný text";
+$BackList = "Späť na zoznam";
+$Text = "Text";
+$Empty = "Nevyplnili ste niektore políčka.<br>Pomocou gombíka  <b>Späť</b> vo vašom prehliadači sa vráťte a skúste to znovu.<br>If you ignore your course code, see the Course Program";
+$ConfirmYourChoice = "Prosím potvrdiť voľbu";
+$And = "a";
+$Choice = "Vaša voľba";
+$Finish = "Ukončiť";
+$Cancel = "Zrušiť";
+$NotAllowed = "Nepovolené";
+$NotLogged = "Neprihlásený do kurzu";
+$Manager = "Správca";
+$Optional = "Volitelné";
 $NextPage = "Nasledujúca strana";
 $PreviousPage = "Predošlá strana";
-$langUse = "Použité";
-$langTotal = "Celkový";
-$langTake = "vziať";
-$langOne = "Jeden";
-$langSeveral = "Niekoľko";
-$langNotice = "Oznam";
-$langDate = "Dátum";
-$langAmong = "medzi";
-$langShow = "Ukáž";
-$langMyCourses = "Moje kurzy";
-$langModifyProfile = "Môj profil";
-$langMyStats = "Pozrieť moju štatistiku";
-$langLogout = "Odhlásenie";
-$langMyAgenda = "Moja agenda";
-$langCourseHomepage = "Domov kurzu";
-$langCourseManagerview = "Náhľad lektora";
-$langStudentView = "Náhľad študenta";
+$Use = "Použité";
+$Total = "Celkový";
+$Take = "vziať";
+$One = "Jeden";
+$Several = "Niekoľko";
+$Notice = "Oznam";
+$Date = "Dátum";
+$Among = "medzi";
+$Show = "Ukáž";
+$MyCourses = "Moje kurzy";
+$ModifyProfile = "Môj profil";
+$MyStats = "Pozrieť moju štatistiku";
+$Logout = "Odhlásenie";
+$MyAgenda = "Moja agenda";
+$CourseHomepage = "Domov kurzu";
+$CourseManagerview = "Náhľad lektora";
+$StudentView = "Náhľad študenta";
 $AddResource = "Pridať zdroj";
 $AddedResources = "Pridané zdroje";
-$lang_modify_resource = "Upraviť / pridať zdroj";
-$lang_resource = "Zdroj";
-$lang_resources = "Zdroje";
 $langNameOfLang['arabic'] = "arabsky";
 $langNameOfLang['brazilian'] = "brazílsky";
 $langNameOfLang['bulgarian'] = "bulharsky";
@@ -380,27 +373,27 @@ $langNameOfLang['russian'] = "rusky";
 $langNameOfLang['simpl_chinese'] = "&#269;ínsky";
 $langNameOfLang['spanish'] = "španielsky";
 $Close = "zavriet";
-$langPlatform = "Platforma";
+$Platform = "Platforma";
 $localLangName = "jazyk";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Prepáčte, ale tento kód kurzu je už použitý. Zvolte prosím iný.";
+$CourseCodeAlreadyExists = "Prepáčte, ale tento kód kurzu je už použitý. Zvolte prosím iný.";
 $Statistics = "Štatistika";
-$langGrouplist = "Zoznam skupín";
-$langPrevious = "Predošlý";
+$Grouplist = "Zoznam skupín";
+$Previous = "Predošlý";
 $DestDirectoryDoesntExist = "Cieľová zložka neexistuje";
 $Courses = "Kurzy";
 $In = "v";
-$langShowAll = "Ukáž všetko";
-$langPage = "Strana";
+$ShowAll = "Ukáž všetko";
+$Page = "Strana";
 $englishLangName = "Anglicky";
 $Home = "Domov";
-$langAreYouSureToDelete = "Naozaj to chcete zmazať?";
+$AreYouSureToDelete = "Naozaj to chcete zmazať?";
 $SelectAll = "Označiť všetko";
 $UnSelectAll = "Odznačiť všetko";
 $WithSelected = "Označené";
-$langOnLine = "Online";
-$langUsers = "Používatelia";
-$langPlatformAdmin = "Administrácia platformy";
+$OnLine = "Online";
+$Users = "Používatelia";
+$PlatformAdmin = "Administrácia platformy";
 $langNameOfLang['hungarian'] = "ma&#271;arsky";
 $langNameOfLang['indonesian'] = "indonézsky";
 $langNameOfLang['malay'] = "malajsky";
@@ -411,22 +404,21 @@ $langNameOfLang['thai'] = "thajsky";
 $langNameOfLang['turkce'] = "turecky";
 $langNameOfLang['vietnamese'] = "vietnamsky";
 $UserInfo = "informácie o používateľovi";
-$langModifyQuestion = "Zmeniť otázku";
+$ModifyQuestion = "Zmeniť otázku";
 $Example = "Príklad";
-$langCheckAll = "Zaškrtnúť všetko";
-$langNbAnnoucement = "Oznam";
-$lang_no_access_here = "Bez prístupu";
-$langOtherCourses = "ostatné kurzy";
+$CheckAll = "Zaškrtnúť všetko";
+$NbAnnoucement = "Oznam";
+$OtherCourses = "ostatné kurzy";
 $Doc = "Dokument";
 $PlataformAdmin = "Administrátor platformy";
 $Groups = "Skupiny";
 $GroupManagement = "Správa skupín";
 $All = "Všetko";
 $None = "Žiadny";
-$langSorry = "Najskôr vyberte kurz";
-$langDenied = "Táto funkcia je prístupná len administrátorom kurzu";
+$Sorry = "Najskôr vyberte kurz";
+$Denied = "Táto funkcia je prístupná len administrátorom kurzu";
 $Today = "dnes";
-$langCourseHomepageLink = "Domovská stránka kurzu";
+$CourseHomepageLink = "Domovská stránka kurzu";
 $Attachment = "príloha";
 $User = "Používateľ";
 $MondayInit = "P";
@@ -486,10 +478,10 @@ $SeptemberLong = "September";
 $OctoberLong = "Október";
 $NovemberLong = "November";
 $DecemberLong = "December";
-$langMyCompetences = "Moja kvalifikácia";
-$langMyDiplomas = "Moje diplomy";
-$langMyPersonalOpenArea = "Môj osobný priestor";
-$langMyTeach = "Čo môžem učiť";
+$MyCompetences = "Moja kvalifikácia";
+$MyDiplomas = "Moje diplomy";
+$MyPersonalOpenArea = "Môj osobný priestor";
+$MyTeach = "Čo môžem učiť";
 $Agenda = "Agenda";
 $HourShort = "h";
 $PleaseTryAgain = "Prosím skus znovu!";
@@ -499,7 +491,7 @@ $UplNotAZip = "Vybraný súbor nie zip archív.";
 $UplUploadSucceeded = "Súbor uložený úspešne!";
 $ExportAsCSV = "Exportovať ako súbor CSV";
 $ExportAsXLS = "Exportovať ako súbor XLS";
-$langOpenarea = "Osobná zóna";
+$Openarea = "Osobná zóna";
 $Done = "Hotovo";
 $Documents = "Dokumenty";
 $DocumentAdded = "Dokument bol pridaný";
@@ -513,7 +505,7 @@ $Link = "Odkazy";
 $Announcement = "Oznamy";
 $Dropbox = "Dropbox";
 $Quiz = "Kvíz";
-$langChat = "Konverzácia";
+$Chat = "Konverzácia";
 $Conference = "Konferencia";
 $Student_publication = "Publikácie študentov";
 $Tracking = "Štatistika";
@@ -526,8 +518,8 @@ $StartDate = "Dátum začiatku";
 $EndDate = "Dátum konca";
 $StartTime = "Čas začiatku";
 $EndTime = "Čas konca";
-$langYouWereCalled = "Na konverzáciu Vás pozýva";
-$langDoYouAccept = "Akceptujete to?";
+$YouWereCalled = "Na konverzáciu Vás pozýva";
+$DoYouAccept = "Akceptujete to?";
 $Everybody = "Všetci";
 $SentTo = "Viditeľný pre";
 $Export = "Export";
@@ -551,7 +543,7 @@ $FormHasErrorsPleaseComplete = "Formulár obsahuje nesprávne alebo neúplné ú
 $StartDateShouldBeBeforeEndDate = "Začiatočný dátum musí byť pred dátumom konca";
 $InvalidDate = "Nesprávny dátum";
 $OnlyLettersAndNumbersAllowed = "Povolené sú len čísla a písmená.";
-$langBasicOverview = "Usporiadať";
+$BasicOverview = "Usporiadať";
 $CourseAdminRole = "Administrátor kurzu";
 $UserRole = "Rola";
 $OnlyImagesAllowed = "Povolené len obrázky typu PNG, JPG alebo GIF";
@@ -561,16 +553,14 @@ $DeleteRight = "Mazať";
 $OverviewCourseRights = "Roles & prehľad práv";
 $SeeAllRightsAllLocationsForSpecificRole = "Prehľad pšetkých práv pre rolu";
 $SeeAllRolesAllLocationsForSpecificRight = "Zobraziť všetky funkcie a oblasti pre špecifické právo";
-$langAdvanced = "Vytvoriť";
+$Advanced = "Vytvoriť";
 $RightValueModified = "Hodnota bola zmenená.";
 $course_rights = "Prehlad rolí & práv";
 $Visio_conference = "Virtuálne stretnutie";
 $CourseAdminRoleDescription = "Administrátor kurzu";
-$Move = "Presunúť";
 $MoveTo = "Presunúť do";
 $Delete = "Zmazať";
 $MoveFileTo = "Presunúť súbor do";
-$Save = "Uložiť";
 $Error = "Chyba";
 $Anonymous = "Anonymný";
 $h = "h";
@@ -586,9 +576,9 @@ $YouHaveNewMessage = "Máte novú správu!";
 $myActiveSessions = "Moje aktívne stretnutia";
 $myInactiveSessions = "Moje neaktívne stretnutia";
 $FileUpload = "Nahranie súboru";
-$langMyActiveSessions = "Moje aktívne stretnutia";
-$langMyInActiveSessions = "Moje neaktívne stretnutia";
-$langMySpace = "Hlásenie";
+$MyActiveSessions = "Moje aktívne stretnutia";
+$MyInActiveSessions = "Moje neaktívne stretnutia";
+$MySpace = "Hlásenie";
 $ExtensionActivedButNotYetOperational = "Rozšírenie bolo aktivované ale zatiaľ nemôže byť použité.";
 $MyStudents = "Moji študenti";
 $Progress = "Postup";
@@ -1006,7 +996,7 @@ $InvitationDenied = "Pozvanie odmietnuté";
 $UserAdded = "Používateľ je pridaný";
 $UpdatedIn = "Aktualizované";
 $Metadata = "Metadáta";
-$langAddMetadata = "Zobraziť/Upraviť Metadáta";
+$AddMetadata = "Zobraziť/Upraviť Metadáta";
 $SendMessage = "Poslať správu";
 $SeeForum = "Prezrieť fórum";
 $SeeMore = "Viac";

+ 1 - 0
main/lang/slovenian/install.inc.php

@@ -2,6 +2,7 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$YourLanguageNotThereContactUs = "Ne najdete svojega jezika na seznamu? Kontaktirajte nas preko e-poštnega naslova info@chamilo.org in prispevajte k razvoju platforme kot prevajalec.";
 $DateTimezoneSettingNotSet = "Detektirano je bilo, da vaša nastavitev PHP ne definira vrednosti date.timezone. Ta je zahtevana s strani Chamilo. Dodajte nastavitev v vaš php.ini, sicer lahko med izvajanjem nekaterih skript prihaja do problemov. Bili ste opozorjeni !";
 $langStatDB = "Sledenje DB.  Uporabno le pri večih DB";
 $langEnableTracking = "Omogoči sledenje";

+ 116 - 107
main/lang/slovenian/trad4all.inc.php

@@ -2,6 +2,22 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$CosecantCsc = "Kosekant:\t\t\t\tcsc(x)";
+$HyperbolicCosecantCsch = "Hiperbolični kosekant:\t\tcsch(x)";
+$SecantSec = "Sekant:\t\t\t\tsec(x)";
+$HyperbolicSecantSech = "Hiperbolični sekant:\t\tsech(x)";
+$CotangentCot = "Kotanges:\t\t\tcot(x)";
+$HyperbolicCotangentCoth = "Hiperbolični kotanges:\t\tcoth(x)";
+$HelpCookieUsageValidation = "Za delovanje te strani in beleženje statistike uporabe vsebine, platforma uporablja piškotke. Nastavitve obravnave piškotkov v brskalniku lahko spremenite v brskalniku samem. Za več informacij o piškotkih obiščite stran <a href=\"http://www.aboutcookies.org/\">About Cookies</a>.";
+$YouAcceptCookies = "Z nadaljno rabo te strani, predpostavimo, se strinjate z uporabo piškotkov na teh stranem.";
+$TemplateCertificateComment = "Primer oblike certifikata";
+$TemplateCertificateTitle = "Certifikat";
+$ResultsVisibility = "Vidnost rezultatov";
+$DownloadCertificate = "Prenesi certifikat";
+$PortalActiveCoursesLimitReached = "Oprostite, ta namestitev uporablja aktivno omejitev tečajev, ki je bila sedaj dosežena. Še vedno lahko kreirate nov tečaj, vendar le v primeru, da skrijete/onemogočite vsaj enega izmed aktivnih tečajev. Za to je potrebno v upravljalnem razdelku aktivnega tečaja spremeniti vidnost tečaja. Nato lahko znova skušate ustvariti nov tečaj. Za povečanje največjega števila aktivnih tečajev v okviru te namestitve platforme, se obrnite na upravitelja platforme oz. vašega ponudnika storitev namestitve (hosting), ali če je možno, izvedite nadgraditev na zmožnejšo storitveno ponudbo (hosting plan).";
+$WelcomeToInstitution = "Dobrodošli v platformo %s";
+$WelcomeToSiteName = "Dobrodošli v %s";
+$RequestAccess = "Zahtevek za dostop";
 $Formula = "Formula";
 $MultipleConnectionsAreNotAllow = "Ta uporabnik je že prijavljen";
 $Listen = "Poslušaj";
@@ -11,6 +27,8 @@ $ThereIsANewWorkFeedback = "Nov komentar k nalogi %s";
 $LastUpload = "Zadnje nalaganje";
 $EditUserListCSV = "Uredi seznam uporabnikov";
 $NumberOfCoursesHidden = "Število skritih tečajev";
+$Post = "Objava";
+$Write = "Piši";
 $YouHaveNotYetAchievedSkills = "Nisi še pridobil kompetenc";
 $Corn = "Koruzna";
 $Gray = "Siva";
@@ -24,6 +42,7 @@ $ChooseABackgroundColor = "Izberi barvo ozadja";
 $SocialWriteNewComment = "Napiši nov komentar";
 $SocialWallWhatAreYouThinkingAbout = "O čem razmišljaš?";
 $SocialMessageDelete = "Odstrani komentar";
+$SocialWall = "Socialni zid";
 $BuyCourses = "Kupi tečaj";
 $MySessions = "Moje seje";
 $ActivateAudioRecorder = "Aktiviraj snemalnik zvoka";
@@ -281,55 +300,53 @@ $Title = "Naslov";
 $By = "Objavil";
 $UsersOnline = "Aktivnih uporabnikov";
 $Remove = "Odstrani";
-$langEnter = "Nazaj na seznam tečajev";
+$Enter = "Nazaj na seznam tečajev";
 $Description = "Opis";
 $Links = "Povezave";
-$langWorks = "Naloge";
+$Works = "Naloge";
 $Forums = "Forumi";
-$langExercices = "Testi";
-$langCreateDir = "Tvori mapo";
+$Exercices = "Testi";
+$CreateDir = "Tvori mapo";
 $Name = "Ime";
-$langComment = "Komentar";
-$langVisible = "Prikaži/skrij";
-$langNewDir = "Ime nove mape";
-$langDirCr = "Mapa je bila ustvarjena";
+$Comment = "Komentar";
+$Visible = "Prikaži/skrij";
+$NewDir = "Ime nove mape";
+$DirCr = "Mapa je bila ustvarjena";
 $Download = "Prenos";
-$langGroup = "Skupine";
-$langEdit = "Uredi";
-$langGroupForum = "Forum skupine";
+$Group = "Skupine";
+$Edit = "Uredi";
+$GroupForum = "Forum skupine";
 $Language = "Jezik";
 $LoginName = "Uporabniško ime";
 $AutostartMp3 = "Želite, da se avdio datoteka predvaja avtomatično?";
 $Assignments = "Naloge";
 $Forum = "Forumi";
-$langDelImage = "Odstrani sliko";
-$langCode = "Koda tečaja";
-$langUp = "Gor";
+$DelImage = "Odstrani sliko";
+$Code = "Koda tečaja";
+$Up = "Gor";
 $Down = "dol";
-$Up = "gor";
 $Theme = "Tema";
 $TheListIsEmpty = "Prazno";
-$langUniqueSelect = "Večkratna izbira";
+$UniqueSelect = "Večkratna izbira";
 $CreateCategory = "Ustvari mapo";
 $SendFile = "Naloži datoteko";
 $SaveChanges = "Shrani spremembe";
 $SearchTerm = "Iskani izraz";
 $TooShort = "Prekratko";
-$langCourseCreate = "Tvori tečaj";
-$langTodo = "Predlogi";
+$CourseCreate = "Tvori tečaj";
+$Todo = "Predlogi";
 $UserName = "Uporabniško ime";
-$lang_show_hide = "Prikaži / skrij";
-$langCategoryMod = "Uredi kategorijo";
+$CategoryMod = "Uredi kategorijo";
 $Hide = "Skrij";
-$langDear = "Spoštovani";
-$langArchive = "arhiv";
-$langCourseCode = "Koda";
-$langNoDescription = "Brez opisa";
-$langOfficialCode = "Koda";
+$Dear = "Spoštovani";
+$Archive = "arhiv";
+$CourseCode = "Koda";
+$NoDescription = "Brez opisa";
+$OfficialCode = "Koda";
 $FirstName = "Ime";
 $LastName = "Priimek";
 $Status = "Status";
-$langEmail = "E-pošta";
+$Email = "E-pošta";
 $SlideshowConversion = "Pretvorba prosojnic";
 $UploadFile = "Naloži datoteko";
 $AvailableFrom = "Dostopen od";
@@ -339,7 +356,6 @@ $Type = "Vrsta";
 $EmailAddress = "E-poštni naslov";
 $Organisation = "Organizacija";
 $Reporting = "Poročila";
-$Code = "Koda";
 $Update = "Ažuriraj";
 $SelectQuestionType = "Izberi tip vprašanja";
 $CurrentCourse = "Trenuten tečaj";
@@ -369,58 +385,54 @@ $dateFormatShort = "%d %b %y";
 $dateFormatLong = "%A, %d %B %Y";
 $dateTimeFormatLong = "%d %B %Y ob %H:%M %p";
 $timeNoSecFormat = "%H:%M %p";
-$langYes = "Da";
-$langNo = "Ne";
+$Yes = "Da";
+$No = "Ne";
 $Next = "Naprej";
-$langAllowed = "Dovoljeno";
-$langBackHome = "Povratek na domačo stran";
-$langPropositions = "Predlogi izboljšav";
-$langMaj = "Ažuriraj";
-$langModify = "Uredi";
-$langDelete = "odstrani";
-$langInvisible = "nevidno";
-$langSave = "Pošlji sporočilo";
-$langMove = "Premakni";
+$Allowed = "Dovoljeno";
+$BackHome = "Povratek na domačo stran";
+$Propositions = "Predlogi izboljšav";
+$Maj = "Ažuriraj";
+$Modify = "Uredi";
+$Invisible = "nevidno";
+$Save = "Pošlji sporočilo";
+$Move = "Premakni";
 $Help = "Pomoč";
-$langOk = "Uveljavi";
-$langAdd = "Dodaj";
-$langAddIntro = "Dodaj uvodno besedilo";
-$langBackList = "Vrni se na seznam";
-$langText = "Besedilo";
-$langEmpty = "Nekaj polj si pustil praznih.<br />V brkljalniku se <b>vrni</b>  na prejšnjo stran in poskusi znova.<br />Če se ne spomniš kode tečaja, poglej v program tečajev";
-$langConfirmYourChoice = "Potrdi izbiro";
-$langAnd = "in";
-$langChoice = "Tvoja izbira";
-$langFinish = "Zaključi test";
-$langCancel = "Prekliči";
-$langNotAllowed = "Ni dovoljeno";
-$langNotLogged = "Nisi prijavljen v tečaj";
-$langManager = "Upravitelj";
-$langOptional = "Opcija";
+$Ok = "Uveljavi";
+$Add = "Dodaj";
+$AddIntro = "Dodaj uvodno besedilo";
+$BackList = "Vrni se na seznam";
+$Text = "Besedilo";
+$Empty = "Nekaj polj si pustil praznih.<br />V brkljalniku se <b>vrni</b>  na prejšnjo stran in poskusi znova.<br />Če se ne spomniš kode tečaja, poglej v program tečajev";
+$ConfirmYourChoice = "Potrdi izbiro";
+$And = "in";
+$Choice = "Tvoja izbira";
+$Finish = "Zaključi test";
+$Cancel = "Prekliči";
+$NotAllowed = "Ni dovoljeno";
+$NotLogged = "Nisi prijavljen v tečaj";
+$Manager = "Upravitelj";
+$Optional = "Opcija";
 $NextPage = "Naslednja stran";
 $PreviousPage = "Predhodna stran";
-$langUse = "Uporaba";
-$langTotal = "Skupno";
-$langTake = "vzemi";
-$langOne = "Eno";
-$langSeveral = "Več";
-$langNotice = "Obvestilo";
-$langDate = "Datum";
-$langAmong = "izmed";
-$langShow = "Prikaži";
-$langMyCourses = "Moji tečaji";
-$langModifyProfile = "Profil";
-$langMyStats = "Poglej moj napredek";
-$langLogout = "Odjava";
-$langMyAgenda = "Osebna agenda";
-$langCourseHomepage = "Domača stran tečaja";
-$langCourseManagerview = "Učiteljev pogled";
-$langStudentView = "Uporabnikov pogled";
+$Use = "Uporaba";
+$Total = "Skupno";
+$Take = "vzemi";
+$One = "Eno";
+$Several = "Več";
+$Notice = "Obvestilo";
+$Date = "Datum";
+$Among = "izmed";
+$Show = "Prikaži";
+$MyCourses = "Moji tečaji";
+$ModifyProfile = "Profil";
+$MyStats = "Poglej moj napredek";
+$Logout = "Odjava";
+$MyAgenda = "Osebna agenda";
+$CourseHomepage = "Domača stran tečaja";
+$CourseManagerview = "Učiteljev pogled";
+$StudentView = "Uporabnikov pogled";
 $AddResource = "Dodaj";
 $AddedResources = "Priponke";
-$lang_modify_resource = "Uredi / Dodaj resurse";
-$lang_resource = "Resurs";
-$lang_resources = "Resursi";
 $langNameOfLang['arabic'] = "arabic";
 $langNameOfLang['brazilian'] = "brazilian";
 $langNameOfLang['bulgarian'] = "bulgarian";
@@ -444,27 +456,27 @@ $langNameOfLang['russian'] = "russian";
 $langNameOfLang['simpl_chinese'] = "simpl_chinese";
 $langNameOfLang['spanish'] = "spanish";
 $Close = "zapri";
-$langPlatform = "Portal";
+$Platform = "Portal";
 $localLangName = "jezik";
 $email = "e-pošta";
-$langCourseCodeAlreadyExists = "Oprostite, koda tečaja že obstaja. Izberite drugo kodo.";
+$CourseCodeAlreadyExists = "Oprostite, koda tečaja že obstaja. Izberite drugo kodo.";
 $Statistics = "Statistika";
-$langGrouplist = "Seznam skupin";
-$langPrevious = "prejšnji";
+$Grouplist = "Seznam skupin";
+$Previous = "prejšnji";
 $DestDirectoryDoesntExist = "Ciljna mapa ne obstaja";
 $Courses = "Tečaji";
 $In = "v";
-$langShowAll = "Prikaži vse";
-$langPage = "Stran";
+$ShowAll = "Prikaži vse";
+$Page = "Stran";
 $englishLangName = "English";
 $Home = "Domov";
-$langAreYouSureToDelete = "Ali resnično želiš brisanje";
+$AreYouSureToDelete = "Ali resnično želiš brisanje";
 $SelectAll = "Izberi vse";
 $UnSelectAll = "Izberi nobenega";
 $WithSelected = "Z izbranimi";
-$langOnLine = "Aktivnih:";
-$langUsers = "Uporabniki";
-$langPlatformAdmin = "Administracija platforme";
+$OnLine = "Aktivnih:";
+$Users = "Uporabniki";
+$PlatformAdmin = "Administracija platforme";
 $langNameOfLang['hungarian'] = "hungarian";
 $langNameOfLang['indonesian'] = "indonesian";
 $langNameOfLang['malay'] = "malay";
@@ -475,22 +487,21 @@ $langNameOfLang['thai'] = "thai";
 $langNameOfLang['turkce'] = "turkish";
 $langNameOfLang['vietnamese'] = "vietnamese";
 $UserInfo = "informacije o uporabniku";
-$langModifyQuestion = "Shrani vprašanje";
+$ModifyQuestion = "Shrani vprašanje";
 $Example = "Primer";
-$langCheckAll = "Izberi vse";
-$langNbAnnoucement = "Obvestilo";
-$lang_no_access_here = "Tu ni dostopa";
-$langOtherCourses = "ostali tečaji";
+$CheckAll = "Izberi vse";
+$NbAnnoucement = "Obvestilo";
+$OtherCourses = "ostali tečaji";
 $Doc = "Tečaj";
 $PlataformAdmin = "Admin portala";
 $Groups = "Skupine";
 $GroupManagement = "Upravljanje skupin";
 $All = "Vsi";
 $None = "noben";
-$langSorry = "Najprej izberite tečaj";
-$langDenied = "Ta funkcija je dostopna le upraviteljem tečaja";
+$Sorry = "Najprej izberite tečaj";
+$Denied = "Ta funkcija je dostopna le upraviteljem tečaja";
 $Today = "danes";
-$langCourseHomepageLink = "Trenuten tečaj";
+$CourseHomepageLink = "Trenuten tečaj";
 $Attachment = "priponka";
 $User = "Uporabnik";
 $MondayInit = "P";
@@ -550,10 +561,10 @@ $SeptemberLong = "September";
 $OctoberLong = "Oktober";
 $NovemberLong = "November";
 $DecemberLong = "December";
-$langMyCompetences = "Moje kompetence";
-$langMyDiplomas = "Moje kvalifikacije, diplome, ...";
-$langMyPersonalOpenArea = "Osebna področja mojega zanimanja";
-$langMyTeach = "Kaj sem zmožen (lahko) učim";
+$MyCompetences = "Moje kompetence";
+$MyDiplomas = "Moje kvalifikacije, diplome, ...";
+$MyPersonalOpenArea = "Osebna področja mojega zanimanja";
+$MyTeach = "Kaj sem zmožen (lahko) učim";
 $Agenda = "Agenda";
 $HourShort = ":";
 $PleaseTryAgain = "Prosim, poskusite znova!";
@@ -563,7 +574,7 @@ $UplNotAZip = "Datoteka, ki ste jo izbrali, ni ZIP datoteka.";
 $UplUploadSucceeded = "Nalaganje je bilo uspešno!";
 $ExportAsCSV = "Izvozi kot CSV datoteko";
 $ExportAsXLS = "Izvozi kot Excel datoteko";
-$langOpenarea = "Osebna interesna področja";
+$Openarea = "Osebna interesna področja";
 $Done = "Končano";
 $Documents = "Dokumenti";
 $DocumentAdded = "Dokument dodan";
@@ -577,7 +588,7 @@ $Link = "Povezave";
 $Announcement = "Obvestila";
 $Dropbox = "Nabiralnik";
 $Quiz = "Testi";
-$langChat = "Klepet";
+$Chat = "Klepet";
 $Conference = "Konference";
 $Student_publication = "Izdelki tečajnikov";
 $Tracking = "Sledenje";
@@ -590,8 +601,8 @@ $StartDate = "Začetni datum";
 $EndDate = "Končni datum";
 $StartTime = "Začetni čas";
 $EndTime = "Končni čas";
-$langYouWereCalled = "Pozvan si na klepet z";
-$langDoYouAccept = "Ali ga sprejmeš ?";
+$YouWereCalled = "Pozvan si na klepet z";
+$DoYouAccept = "Ali ga sprejmeš ?";
 $Everybody = "Vsi";
 $SentTo = "Vidno za";
 $Export = "Izvozi";
@@ -615,7 +626,7 @@ $FormHasErrorsPleaseComplete = "Obrazec vsebuje nepopolne ali nepravilne podatke
 $StartDateShouldBeBeforeEndDate = "Začetni datum mora biti pred končnim";
 $InvalidDate = "Napačen datum";
 $OnlyLettersAndNumbersAllowed = "Le črke in številke so dovoljene";
-$langBasicOverview = "Organiziraj";
+$BasicOverview = "Organiziraj";
 $CourseAdminRole = "Upravitelj tečaja";
 $UserRole = "Vloga";
 $OnlyImagesAllowed = "Dovoljene so le slike s končnicami PNG, JPG ali GIF";
@@ -625,16 +636,14 @@ $DeleteRight = "Odstrani";
 $OverviewCourseRights = "Pregled vlog in pravic";
 $SeeAllRightsAllLocationsForSpecificRole = "Glede na vlogo";
 $SeeAllRolesAllLocationsForSpecificRight = "Glede na pravico";
-$langAdvanced = "Zgradi";
+$Advanced = "Zgradi";
 $RightValueModified = "Vrednost je bila spremenjena.";
 $course_rights = "Pregled vlog in pravic";
 $Visio_conference = "Videokonferenčna srečanja";
 $CourseAdminRoleDescription = "Upravitelj tečaja";
-$Move = "Premakni";
 $MoveTo = "Premakni v";
 $Delete = "Odstrani";
 $MoveFileTo = "Premakni datoteko v";
-$Save = "Shrani";
 $Error = "Napaka";
 $Anonymous = "Anonimno";
 $h = "ur";
@@ -650,9 +659,9 @@ $YouHaveNewMessage = "Imaš novo sporočilo !";
 $myActiveSessions = "Moje aktivne seje";
 $myInactiveSessions = "Moje neaktivne seje";
 $FileUpload = "Nalaganje datoteke";
-$langMyActiveSessions = "Moje aktivne seje";
-$langMyInActiveSessions = "Moje neaktivne seje";
-$langMySpace = "Poročila";
+$MyActiveSessions = "Moje aktivne seje";
+$MyInActiveSessions = "Moje neaktivne seje";
+$MySpace = "Poročila";
 $ExtensionActivedButNotYetOperational = "Ta razširitev je bila aktivirana, vendar trenutno ne more biti operativna";
 $MyStudents = "Moji tečajniki";
 $Progress = "Napredek";
@@ -1070,7 +1079,7 @@ $InvitationDenied = "Povabilo je bilo zavrnjeno";
 $UserAdded = "Uporabnik je bil dodan";
 $UpdatedIn = "Osveženo dne";
 $Metadata = "Metapodatki";
-$langAddMetadata = "Poglej/Uredi metapodatke";
+$AddMetadata = "Poglej/Uredi metapodatke";
 $SendMessage = "Pošlji sporočilo";
 $SeeForum = "Glej forum";
 $SeeMore = "Več ...";

+ 104 - 107
main/lang/spanish/trad4all.inc.php

@@ -59,10 +59,12 @@ $HyperbolicArctangentArctanh = "Arcotangente hiperbólica:\tarctanh(x)";
 $ArctangentArctan = "Arcotangente:\t\t\tarctan(x)";
 $HyperbolicTangentTanh = "Tangente hiperbólica:\t\ttanh(x)";
 $TangentTan = "Tangente:\t\t\ttan(x)";
+$CoachAndStudent = "Tutor y estudiante";
 $HyperbolicArccosineArccosh = "Arcocoseno hiperbólico:\t\tarccosh(x)";
 $ArccosineArccos = "Arcocoseno:\t\t\tarccos(x)";
 $HyperbolicCosineCosh = "Coseno hiperbólico:\t\tcosh(x)";
 $CosineCos = "Coseno:\t\t\t\tcos(x)";
+$TeacherTimeReport = "Reporte de tiempo de profesores";
 $HyperbolicArcsineArcsinh = "Arcoseno hiperbólico:\t\tarcsinh(x)";
 $ArcsineArcsin = "Arcoseno:\t\t\tarcsin(x)";
 $HyperbolicSineSinh = "Seno hiperbólico:\t\tsinh(x)";
@@ -308,55 +310,55 @@ $Title = "Título";
 $By = "Publicado por";
 $UsersOnline = "Usuarios en línea";
 $Remove = "Eliminar";
-$langEnter = "Volver a mi lista de cursos";
+$Enter = "Volver a mi lista de cursos";
 $Description = "Descripción";
 $Links = "Enlaces";
-$langWorks = "Tareas";
+$Works = "Tareas";
 $Forums = "Foros";
-$langExercices = "Ejercicios";
-$langCreateDir = "Crear una carpeta";
+$Exercices = "Ejercicios";
+$CreateDir = "Crear una carpeta";
 $Name = "Nombre";
-$langComment = "Comentarios";
-$langVisible = "Visible";
-$langNewDir = "Nombre de la nueva carpeta";
-$langDirCr = "La carpeta ha sido creada";
+$Comment = "Comentarios";
+$Visible = "Visible";
+$NewDir = "Nombre de la nueva carpeta";
+$DirCr = "La carpeta ha sido creada";
 $Download = "Descargar";
-$langGroup = "Grupos";
-$langEdit = "Editar";
-$langGroupForum = "Foro del grupo";
+$Group = "Grupos";
+$Edit = "Editar";
+$GroupForum = "Foro del grupo";
 $Language = "Idioma";
 $LoginName = "Usuario";
 $AutostartMp3 = "Presione Aceptar si desea que el archivo de audio se reproduzca automáticamente";
 $Assignments = "Tareas";
 $Forum = "Foro";
-$langDelImage = "Eliminar foto";
-$langCode = "Código del curso";
-$langUp = "Arriba";
+$DelImage = "Eliminar foto";
+$Code = "Código del curso";
+$Up = "Arriba";
 $Down = "Bajar";
-$Up = "Subir";
+$TimeReportForCourseX = "Reporte de tiempo curso %s";
 $Theme = "Estilo";
 $TheListIsEmpty = "La lista está vacía";
-$langUniqueSelect = "Respuesta única";
+$UniqueSelect = "Respuesta única";
 $CreateCategory = "Crear categoría";
 $SendFile = "Enviar archivo";
 $SaveChanges = "Guardar cambios";
 $SearchTerm = "Palabra a buscar";
 $TooShort = "Muy corto";
-$langCourseCreate = "Crear un curso";
-$langTodo = "Sugerencias";
+$CourseCreate = "Crear un curso";
+$Todo = "Sugerencias";
 $UserName = "Nombre de usuario";
-$lang_show_hide = "Mostrar / ocultar";
-$langCategoryMod = "Modificar categoría";
+$TimeReportIncludingAllCoursesAndSessionsByTeacher = "Reporte de tiempo incluyendo todos los cursos y sesiones, por profesor";
+$CategoryMod = "Modificar categoría";
 $Hide = "Ocultar";
-$langDear = "Estimado/a";
-$langArchive = "archivo";
-$langCourseCode = "Código del curso";
-$langNoDescription = "Sin descripción";
-$langOfficialCode = "Código oficial";
+$Dear = "Estimado/a";
+$Archive = "archivo";
+$CourseCode = "Código del curso";
+$NoDescription = "Sin descripción";
+$OfficialCode = "Código oficial";
 $FirstName = "Nombre";
 $LastName = "Apellidos";
 $Status = "Estado";
-$langEmail = "Correo electrónico";
+$Email = "Correo electrónico";
 $SlideshowConversion = "Conversión de la presentación";
 $UploadFile = "Enviar archivo";
 $AvailableFrom = "Disponible desde";
@@ -366,7 +368,6 @@ $Type = "Tipo";
 $EmailAddress = "Dirección de correo electrónico";
 $Organisation = "Organización";
 $Reporting = "Informes";
-$Code = "Código";
 $Update = "Actualizar";
 $SelectQuestionType = "Seleccionar tipo";
 $CurrentCourse = "Curso actual";
@@ -396,58 +397,56 @@ $dateFormatShort = "%d %b %Y";
 $dateFormatLong = "%A %d %B de %Y";
 $dateTimeFormatLong = "%d de %B %Y a las %I:%M %p";
 $timeNoSecFormat = "%H:%M h.";
-$langYes = "Sí";
-$langNo = "No";
+$Yes = "Sí";
+$No = "No";
 $Next = "Siguiente";
-$langAllowed = "Permitido";
-$langBackHome = "Volver a la página principal de";
-$langPropositions = "Propuestas de mejora de";
-$langMaj = "Actualizar";
-$langModify = "Modificar";
-$langDelete = "Eliminar";
-$langInvisible = "Invisible";
-$langSave = "Guardar";
-$langMove = "Mover";
+$Allowed = "Permitido";
+$BackHome = "Volver a la página principal de";
+$Propositions = "Propuestas de mejora de";
+$Maj = "Actualizar";
+$Modify = "Modificar";
+$Invisible = "Invisible";
+$Save = "Guardar";
+$Move = "Mover";
 $Help = "Ayuda";
-$langOk = "Aceptar";
-$langAdd = "Añadir";
-$langAddIntro = "Añadir un texto de introducción";
-$langBackList = "Volver a la lista";
-$langText = "Texto";
-$langEmpty = "No ha rellenado todos los campos.<br>Utilice el botón de retorno de su navegador y vuelva a empezar.<br>Si no conoce el código de su curso, consulte el programa del curso";
-$langConfirmYourChoice = "Por favor, confirme su elección";
-$langAnd = "y";
-$langChoice = "Su selección";
-$langFinish = "Terminar";
-$langCancel = "Cancelar";
-$langNotAllowed = "No está autorizado a ver esta página o su conexión ha caducado.";
-$langNotLogged = "No ha entrado como usuario de un curso";
-$langManager = "Responsable";
-$langOptional = "Opcional";
+$Ok = "Aceptar";
+$Add = "Añadir";
+$AddIntro = "Añadir un texto de introducción";
+$BackList = "Volver a la lista";
+$Text = "Texto";
+$Empty = "No ha rellenado todos los campos.<br>Utilice el botón de retorno de su navegador y vuelva a empezar.<br>Si no conoce el código de su curso, consulte el programa del curso";
+$ConfirmYourChoice = "Por favor, confirme su elección";
+$And = "y";
+$Choice = "Su selección";
+$Finish = "Terminar";
+$Cancel = "Cancelar";
+$NotAllowed = "No está autorizado a ver esta página o su conexión ha caducado.";
+$NotLogged = "No ha entrado como usuario de un curso";
+$Manager = "Responsable";
+$Optional = "Opcional";
 $NextPage = "Página siguiente";
 $PreviousPage = "Página anterior";
-$langUse = "Usar";
-$langTotal = "Total";
-$langTake = "tomar";
-$langOne = "Uno";
-$langSeveral = "Varios";
-$langNotice = "Aviso";
-$langDate = "Fecha";
-$langAmong = "entre";
-$langShow = "Mostrar";
-$langMyCourses = "Mis cursos";
-$langModifyProfile = "Mi perfil";
-$langMyStats = "Ver mis estadísticas";
-$langLogout = "Salir";
-$langMyAgenda = "Mi agenda";
-$langCourseHomepage = "Página principal del curso";
-$langCourseManagerview = "Cambiar a \"Vista de profesor\"";
-$langStudentView = "Cambiar a \"Vista de estudiante\"";
+$Use = "Usar";
+$Total = "Total";
+$Take = "tomar";
+$One = "Uno";
+$Several = "Varios";
+$Notice = "Aviso";
+$Date = "Fecha";
+$Among = "entre";
+$Show = "Mostrar";
+$MyCourses = "Mis cursos";
+$ModifyProfile = "Mi perfil";
+$MyStats = "Ver mis estadísticas";
+$Logout = "Salir";
+$MyAgenda = "Mi agenda";
+$CourseHomepage = "Página principal del curso";
+$CourseManagerview = "Cambiar a \"Vista de profesor\"";
+$StudentView = "Cambiar a \"Vista de estudiante\"";
 $AddResource = "Añadir recurso";
 $AddedResources = "Recursos añadidos";
-$lang_modify_resource = "Modificar / Añadir recursos";
-$lang_resource = "Recurso";
-$lang_resources = "Recursos";
+$TimeReportForTeacherX = "Reporte de tiempo profesor %s";
+$TotalTime = "Tiempo total";
 $langNameOfLang['arabic'] = "árabe";
 $langNameOfLang['brazilian'] = "brasileño";
 $langNameOfLang['bulgarian'] = "búlgaro";
@@ -471,27 +470,27 @@ $langNameOfLang['russian'] = "ruso";
 $langNameOfLang['simpl_chinese'] = "chino simplificado";
 $langNameOfLang['spanish'] = "español";
 $Close = "cerrar";
-$langPlatform = "Plataforma";
+$Platform = "Plataforma";
 $localLangName = "idioma";
 $email = "e-mail";
-$langCourseCodeAlreadyExists = "Lo siento, pero este código ya existe. Pruebe a escoger otro.";
+$CourseCodeAlreadyExists = "Lo siento, pero este código ya existe. Pruebe a escoger otro.";
 $Statistics = "Estadísticas";
-$langGrouplist = "Lista de grupos";
-$langPrevious = "Anterior";
+$Grouplist = "Lista de grupos";
+$Previous = "Anterior";
 $DestDirectoryDoesntExist = "La carpeta de destino no existe";
 $Courses = "Cursos";
 $In = "en";
-$langShowAll = "Mostrar todos";
-$langPage = "Página";
+$ShowAll = "Mostrar todos";
+$Page = "Página";
 $englishLangName = "Inglés";
 $Home = "Principal";
-$langAreYouSureToDelete = "¿ Está seguro de querer eliminar";
+$AreYouSureToDelete = "¿ Está seguro de querer eliminar";
 $SelectAll = "Seleccionar todo";
 $UnSelectAll = "Anular seleccionar todos";
 $WithSelected = "Con lo seleccionado";
-$langOnLine = "En línea";
-$langUsers = "Usuarios";
-$langPlatformAdmin = "Administración";
+$OnLine = "En línea";
+$Users = "Usuarios";
+$PlatformAdmin = "Administración";
 $langNameOfLang['hungarian'] = "húngaro";
 $langNameOfLang['indonesian'] = "indonesio";
 $langNameOfLang['malay'] = "malayo";
@@ -502,22 +501,21 @@ $langNameOfLang['thai'] = "tailandés";
 $langNameOfLang['turkce'] = "turco";
 $langNameOfLang['vietnamese'] = "vietnamita";
 $UserInfo = "información del usuario";
-$langModifyQuestion = "Modificar pregunta";
+$ModifyQuestion = "Modificar pregunta";
 $Example = "Ejemplo";
-$langCheckAll = "comprobar";
-$langNbAnnoucement = "Avisos";
-$lang_no_access_here = "No tiene autorización para acceder aquí";
-$langOtherCourses = "otros cursos";
+$CheckAll = "comprobar";
+$NbAnnoucement = "Avisos";
+$OtherCourses = "otros cursos";
 $Doc = "documento";
 $PlataformAdmin = "Administración de la plataforma";
 $Groups = "Grupos";
 $GroupManagement = "Gestión de grupos";
 $All = "Todo";
 $None = "Ninguna";
-$langSorry = "Seleccione primero un curso";
-$langDenied = "Esta función sólo está disponible para los administradores del curso";
+$Sorry = "Seleccione primero un curso";
+$Denied = "Esta función sólo está disponible para los administradores del curso";
 $Today = "Hoy";
-$langCourseHomepageLink = "Página de inicio del curso";
+$CourseHomepageLink = "Página de inicio del curso";
 $Attachment = "Adjuntar";
 $User = "Usuario";
 $MondayInit = "L";
@@ -577,10 +575,10 @@ $SeptemberLong = "Septiembre";
 $OctoberLong = "Octubre";
 $NovemberLong = "Noviembre";
 $DecemberLong = "Diciembre";
-$langMyCompetences = "Mis competencias";
-$langMyDiplomas = "Mis títulos";
-$langMyPersonalOpenArea = "Mi área personal pública";
-$langMyTeach = "Qué puedo enseñar";
+$MyCompetences = "Mis competencias";
+$MyDiplomas = "Mis títulos";
+$MyPersonalOpenArea = "Mi área personal pública";
+$MyTeach = "Qué puedo enseñar";
 $Agenda = "Agenda";
 $HourShort = "h";
 $PleaseTryAgain = "¡ Por favor, inténtelo otra vez !";
@@ -590,7 +588,7 @@ $UplNotAZip = "El archivo seleccionado no es un archivo zip.";
 $UplUploadSucceeded = "¡ El archivo ha sido enviado !";
 $ExportAsCSV = "Exportar a un fichero CSV";
 $ExportAsXLS = "Exportar a un fichero XLS";
-$langOpenarea = "Area personal pública";
+$Openarea = "Area personal pública";
 $Done = "Hecho";
 $Documents = "Documentos";
 $DocumentAdded = "Documento añadido";
@@ -604,7 +602,7 @@ $Link = "Enlace";
 $Announcement = "Anuncios";
 $Dropbox = "Compartir documentos";
 $Quiz = "Ejercicios";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Conferencia Online";
 $Student_publication = "Tareas";
 $Tracking = "Informes";
@@ -617,8 +615,8 @@ $StartDate = "Fecha de inicio";
 $EndDate = "Fecha de finalización";
 $StartTime = "Hora de comienzo";
 $EndTime = "Hora de finalización";
-$langYouWereCalled = "Está siendo llamado para chatear con";
-$langDoYouAccept = "¿Acepta?";
+$YouWereCalled = "Está siendo llamado para chatear con";
+$DoYouAccept = "¿Acepta?";
 $Everybody = "todos los usuarios del curso";
 $SentTo = "Dirigido a";
 $Export = "Exportar";
@@ -642,7 +640,7 @@ $FormHasErrorsPleaseComplete = "Este formulario contiene datos incorrectos o inc
 $StartDateShouldBeBeforeEndDate = "La fecha de inicio debe ser anterior a la fecha final";
 $InvalidDate = "Fecha no válida";
 $OnlyLettersAndNumbersAllowed = "Sólo se permiten letras y números";
-$langBasicOverview = "Organizar";
+$BasicOverview = "Organizar";
 $CourseAdminRole = "Administrador del curso";
 $UserRole = "Rol";
 $OnlyImagesAllowed = "Splo están permitidas imágenes PNG, JPG y GIF";
@@ -652,16 +650,15 @@ $DeleteRight = "Eliminar";
 $OverviewCourseRights = "Descripción de roles y permisos";
 $SeeAllRightsAllLocationsForSpecificRole = "Rol";
 $SeeAllRolesAllLocationsForSpecificRight = "Ver todos los perfiles y lugares para un permiso específico";
-$langAdvanced = "Avanzado";
+$Advanced = "Avanzado";
 $RightValueModified = "Este valor ha sido modificado.";
 $course_rights = "Configuración de roles y permisos";
 $Visio_conference = "Reunión por videoconferencia";
 $CourseAdminRoleDescription = "Administrador del curso";
-$Move = "Mover";
 $MoveTo = "Mover a";
 $Delete = "Eliminar";
 $MoveFileTo = "Mover archivo a";
-$Save = "Guardar";
+$TimeReportForSessionX = "Reporte de tiempo sesión %s";
 $Error = "Error";
 $Anonymous = "Anónimo";
 $h = "h";
@@ -677,9 +674,9 @@ $YouHaveNewMessage = "Tiene un nuevo mensaje";
 $myActiveSessions = "Mis sesiones activas";
 $myInactiveSessions = "Mis sesiones no activas";
 $FileUpload = "Envío de archivo";
-$langMyActiveSessions = "Mis sesiones activas";
-$langMyInActiveSessions = "Mis sesiones no activas";
-$langMySpace = "Informes";
+$MyActiveSessions = "Mis sesiones activas";
+$MyInActiveSessions = "Mis sesiones no activas";
+$MySpace = "Informes";
 $ExtensionActivedButNotYetOperational = "Esta extensión ha sido activada pero, por ahora, no puede estar operativa.";
 $MyStudents = "Mis estudiantes";
 $Progress = "Progreso";
@@ -1097,7 +1094,7 @@ $InvitationDenied = "Invitación denegada";
 $UserAdded = "El usuario ha sido añadido";
 $UpdatedIn = "Actualizado";
 $Metadata = "Metadatos";
-$langAddMetadata = "Ver/Editar metadatos";
+$AddMetadata = "Ver/Editar metadatos";
 $SendMessage = "Enviar mensaje";
 $SeeForum = "Ver foro";
 $SeeMore = "Ver más";

+ 96 - 105
main/lang/spanish_latin/trad4all.inc.php

@@ -9,48 +9,46 @@ $NoTimeLimits = "Sin límite de tiempo";
 $Title = "Título";
 $UsersOnline = "Usuarios en línea";
 $Remove = "Eliminar";
-$langEnter = "Ingresar";
+$Enter = "Ingresar";
 $Description = "Descripción";
 $Links = "Enlaces";
-$langWorks = "Trabajos de Alumnos";
+$Works = "Trabajos de Alumnos";
 $Forums = "Foros";
-$langExercices = "Ejercicios";
-$langCreateDir = "Crear un directorio";
+$Exercices = "Ejercicios";
+$CreateDir = "Crear un directorio";
 $Name = "Nombre";
-$langComment = "Comentario";
-$langVisible = "Visible/Invisible";
-$langNewDir = "Nombre del directorio nuevo";
-$langDirCr = "Directorio creado";
+$Comment = "Comentario";
+$Visible = "Visible/Invisible";
+$NewDir = "Nombre del directorio nuevo";
+$DirCr = "Directorio creado";
 $Download = "Descargar";
-$langGroup = "Grupo";
-$langEdit = "Editar";
-$langGroupForum = "Foro";
+$Group = "Grupo";
+$Edit = "Editar";
+$GroupForum = "Foro";
 $Language = "Idioma";
 $LoginName = "Usuario";
 $Assignments = "Assignments";
 $Forum = "Forum";
-$langDelImage = "Eliminar fotografía";
-$langCode = "Código del curso";
-$langUp = "Subir";
+$DelImage = "Eliminar fotografía";
+$Code = "Código del curso";
+$Up = "Subir";
 $Down = "abajo";
-$Up = "arriba";
 $TheListIsEmpty = "La lista está vacía";
-$langUniqueSelect = "Múltiple choice (respuesta única)";
-$langCourseCreate = "Crear el sitio web de un curso";
-$langTodo = "Sugerencias";
+$UniqueSelect = "Múltiple choice (respuesta única)";
+$CourseCreate = "Crear el sitio web de un curso";
+$Todo = "Sugerencias";
 $UserName = "Nombre de usuario";
-$lang_show_hide = "Mostrar / ocultar";
-$langCategoryMod = "Modificar categoría";
+$CategoryMod = "Modificar categoría";
 $Hide = "Ocultar";
-$langDear = "Estimado(a)";
-$langArchive = "archivo";
-$langCourseCode = "Código del curso";
-$langNoDescription = "Sin descripción";
-$langOfficialCode = "Código oficial";
+$Dear = "Estimado(a)";
+$Archive = "archivo";
+$CourseCode = "Código del curso";
+$NoDescription = "Sin descripción";
+$OfficialCode = "Código oficial";
 $FirstName = "Nombre";
 $LastName = "Apellido";
 $Status = "Status";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $iso639_2_code = "es";
 $iso639_1_code = "esp";
 $charset = "iso-8859-1";
@@ -63,58 +61,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "Si";
-$langNo = "No";
+$Yes = "Si";
+$No = "No";
 $Next = "siguiente";
-$langAllowed = "Permitido";
-$langBackHome = "Volver al inicio";
-$langPropositions = "Sugerencias para mejoras de";
-$langMaj = "Actualizar";
-$langModify = "Modificar";
-$langDelete = "Eliminar";
-$langInvisible = "Hacer invisible";
-$langSave = "Guardar";
-$langMove = "Mover";
+$Allowed = "Permitido";
+$BackHome = "Volver al inicio";
+$Propositions = "Sugerencias para mejoras de";
+$Maj = "Actualizar";
+$Modify = "Modificar";
+$Invisible = "Hacer invisible";
+$Save = "Guardar";
+$Move = "Mover";
 $Help = "Ayuda";
-$langOk = "Aceptar";
-$langAdd = "Agregar";
-$langAddIntro = "Agregar un texto introductorio";
-$langBackList = "Volver a la lista";
-$langText = "Texto";
-$langEmpty = "Vacío";
-$langConfirmYourChoice = "Por favor, confirme su elección";
-$langAnd = "y";
-$langChoice = "Su elección";
-$langFinish = "Terminar";
-$langCancel = "Cancelar";
-$langNotAllowed = "Ud. no está admitido aquí";
-$langNotLogged = "No ha entrado como usuario de un curso";
-$langManager = "Administrador";
-$langOptional = "Opcional";
+$Ok = "Aceptar";
+$Add = "Agregar";
+$AddIntro = "Agregar un texto introductorio";
+$BackList = "Volver a la lista";
+$Text = "Texto";
+$Empty = "Vacío";
+$ConfirmYourChoice = "Por favor, confirme su elección";
+$And = "y";
+$Choice = "Su elección";
+$Finish = "Terminar";
+$Cancel = "Cancelar";
+$NotAllowed = "Ud. no está admitido aquí";
+$NotLogged = "No ha entrado como usuario de un curso";
+$Manager = "Administrador";
+$Optional = "Opcional";
 $NextPage = "Próxima página";
 $PreviousPage = "Página anterior";
-$langUse = "Usa";
-$langTotal = "Total";
-$langTake = "toma";
-$langOne = "Uno";
-$langSeveral = "Algunos";
-$langNotice = "Aviso";
-$langDate = "Fecha";
-$langAmong = "entre";
-$langShow = "Mostrar";
-$langMyCourses = "Lista de mis cursos";
-$langModifyProfile = "Modificar mi perfil";
-$langMyStats = "Ver mis estadísticas";
-$langLogout = "Salir";
-$langMyAgenda = "Mi agenda";
-$langCourseHomepage = "Página inicial del curso";
-$langCourseManagerview = "Vista del profesor";
-$langStudentView = "Vista del alumno";
+$Use = "Usa";
+$Total = "Total";
+$Take = "toma";
+$One = "Uno";
+$Several = "Algunos";
+$Notice = "Aviso";
+$Date = "Fecha";
+$Among = "entre";
+$Show = "Mostrar";
+$MyCourses = "Lista de mis cursos";
+$ModifyProfile = "Modificar mi perfil";
+$MyStats = "Ver mis estadísticas";
+$Logout = "Salir";
+$MyAgenda = "Mi agenda";
+$CourseHomepage = "Página inicial del curso";
+$CourseManagerview = "Vista del profesor";
+$StudentView = "Vista del alumno";
 $AddResource = "Añadir este recurso";
 $AddedResources = "Recursos añadidos";
-$lang_modify_resource = "Modificar / Añadir recursos";
-$lang_resource = "Recurso";
-$lang_resources = "Recursos";
 $langNameOfLang['arabic'] = "árabe";
 $langNameOfLang['brazilian'] = "brasileño";
 $langNameOfLang['bulgarian'] = "búlgaro";
@@ -138,26 +132,26 @@ $langNameOfLang['russian'] = "ruso";
 $langNameOfLang['simpl_chinese'] = "chino simplificado";
 $langNameOfLang['spanish'] = "español";
 $Close = "cerrar";
-$langPlatform = "Plataforma";
+$Platform = "Plataforma";
 $localLangName = "español";
 $email = "Correo electrónico";
-$langCourseCodeAlreadyExists = "El código del curso ya existe, Por favor seleccione otro.";
+$CourseCodeAlreadyExists = "El código del curso ya existe, Por favor seleccione otro.";
 $Statistics = "Estadística";
-$langGrouplist = "lista de grupos";
-$langPrevious = "anterior";
+$Grouplist = "lista de grupos";
+$Previous = "anterior";
 $Courses = "Cursos";
 $In = "en";
-$langShowAll = "Mostrar todos";
-$langPage = "Página";
+$ShowAll = "Mostrar todos";
+$Page = "Página";
 $englishLangName = "spanish";
 $Home = "inicio";
-$langAreYouSureToDelete = "Está usted seguro de borrar?";
+$AreYouSureToDelete = "Está usted seguro de borrar?";
 $SelectAll = "seleccionar todos";
 $UnSelectAll = "deseleccionar todos";
 $WithSelected = "Con lo seleccionado";
-$langOnLine = "En línea";
-$langUsers = "Usuarios";
-$langPlatformAdmin = "Administración";
+$OnLine = "En línea";
+$Users = "Usuarios";
+$PlatformAdmin = "Administración";
 $langNameOfLang['hungarian'] = "húngaro";
 $langNameOfLang['indonesian'] = "indonesio";
 $langNameOfLang['malay'] = "malayo";
@@ -168,21 +162,20 @@ $langNameOfLang['thai'] = "tailandés";
 $langNameOfLang['turkce'] = "turco";
 $langNameOfLang['vietnamese'] = "vietnamita";
 $UserInfo = "información de usuario";
-$langModifyQuestion = "Modificar una pregunta";
-$langCheckAll = "Marcar todo";
-$langNbAnnoucement = "Avisos";
-$lang_no_access_here = "Usted no tiene acceso aquí";
-$langOtherCourses = "otros cursos";
+$ModifyQuestion = "Modificar una pregunta";
+$CheckAll = "Marcar todo";
+$NbAnnoucement = "Avisos";
+$OtherCourses = "otros cursos";
 $Doc = "documento";
 $PlataformAdmin = "Administración de la plataforma";
 $Groups = "Grupos";
 $GroupManagement = "Administración de grupo";
 $All = "Todo";
 $None = "Nada";
-$langSorry = "Seleccione primero un curso";
-$langDenied = "Esta función sólo está disponible para los administradores del curso";
+$Sorry = "Seleccione primero un curso";
+$Denied = "Esta función sólo está disponible para los administradores del curso";
 $Today = "hoy";
-$langCourseHomepageLink = "Curso actual";
+$CourseHomepageLink = "Curso actual";
 $Attachment = "Adjunto";
 $User = "Usuario";
 $MondayInit = "L";
@@ -242,10 +235,10 @@ $SeptemberLong = "Septiembre";
 $OctoberLong = "Octubre";
 $NovemberLong = "Noviembre";
 $DecemberLong = "Diciembre";
-$langMyCompetences = "Mis competencias";
-$langMyDiplomas = "Mis títulos";
-$langMyPersonalOpenArea = "Mi área personal pública";
-$langMyTeach = "Qué puedo enseñar";
+$MyCompetences = "Mis competencias";
+$MyDiplomas = "Mis títulos";
+$MyPersonalOpenArea = "Mi área personal pública";
+$MyTeach = "Qué puedo enseñar";
 $Agenda = "Agenda";
 $HourShort = "h";
 $PleaseTryAgain = "¡ Por favor, inténtelo otra vez !";
@@ -255,7 +248,7 @@ $UplNotAZip = "El archivo seleccionado no es un archivo zip";
 $UplUploadSucceeded = "¡ El archivo ha sido enviado !";
 $ExportAsCSV = "Exportar a un archivo CSV";
 $ExportAsXLS = "Exportar a un archivo XLS";
-$langOpenarea = "Area personal abierta";
+$Openarea = "Area personal abierta";
 $Done = "Hecho";
 $Documents = "Documentos";
 $DocumentAdded = "Documento añadido";
@@ -268,7 +261,7 @@ $Link = "Enlaces";
 $Announcement = "Tablón de avisos";
 $Dropbox = "Baúl de tareas";
 $Quiz = "Tests";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Conferencia";
 $Student_publication = "Publicaciones de los estudiantes";
 $Tracking = "Seguimiento";
@@ -281,8 +274,8 @@ $StartDate = "Fecha de inicio";
 $EndDate = "Fecha de finalización";
 $StartTime = "Hora de inicio";
 $EndTime = "Hora de finalización";
-$langYouWereCalled = "Le llaman para chatear con";
-$langDoYouAccept = "¿acepta?";
+$YouWereCalled = "Le llaman para chatear con";
+$DoYouAccept = "¿acepta?";
 $Everybody = "Todos";
 $SentTo = "Enviar a";
 $Export = "Exportar";
@@ -306,7 +299,7 @@ $FormHasErrorsPleaseComplete = "Este formulario contiene datos incorrectos o inc
 $StartDateShouldBeBeforeEndDate = "La primera fecha debe estar antes que la fecha de finalización";
 $InvalidDate = "Fecha inválida";
 $OnlyLettersAndNumbersAllowed = "Solamente se permiten letras y números";
-$langBasicOverview = "Vista básica";
+$BasicOverview = "Vista básica";
 $CourseAdminRole = "Administrador del curso";
 $UserRole = "Rol";
 $OnlyImagesAllowed = "Sólo están permitidas imágenes PNG, JPG y GIF";
@@ -316,16 +309,14 @@ $DeleteRight = "Borrar";
 $OverviewCourseRights = " Descripción de roles y permisos";
 $SeeAllRightsAllLocationsForSpecificRole = "Rol";
 $SeeAllRolesAllLocationsForSpecificRight = "Permiso";
-$langAdvanced = "Avanzado";
+$Advanced = "Avanzado";
 $RightValueModified = "El valor ha sido modificado.";
 $course_rights = "Vista de roles y permisos";
 $Visio_conference = "Videoconferencia";
 $CourseAdminRoleDescription = "Administrador del curso";
-$Move = "Mover";
 $MoveTo = "Mover a";
 $Delete = "Borrar";
 $MoveFileTo = "Mover archivo a";
-$Save = "Guardar";
 $Error = "Error";
 $Anonymous = "Anónimo";
 $h = "h";
@@ -341,9 +332,9 @@ $YouHaveNewMessage = "Tiene un nuevo mensaje";
 $myActiveSessions = "Mis sesiones activas";
 $myInactiveSessions = "Mis sesiones inactivas";
 $FileUpload = "Archivo enviado";
-$langMyActiveSessions = "Mis sesiones activas";
-$langMyInActiveSessions = "Mis sesiones inactivas";
-$langMySpace = "Mi espacio";
+$MyActiveSessions = "Mis sesiones activas";
+$MyInActiveSessions = "Mis sesiones inactivas";
+$MySpace = "Mi espacio";
 $ExtensionActivedButNotYetOperational = "Esta extensión ha sido activada pero, por ahora, no puede estar operativa.";
 $MyStudents = "Mis estudiantes";
 $Progress = "Progreso";

+ 96 - 106
main/lang/swedish/trad4all.inc.php

@@ -10,55 +10,53 @@ $Title = "Titel";
 $By = "Av";
 $UsersOnline = "Inloggade användare";
 $Remove = "Tabort";
-$langEnter = "Stig in";
+$Enter = "Stig in";
 $Description = "Beskrivning";
 $Links = "Länkar";
-$langWorks = "Elevarbeten";
+$Works = "Elevarbeten";
 $Forums = "Forum";
-$langExercices = "Prov";
-$langCreateDir = "Skapa ny mapp";
+$Exercices = "Prov";
+$CreateDir = "Skapa ny mapp";
 $Name = "Namn";
-$langComment = "Kommentar";
-$langVisible = "Synlig/osynlig";
-$langNewDir = "Namn på ny folder";
-$langDirCr = "mapp skapad";
+$Comment = "Kommentar";
+$Visible = "Synlig/osynlig";
+$NewDir = "Namn på ny folder";
+$DirCr = "mapp skapad";
 $Download = "Ladda ner";
-$langGroup = "Grupp";
-$langEdit = "ändra";
-$langGroupForum = "Forum";
+$Group = "Grupp";
+$Edit = "ändra";
+$GroupForum = "Forum";
 $Language = "Språk";
 $LoginName = "Logga in";
 $AutostartMp3 = "Tryck OK om du vill spela ljudfilen automatiskt";
 $Assignments = "Uppgifter";
 $Forum = "Forum";
-$langDelImage = "Ta bort bild";
-$langCode = "Kurskod";
-$langUp = "Upp";
+$DelImage = "Ta bort bild";
+$Code = "Kurskod";
+$Up = "Upp";
 $Down = "ner";
-$Up = "upp";
 $Theme = "Tema";
 $TheListIsEmpty = "Listan är tom.";
-$langUniqueSelect = "Multipla val (Unika svar)";
+$UniqueSelect = "Multipla val (Unika svar)";
 $CreateCategory = "Skapa mapp";
 $SendFile = "Bekräfta";
 $SaveChanges = "Spara ändringar";
 $SearchTerm = "Sökord";
 $TooShort = "För kort";
-$langCourseCreate = "Skapa en webbkurs";
-$langTodo = "Att göra";
+$CourseCreate = "Skapa en webbkurs";
+$Todo = "Att göra";
 $UserName = "Användarnamn";
-$lang_show_hide = "Visa / Göm";
-$langCategoryMod = "Modifiera kategori";
+$CategoryMod = "Modifiera kategori";
 $Hide = "Göm";
-$langDear = "Hej";
-$langArchive = "arkiv";
-$langCourseCode = "Kurskod";
-$langNoDescription = "Beskrivning saknas";
-$langOfficialCode = "Officiell kod";
+$Dear = "Hej";
+$Archive = "arkiv";
+$CourseCode = "Kurskod";
+$NoDescription = "Beskrivning saknas";
+$OfficialCode = "Officiell kod";
 $FirstName = "Förnamn";
 $LastName = "Efternamn";
 $Status = "Status";
-$langEmail = "Epost";
+$Email = "Epost";
 $SlideshowConversion = "Konvertering av bildspel";
 $UploadFile = "Filuppladdning";
 $AvailableFrom = "Tillgänglig från";
@@ -68,7 +66,6 @@ $Type = "Typ";
 $EmailAddress = "Epost adress";
 $Organisation = "Organisation";
 $Reporting = "Rapportering";
-$Code = "Kod";
 $Update = "Uppdatera";
 $SelectQuestionType = "Välj frågetyp";
 $CurrentCourse = "Aktuell kurs";
@@ -98,58 +95,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "ja";
-$langNo = "Nej";
+$Yes = "ja";
+$No = "Nej";
 $Next = "Nästa";
-$langAllowed = "Tillåten";
-$langBackHome = "Tillbaka till hemsidan för";
-$langPropositions = "Föreslå förbättringar av";
-$langMaj = "Uppdatera";
-$langModify = "ändra";
-$langDelete = "radera";
-$langInvisible = "Gör osynlig";
-$langSave = "Spara";
-$langMove = "Flytta";
+$Allowed = "Tillåten";
+$BackHome = "Tillbaka till hemsidan för";
+$Propositions = "Föreslå förbättringar av";
+$Maj = "Uppdatera";
+$Modify = "ändra";
+$Invisible = "Gör osynlig";
+$Save = "Spara";
+$Move = "Flytta";
 $Help = "hjälp";
-$langOk = "OK";
-$langAdd = "Lägg till";
-$langAddIntro = "Lägg till en inledningstext";
-$langBackList = "Återgå till listan";
-$langText = "Text";
-$langEmpty = "Du lämnade några fält tomma.<br>Använd webbläsarens tillbaka-knapp och försök igen.";
-$langConfirmYourChoice = "Var snäll och bekräfta ditt val";
-$langAnd = "och";
-$langChoice = "Ditt val";
-$langFinish = "Avsluta";
-$langCancel = "Avbryt";
-$langNotAllowed = "Inte tillåtet";
-$langNotLogged = "Du är inte inloggad i en kurs";
-$langManager = "Ansvarig";
-$langOptional = "Valbart";
+$Ok = "OK";
+$Add = "Lägg till";
+$AddIntro = "Lägg till en inledningstext";
+$BackList = "Återgå till listan";
+$Text = "Text";
+$Empty = "Du lämnade några fält tomma.<br>Använd webbläsarens tillbaka-knapp och försök igen.";
+$ConfirmYourChoice = "Var snäll och bekräfta ditt val";
+$And = "och";
+$Choice = "Ditt val";
+$Finish = "Avsluta";
+$Cancel = "Avbryt";
+$NotAllowed = "Inte tillåtet";
+$NotLogged = "Du är inte inloggad i en kurs";
+$Manager = "Ansvarig";
+$Optional = "Valbart";
 $NextPage = "Nästa sida";
 $PreviousPage = "Föregående sida";
-$langUse = "Använda";
-$langTotal = "Total";
-$langTake = "ta";
-$langOne = "En";
-$langSeveral = "Flera";
-$langNotice = "Uppmärksamma";
-$langDate = "Datum";
-$langAmong = "bland";
-$langShow = "Visa";
-$langMyCourses = "Mina kurser";
-$langModifyProfile = "Modifiera min profil";
-$langMyStats = "Visa min statistik";
-$langLogout = "Logga ut";
-$langMyAgenda = "Min agenda";
-$langCourseHomepage = "Kurshemsida";
-$langCourseManagerview = "Lärarvy";
-$langStudentView = "Studentvy";
+$Use = "Använda";
+$Total = "Total";
+$Take = "ta";
+$One = "En";
+$Several = "Flera";
+$Notice = "Uppmärksamma";
+$Date = "Datum";
+$Among = "bland";
+$Show = "Visa";
+$MyCourses = "Mina kurser";
+$ModifyProfile = "Modifiera min profil";
+$MyStats = "Visa min statistik";
+$Logout = "Logga ut";
+$MyAgenda = "Min agenda";
+$CourseHomepage = "Kurshemsida";
+$CourseManagerview = "Lärarvy";
+$StudentView = "Studentvy";
 $AddResource = "Lägg till";
 $AddedResources = "Bilagor";
-$lang_modify_resource = "Ändra / Lägg till resurser";
-$lang_resource = "Resurs";
-$lang_resources = "Resurser";
 $langNameOfLang['arabic'] = "arabiska";
 $langNameOfLang['brazilian'] = "brasilianska";
 $langNameOfLang['bulgarian'] = "bulgariska";
@@ -173,27 +166,27 @@ $langNameOfLang['russian'] = "ryska";
 $langNameOfLang['simpl_chinese'] = "kinesiska_förenkl";
 $langNameOfLang['spanish'] = "spanska";
 $Close = "stäng";
-$langPlatform = "Med kraft från";
+$Platform = "Med kraft från";
 $localLangName = "språk";
 $email = "e-post";
-$langCourseCodeAlreadyExists = "Tyvärr, denna kurs existerar redan. Var vänlig välj en annan.";
+$CourseCodeAlreadyExists = "Tyvärr, denna kurs existerar redan. Var vänlig välj en annan.";
 $Statistics = "Statistik";
-$langGrouplist = "grupplista";
-$langPrevious = "föregående";
+$Grouplist = "grupplista";
+$Previous = "föregående";
 $DestDirectoryDoesntExist = "Den önskade katalogen finns inte";
 $Courses = "Kurser";
 $In = "i";
-$langShowAll = "Visa allt";
-$langPage = "Sida";
+$ShowAll = "Visa allt";
+$Page = "Sida";
 $englishLangName = "Engelska";
 $Home = "Hem";
-$langAreYouSureToDelete = "Är du säker på att du vill radera";
+$AreYouSureToDelete = "Är du säker på att du vill radera";
 $SelectAll = "Markera alla";
 $UnSelectAll = "avmarkera allt";
 $WithSelected = "med markerade";
-$langOnLine = "Online/Uppkopplad";
-$langUsers = "Användare";
-$langPlatformAdmin = "Plattformsadministration";
+$OnLine = "Online/Uppkopplad";
+$Users = "Användare";
+$PlatformAdmin = "Plattformsadministration";
 $langNameOfLang['hungarian'] = "ungerska";
 $langNameOfLang['indonesian'] = "indonesiska";
 $langNameOfLang['malay'] = "malaysiska";
@@ -204,22 +197,21 @@ $langNameOfLang['thai'] = "thailändska";
 $langNameOfLang['turkce'] = "turkiska";
 $langNameOfLang['vietnamese'] = "vietnamesiska";
 $UserInfo = "användarinformation";
-$langModifyQuestion = "Ändra fråga";
+$ModifyQuestion = "Ändra fråga";
 $Example = "Exempel";
-$langCheckAll = "Markera allt";
-$langNbAnnoucement = "Tillkännagivande";
-$lang_no_access_here = "Ingen access här";
-$langOtherCourses = "andra kurser";
+$CheckAll = "Markera allt";
+$NbAnnoucement = "Tillkännagivande";
+$OtherCourses = "andra kurser";
 $Doc = "dokument";
 $PlataformAdmin = "Plattformsadministratör";
 $Groups = "Grupper";
 $GroupManagement = "Grupphantering";
 $All = "Alla";
 $None = "ingen";
-$langSorry = "Välj en kurs först";
-$langDenied = "Denna funktion tillgänglig endast för kurs administratörer";
+$Sorry = "Välj en kurs först";
+$Denied = "Denna funktion tillgänglig endast för kurs administratörer";
 $Today = "idag";
-$langCourseHomepageLink = "Nuvarande kurs";
+$CourseHomepageLink = "Nuvarande kurs";
 $Attachment = "bifogad fil";
 $User = "Användare";
 $MondayInit = "M";
@@ -279,10 +271,10 @@ $SeptemberLong = "September";
 $OctoberLong = "Oktober";
 $NovemberLong = "November";
 $DecemberLong = "December";
-$langMyCompetences = "Mina kompetenser";
-$langMyDiplomas = "Mina diplom";
-$langMyPersonalOpenArea = "Min personliga öppna sida";
-$langMyTeach = "Ämnen jag undervisar i";
+$MyCompetences = "Mina kompetenser";
+$MyDiplomas = "Mina diplom";
+$MyPersonalOpenArea = "Min personliga öppna sida";
+$MyTeach = "Ämnen jag undervisar i";
 $Agenda = "Agenda";
 $HourShort = "t";
 $PleaseTryAgain = "Var snäll och försök igen!";
@@ -292,7 +284,7 @@ $UplNotAZip = "Filen du valt är ingen ZIP fil.";
 $UplUploadSucceeded = "Filuppladdningen lyckades!";
 $ExportAsCSV = "Exportera som CSV-fil";
 $ExportAsXLS = "Exportera som XLS-fil";
-$langOpenarea = "Personlig öppen yta";
+$Openarea = "Personlig öppen yta";
 $Done = "Klart";
 $Documents = "Dokument";
 $DocumentAdded = "Tillagt dokument";
@@ -306,7 +298,7 @@ $Link = "Link";
 $Announcement = "Tillkännagivanden";
 $Dropbox = "Dropbox";
 $Quiz = "Prov";
-$langChat = "Chat";
+$Chat = "Chat";
 $Conference = "Konferens";
 $Student_publication = "Elevpublikationer";
 $Tracking = "Spårning";
@@ -319,8 +311,8 @@ $StartDate = "Startdatum";
 $EndDate = "Slutdatum";
 $StartTime = "Starttid";
 $EndTime = "Sluttid";
-$langYouWereCalled = "Du har fått chatinbjudan från";
-$langDoYouAccept = "Vill du acceptera?";
+$YouWereCalled = "Du har fått chatinbjudan från";
+$DoYouAccept = "Vill du acceptera?";
 $Everybody = "Alla";
 $SentTo = "Synlig för";
 $Export = "Exportera";
@@ -344,7 +336,7 @@ $FormHasErrorsPleaseComplete = "Blanketten innehåller otillåtet eller ofullst
 $StartDateShouldBeBeforeEndDate = "Första datumet skall vara före slutdatum";
 $InvalidDate = "Otillåtet datum";
 $OnlyLettersAndNumbersAllowed = "Bara bokstäver och siffror är tillåtna";
-$langBasicOverview = "Organisera";
+$BasicOverview = "Organisera";
 $CourseAdminRole = "Kursadministratör";
 $UserRole = "Roll";
 $OnlyImagesAllowed = "Bara bilder av typen PNG, JPG och GIF är tillåtna";
@@ -354,16 +346,14 @@ $DeleteRight = "Ta bort";
 $OverviewCourseRights = "Översikt av roller och rättigheter";
 $SeeAllRightsAllLocationsForSpecificRole = "Fokusera på roll";
 $SeeAllRolesAllLocationsForSpecificRight = "Fokus på rättighet";
-$langAdvanced = "Skapa";
+$Advanced = "Skapa";
 $RightValueModified = "Värdet har ändrats";
 $course_rights = "Översikt roller & rättigheter";
 $Visio_conference = "Virtuellt möte";
 $CourseAdminRoleDescription = "Kursadministratören";
-$Move = "Flytta";
 $MoveTo = "Flytta till";
 $Delete = "Radera";
 $MoveFileTo = "Flytta fil till";
-$Save = "Spara";
 $Error = "Fel";
 $Anonymous = "Anonym";
 $h = "t";
@@ -379,9 +369,9 @@ $YouHaveNewMessage = "Du har ett nytt meddelande!";
 $myActiveSessions = "Mina aktiva perioder";
 $myInactiveSessions = "Mina inaktiva perioder";
 $FileUpload = "Ladda upp fil";
-$langMyActiveSessions = "Mina aktiva perioder";
-$langMyInActiveSessions = "Mina inaktiva perioder";
-$langMySpace = "Rapporter";
+$MyActiveSessions = "Mina aktiva perioder";
+$MyInActiveSessions = "Mina inaktiva perioder";
+$MySpace = "Rapporter";
 $ExtensionActivedButNotYetOperational = "Utökningen är aktiverad, men är för tillfället inte funktionell.";
 $MyStudents = "Mina studenter";
 $Progress = "Framsteg";

+ 36 - 40
main/lang/tagalog/trad4all.inc.php

@@ -8,38 +8,36 @@ $By = "Ni";
 $UsersOnline = "Mga Gumagamit online";
 $Description = "Remarks";
 $Links = "Mga Link";
-$langWorks = "Mga Takdang-aralin";
+$Works = "Mga Takdang-aralin";
 $Forums = "Mga Forum";
-$langExercices = "Mga Pagsusulit";
-$langCreateDir = "Lumikha ng folder";
-$langVisible = "Nakikita";
-$langNewDir = "Pangalan ng bagong folder";
+$Exercices = "Mga Pagsusulit";
+$CreateDir = "Lumikha ng folder";
+$Visible = "Nakikita";
+$NewDir = "Pangalan ng bagong folder";
 $Download = "I-download";
-$langEdit = "I-edit";
-$langGroupForum = "Grupo ng Forum";
+$Edit = "I-edit";
+$GroupForum = "Grupo ng Forum";
 $Language = "Wika";
 $LoginName = "Login";
 $Forum = "Forum";
-$langDelImage = "Tanggalin ang larawan";
+$DelImage = "Tanggalin ang larawan";
 $Down = "baba";
-$Up = "Taas";
 $Theme = "Grapikong theme";
 $TheListIsEmpty = "Walang laman";
-$langUniqueSelect = "Maramihang mapagpipilian";
-$langCourseCreate = "Lumikha ng isang kurso";
+$UniqueSelect = "Maramihang mapagpipilian";
+$CourseCreate = "Lumikha ng isang kurso";
 $UserName = "Username";
 $Hide = "Itago";
-$langCourseCode = "Koda";
-$langOfficialCode = "Koda";
+$CourseCode = "Koda";
+$OfficialCode = "Koda";
 $FirstName = "Pangalan";
 $LastName = "Apelyido";
 $Status = "Estado";
-$langEmail = "E-mail";
+$Email = "E-mail";
 $AvailableFrom = "Magagamit mula";
 $Preview = "Preview";
 $Type = "Uri";
 $Reporting = "Pag-uulat";
-$Code = "Koda";
 $Back = "Bumalik sa";
 $Info = "Impormasyon";
 $Search = "Maghanap";
@@ -53,42 +51,42 @@ $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
 $Next = "Susunod";
-$langAllowed = "Pinayagan";
-$langInvisible = "di-nakikita";
+$Allowed = "Pinayagan";
+$Invisible = "di-nakikita";
 $Help = "Tulong";
-$langAdd = "Magdagdag";
-$langConfirmYourChoice = "Mangyaring kumpirmahin ang iyong pinili";
-$langChoice = "Ang iyong pinili";
-$langNotAllowed = "Ikaw ay hindi pinapayagan na makita ang pahinang ito. Alinman sa iyong koneksyon ay nag-expire o sinusubukan mong mag-access sa isang pahina na wala kang sapat na mga pribilehiyo.";
-$langManager = "Tagapangasiwa";
+$Add = "Magdagdag";
+$ConfirmYourChoice = "Mangyaring kumpirmahin ang iyong pinili";
+$Choice = "Ang iyong pinili";
+$NotAllowed = "Ikaw ay hindi pinapayagan na makita ang pahinang ito. Alinman sa iyong koneksyon ay nag-expire o sinusubukan mong mag-access sa isang pahina na wala kang sapat na mga pribilehiyo.";
+$Manager = "Tagapangasiwa";
 $NextPage = "Susunod na pahina";
 $PreviousPage = "Nakaraang pahina";
-$langShow = "Ipakita";
-$langMyCourses = "Aking Mga Kurso";
-$langModifyProfile = "Profile";
-$langMyStats = "Tingan aking progreso";
-$langLogout = "Mag-Logout";
-$langMyAgenda = "Personal na agenda";
-$langCourseHomepage = "Home ng kurso";
-$langCourseManagerview = "Tanaw ng Guro";
-$langStudentView = "Tanaw ng Mag-aaral";
+$Show = "Ipakita";
+$MyCourses = "Aking Mga Kurso";
+$ModifyProfile = "Profile";
+$MyStats = "Tingan aking progreso";
+$Logout = "Mag-Logout";
+$MyAgenda = "Personal na agenda";
+$CourseHomepage = "Home ng kurso";
+$CourseManagerview = "Tanaw ng Guro";
+$StudentView = "Tanaw ng Mag-aaral";
 $Statistics = "Istatistika";
-$langPrevious = "Nakaraan";
+$Previous = "Nakaraan";
 $Courses = "Mga Kurso";
 $Home = "Home";
 $SelectAll = "Piliin lahat";
 $UnSelectAll = "Tanggalin lahat";
 $WithSelected = "Kasama nang pinili";
-$langOnLine = "Online";
-$langPlatformAdmin = "Pangasiwaan";
+$OnLine = "Online";
+$PlatformAdmin = "Pangasiwaan";
 $Doc = "Pagsasanay";
 $Groups = "Mga Grupo";
 $GroupManagement = "Pangangasiwa ng mga grupo";
 $All = "Lahat";
 $None = "wala";
-$langDenied = "Ang tampok na ito ay magagamit lamang ng mga trainer";
+$Denied = "Ang tampok na ito ay magagamit lamang ng mga trainer";
 $Today = "Ngayong araw";
-$langCourseHomepageLink = "Home ng kurso";
+$CourseHomepageLink = "Home ng kurso";
 $User = "Gumagamit";
 $MondayShort = "Lun";
 $TuesdayShort = "Mar";
@@ -160,10 +158,8 @@ $StartDateShouldBeBeforeEndDate = "Ang unang petsa ay dapat bago ang petsa ng pa
 $InvalidDate = "Di-wastong petsa";
 $OnlyLettersAndNumbersAllowed = "Tanging mga letra at mga numero ang pinapayagan";
 $OnlyImagesAllowed = "Tanging PNG, JPG o GIF na mga imahe ang pinapayagan";
-$Move = "Ilipat";
 $MoveTo = "Ilipat sa";
 $Delete = "Tanggalin";
-$Save = "I-save";
 $Error = "Error";
 $Anonymous = "Anonymous";
 $h = "h";
@@ -172,7 +168,7 @@ $Inbox = "Inbox";
 $ComposeMessage = "Magsulat ng mensahe";
 $Other = "Iba pa";
 $CampusHomepage = "Homepage";
-$langMySpace = "Pag-uulat";
+$MySpace = "Pag-uulat";
 $MyStudents = "Aking mga mag-aaral";
 $ActionNotAllowed = "Hindi pinapahintulutan ang aksyon";
 $Teachers = "Mga Trainer";
@@ -319,7 +315,7 @@ $AssessmentQuestions = "Paano matatasa ang mga mag-aaral? Mayroon bang mga estra
 $AssessmentInformation = "Criteria para sa pagtatamo ng mga kasanayan.";
 $AddAdditionalProfileField = "Magdagdag ng profile ng gumagamit sa field";
 $Metadata = "Metadata";
-$langAddMetadata = "Tingnan/I-edit ang Metadata";
+$AddMetadata = "Tingnan/I-edit ang Metadata";
 $SeeMore = "Tingnan ang marami pa";
 $Announcements = "Mga anunsyo";
 $Password = "Password";

+ 86 - 93
main/lang/thai/trad4all.inc.php

@@ -7,40 +7,38 @@ $ReplyShort = "ตอบ";
 $By = "โดย";
 $UsersOnline = "สมาชิกที่กำลังใช้งาน";
 $Remove = "เอาออก";
-$langEnter = "ย้อนกลับ";
+$Enter = "ย้อนกลับ";
 $Description = "คำอธิบาย";
 $Links = "การเชื่อมโยง";
-$langWorks = "ผลงาน/การบ้านของผู้เรียน";
+$Works = "ผลงาน/การบ้านของผู้เรียน";
 $Forums = "กลุ่มอภิปราย";
-$langExercices = "แบบทดสอบ";
-$langCreateDir = "สร้างแฟ้มเก็บไฟล์";
+$Exercices = "แบบทดสอบ";
+$CreateDir = "สร้างแฟ้มเก็บไฟล์";
 $Name = "ชื่อเอกสาร";
-$langComment = "ข้อคิดเห็น";
-$langVisible = "แสดง/ซ่อน";
-$langNewDir = "ชื่อแฟ้มใหม่";
-$langDirCr = "สร้างdirectory เรียบร้อย";
+$Comment = "ข้อคิดเห็น";
+$Visible = "แสดง/ซ่อน";
+$NewDir = "ชื่อแฟ้มใหม่";
+$DirCr = "สร้างdirectory เรียบร้อย";
 $Download = "การโอนย้ายไฟล์ขึ้น";
-$langGroup = "กลุ่ม";
-$langEdit = "แก้ไข";
-$langGroupForum = "กลุ่มอภิปราย";
+$Group = "กลุ่ม";
+$Edit = "แก้ไข";
+$GroupForum = "กลุ่มอภิปราย";
 $Language = "ภาษา";
 $LoginName = "เข้าสู่ระบบ";
 $Assignments = "งานที่อาจารย์มอบหมาย/การบ้าน";
 $Forum = "การอภิปราย";
-$langDelImage = "เอาภาพออก";
-$langCode = "รหัสวิชา";
-$langUp = "ขึ้น";
-$Down = "ŧ";
+$DelImage = "เอาภาพออก";
+$Code = "รหัสวิชา";
 $Up = "ขึ้น";
+$Down = "ŧ";
 $TheListIsEmpty = "ไม่มีรายการ";
-$langUniqueSelect = "แบบปรนัย(มีคำตอบที่ถูกเพียงข้อเดียว)";
-$langCourseCreate = "สร้างโฮมเพจรายวิชา";
-$langTodo = "ต้องทำ";
+$UniqueSelect = "แบบปรนัย(มีคำตอบที่ถูกเพียงข้อเดียว)";
+$CourseCreate = "สร้างโฮมเพจรายวิชา";
+$Todo = "ต้องทำ";
 $UserName = "ชื่อผู้ใช้";
-$lang_show_hide = "ซ่อน/แสดง";
-$langCategoryMod = "แก้ไขประเภท";
+$CategoryMod = "แก้ไขประเภท";
 $Hide = "ซ่อน";
-$langDear = "สวัสดี คุณ";
+$Dear = "สวัสดี คุณ";
 $iso639_2_code = "th";
 $iso639_1_code = "tha";
 $charset = "utf-8";
@@ -53,58 +51,54 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "ใช่";
-$langNo = "ไม่";
+$Yes = "ใช่";
+$No = "ไม่";
 $Next = "ต่อไป";
-$langAllowed = "͹حҵ";
-$langBackHome = "กลับไปที่โฮมเพจของ";
-$langPropositions = "ข้อเสนอแนะ";
-$langMaj = "ล่าสุด";
-$langModify = "แก้ไข";
-$langDelete = "ź";
-$langInvisible = "ทำไม่ให้มองเห็น";
-$langSave = "บันทึกการสนทนา";
-$langMove = "ย้าย";
+$Allowed = "͹حҵ";
+$BackHome = "กลับไปที่โฮมเพจของ";
+$Propositions = "ข้อเสนอแนะ";
+$Maj = "ล่าสุด";
+$Modify = "แก้ไข";
+$Invisible = "ทำไม่ให้มองเห็น";
+$Save = "บันทึกการสนทนา";
+$Move = "ย้าย";
 $Help = "คำแนะนำ";
-$langOk = "ตกลง";
-$langAdd = "เพิ่ม";
-$langAddIntro = "เพิ่มคำนำ";
-$langBackList = "กลับไปสารบัญ";
-$langText = "ข้อความ";
-$langEmpty = "คุณกรอกรายการที่ต้องการยังไม่ครบ.<br>ให้กดปุ่ม Back ของโปรแกรมดูอินเตอร์เน็ตที่คุณกำลังใช้อยู่ เพื่อย้อนกลับไปตรวจสอบและกรอกรายการให้ครบตามที่ระบบต้องการหรือที่มีเครื่องหมายดอกจันกำกับไว้*<br>หากวิชาของคุณไม่มีรหัสวิชาตามหลักสูตรของสถานศึกษา โปรดกำหนดขึ้นเองหรือใช้ชื่อวิชาแทนไปก่อน";
-$langConfirmYourChoice = "โปรดยืนยันที่คุณเลือก";
-$langAnd = "และ";
-$langChoice = "ที่คุณเลือก";
-$langFinish = "เสร็จสิ้น";
-$langCancel = "ยกเลิก";
-$langNotAllowed = "ไม่อนุญาต";
-$langNotLogged = "คุณยังไม่ได้เข้าสู่รายวิชา";
-$langManager = "ผู้จัดการระบบ";
-$langOptional = "เลือกตั้งค่า";
+$Ok = "ตกลง";
+$Add = "เพิ่ม";
+$AddIntro = "เพิ่มคำนำ";
+$BackList = "กลับไปสารบัญ";
+$Text = "ข้อความ";
+$Empty = "คุณกรอกรายการที่ต้องการยังไม่ครบ.<br>ให้กดปุ่ม Back ของโปรแกรมดูอินเตอร์เน็ตที่คุณกำลังใช้อยู่ เพื่อย้อนกลับไปตรวจสอบและกรอกรายการให้ครบตามที่ระบบต้องการหรือที่มีเครื่องหมายดอกจันกำกับไว้*<br>หากวิชาของคุณไม่มีรหัสวิชาตามหลักสูตรของสถานศึกษา โปรดกำหนดขึ้นเองหรือใช้ชื่อวิชาแทนไปก่อน";
+$ConfirmYourChoice = "โปรดยืนยันที่คุณเลือก";
+$And = "และ";
+$Choice = "ที่คุณเลือก";
+$Finish = "เสร็จสิ้น";
+$Cancel = "ยกเลิก";
+$NotAllowed = "ไม่อนุญาต";
+$NotLogged = "คุณยังไม่ได้เข้าสู่รายวิชา";
+$Manager = "ผู้จัดการระบบ";
+$Optional = "เลือกตั้งค่า";
 $NextPage = "หน้าต่อไป";
 $PreviousPage = "หน้าที่ผ่านมา";
-$langUse = "ใช้";
-$langTotal = "รวม";
-$langTake = "เริ่ม take";
-$langOne = "หนึ่ง";
-$langSeveral = "หลาย";
-$langNotice = "แจ้งข่าว";
-$langDate = "วันที่";
-$langAmong = "ระหว่าง among";
-$langShow = "แสดง";
-$langMyCourses = "รายวิชาของเรา";
-$langModifyProfile = "แก้ไขข้อมูลส่วนตัว";
-$langMyStats = "ดูสถิติการเข้าใช้งานระบบของเรา";
-$langLogout = "ออกจากระบบ";
-$langMyAgenda = "กำหนดการของเรา";
-$langCourseHomepage = "โฮมเพจรายวิชา";
-$langCourseManagerview = "หน้าแสดงผลของผู้สอน";
-$langStudentView = "หน้าแสดงผลของผู้เรียน";
+$Use = "ใช้";
+$Total = "รวม";
+$Take = "เริ่ม take";
+$One = "หนึ่ง";
+$Several = "หลาย";
+$Notice = "แจ้งข่าว";
+$Date = "วันที่";
+$Among = "ระหว่าง among";
+$Show = "แสดง";
+$MyCourses = "รายวิชาของเรา";
+$ModifyProfile = "แก้ไขข้อมูลส่วนตัว";
+$MyStats = "ดูสถิติการเข้าใช้งานระบบของเรา";
+$Logout = "ออกจากระบบ";
+$MyAgenda = "กำหนดการของเรา";
+$CourseHomepage = "โฮมเพจรายวิชา";
+$CourseManagerview = "หน้าแสดงผลของผู้สอน";
+$StudentView = "หน้าแสดงผลของผู้เรียน";
 $AddResource = "เพิ่ม";
 $AddedResources = "แนบไฟล์";
-$lang_modify_resource = "ปรับแก้/เพิ่มข้อมูล";
-$lang_resource = "ข้อมูล";
-$lang_resources = "แหล่งข้อมูล";
 $langNameOfLang['arabic'] = "ÍÒËÃѺ";
 $langNameOfLang['brazilian'] = "ºÃÒ«ÔÅ";
 $langNameOfLang['bulgarian'] = "ºÑÅ¡ÒàÃÕÂ";
@@ -128,26 +122,26 @@ $langNameOfLang['russian'] = "ÃÑÊà«ÕÂ";
 $langNameOfLang['simpl_chinese'] = "šÕ¹¡ÅÒ§";
 $langNameOfLang['spanish'] = "Ê໹";
 $Close = "ปิด";
-$langPlatform = "ระบบ";
+$Platform = "ระบบ";
 $localLangName = "ภาษา";
 $email = "อีเมล";
-$langCourseCodeAlreadyExists = "ขออภัย! รหัสวิชานี้มีอยู่แล้ว โปรดเลือกรหัสอื่นหรือกำหนดให้แตกต่างออกไป";
+$CourseCodeAlreadyExists = "ขออภัย! รหัสวิชานี้มีอยู่แล้ว โปรดเลือกรหัสอื่นหรือกำหนดให้แตกต่างออกไป";
 $Statistics = "สถิติ";
-$langGrouplist = "รายชื่อกลุ่ม";
-$langPrevious = "ที่ผ่านมา";
+$Grouplist = "รายชื่อกลุ่ม";
+$Previous = "ที่ผ่านมา";
 $Courses = "รายวิชา";
 $In = "ใน";
-$langShowAll = "แสดงทั้งหมด";
-$langPage = "หน้า";
+$ShowAll = "แสดงทั้งหมด";
+$Page = "หน้า";
 $englishLangName = "อังกฤษ";
 $Home = "หน้าแรก";
-$langAreYouSureToDelete = "ท่านแน่ใจหรือว่าต้องการลบ";
+$AreYouSureToDelete = "ท่านแน่ใจหรือว่าต้องการลบ";
 $SelectAll = "เลือกทั้งหมด";
 $UnSelectAll = "ไม่เลือกทั้งหมด";
 $WithSelected = "กับที่เลือก";
-$langOnLine = "ออนไลน์";
-$langUsers = "ผู้ใช้";
-$langPlatformAdmin = "การบริหารจัดการระบบ";
+$OnLine = "ออนไลน์";
+$Users = "ผู้ใช้";
+$PlatformAdmin = "การบริหารจัดการระบบ";
 $langNameOfLang['hungarian'] = "Îѧ¡ÒÃÕ";
 $langNameOfLang['indonesian'] = "ÍԹ⎹Õà«ÕÂ";
 $langNameOfLang['malay'] = "ÁÒàÅà«ÕÂ";
@@ -158,21 +152,20 @@ $langNameOfLang['thai'] = "ä·Â";
 $langNameOfLang['turkce'] = "µØáÕ";
 $langNameOfLang['vietnamese'] = "àÇÕÂŽ¹ÒÁ";
 $UserInfo = "ข้อมูลของผู้ใช้";
-$langModifyQuestion = "ปรับ/แก้ไขคำถาม";
-$langCheckAll = "เลือกทั้งหมด";
-$langNbAnnoucement = "ประกาศ";
-$lang_no_access_here = "ห้ามเข้า";
-$langOtherCourses = "รายวิชาอื่น";
+$ModifyQuestion = "ปรับ/แก้ไขคำถาม";
+$CheckAll = "เลือกทั้งหมด";
+$NbAnnoucement = "ประกาศ";
+$OtherCourses = "รายวิชาอื่น";
 $Doc = "เอกสาร";
 $PlataformAdmin = "การบริหารระบบ";
 $Groups = "กลุ่ม";
 $GroupManagement = "การบริหารกลุ่ม";
 $All = "ทั้งหมด";
 $None = "ไม่มี";
-$langSorry = "เลือกวิชาก่อน";
-$langDenied = "à»ç¹Ë¹éÒ·Õè¢Í§ŒÙéŽÙáÅÃкº";
+$Sorry = "เลือกวิชาก่อน";
+$Denied = "à»ç¹Ë¹éÒ·Õè¢Í§ŒÙéŽÙáÅÃкº";
 $Today = "Çѹ¹Õé";
-$langCourseHomepageLink = "โฮมเพจรายวิชา";
+$CourseHomepageLink = "โฮมเพจรายวิชา";
 $Attachment = "สิ่งที่แนบมาด้วย";
 $User = "ผู้ใช้";
 $MondayInit = "จ";
@@ -230,10 +223,10 @@ $SeptemberLong = "กันยายน";
 $OctoberLong = "ตุลาคม";
 $NovemberLong = "พฤศจิกายน";
 $DecemberLong = "ธันวาคม";
-$langMyCompetences = "ความสามารถพิเศษ";
-$langMyDiplomas = "คุณวุฒิ";
-$langMyPersonalOpenArea = "ข้อมูลส่วนตัวที่เปิดเผยได้";
-$langMyTeach = "วิชาที่สอนได้";
+$MyCompetences = "ความสามารถพิเศษ";
+$MyDiplomas = "คุณวุฒิ";
+$MyPersonalOpenArea = "ข้อมูลส่วนตัวที่เปิดเผยได้";
+$MyTeach = "วิชาที่สอนได้";
 $Agenda = "กำหนดการ";
 $HourShort = ":";
 $PleaseTryAgain = "กรุณาลองใหม่";
@@ -243,7 +236,7 @@ $UplNotAZip = "ไฟล์ที่เลือกไม่ใช่ไฟล
 $UplUploadSucceeded = "โอนย้ายไฟล์ขึ้นระบบเรียบร้อยแล้ว";
 $ExportAsCSV = "ส่งออกเป็นไฟล์csv";
 $ExportAsXLS = "ส่งออกเป็นไฟล์xls";
-$langOpenarea = "ข้อมูลส่วนตัวที่เปิดเผยได้";
+$Openarea = "ข้อมูลส่วนตัวที่เปิดเผยได้";
 $Done = "เสร็จสิ้น";
 $Documents = "เอกสาร";
 $DocumentAdded = "เพิ่มเอกสารแล้ว";
@@ -256,7 +249,7 @@ $Link = "การเชื่อมโยง";
 $Announcement = "ประกาศ";
 $Dropbox = "กล่องรับส่งงาน";
 $Quiz = "แบบทดสอบ";
-$langChat = "สนทนาออนไลน์";
+$Chat = "สนทนาออนไลน์";
 $Conference = "การสัมมนาออนไลน์";
 $Student_publication = "การส่งผลงาน/การบ้านของผู้เรียน";
 $Tracking = "การติดตามผล";
@@ -269,8 +262,8 @@ $StartDate = "เริ่มวันที่";
 $EndDate = "ถึงวันที่";
 $StartTime = "เริ่มเวลา";
 $EndTime = "ถึงเวลา";
-$langYouWereCalled = "คุณได้รับเชิญให้เข้าร่วมสนทนาออนไลน์กับ";
-$langDoYouAccept = "คุณยอมรับหรือไม่";
+$YouWereCalled = "คุณได้รับเชิญให้เข้าร่วมสนทนาออนไลน์กับ";
+$DoYouAccept = "คุณยอมรับหรือไม่";
 $Everybody = "ทุกคน";
 $SentTo = "ส่งถึง";
 $Export = "ส่งออก";

+ 96 - 106
main/lang/trad_chinese/trad4all.inc.php

@@ -8,49 +8,47 @@ $NoTimeLimits = "沒有時限";
 $Title = "標題";
 $UsersOnline = "線上使用者";
 $Remove = "移除";
-$langEnter = "返回課程清單";
+$Enter = "返回課程清單";
 $Description = "描述";
 $Links = "連結";
-$langWorks = "作業論文";
+$Works = "作業論文";
 $Forums = "討論區";
-$langExercices = "測驗";
-$langCreateDir = "創建資料夾";
+$Exercices = "測驗";
+$CreateDir = "創建資料夾";
 $Name = "名稱";
-$langComment = "摘要";
-$langVisible = "顯示/隱藏";
-$langNewDir = "新檔案夾名稱";
-$langDirCr = "目錄已經創建";
+$Comment = "摘要";
+$Visible = "顯示/隱藏";
+$NewDir = "新檔案夾名稱";
+$DirCr = "目錄已經創建";
 $Download = "下載";
-$langGroup = "小組";
-$langEdit = "編輯";
-$langGroupForum = "小組論壇";
+$Group = "小組";
+$Edit = "編輯";
+$GroupForum = "小組論壇";
 $Language = "語言";
 $LoginName = "登入名稱";
 $AutostartMp3 = "若你想音訊檔自動插放,請按「確定」。";
 $Assignments = "課業";
 $Forum = "討論區";
-$langDelImage = "移除圖片";
-$langCode = "代碼";
-$langUp = "向上";
-$Down = "向下";
+$DelImage = "移除圖片";
+$Code = "代碼";
 $Up = "向上";
+$Down = "向下";
 $TheListIsEmpty = "這清單未有項目";
-$langUniqueSelect = "單一答案選擇題";
-$langCourseCreate = "創建課程";
-$langTodo = "您的建議";
+$UniqueSelect = "單一答案選擇題";
+$CourseCreate = "創建課程";
+$Todo = "您的建議";
 $UserName = "使用者名稱";
-$lang_show_hide = "顯示/隱藏";
-$langCategoryMod = "修改分類";
+$CategoryMod = "修改分類";
 $Hide = "隱藏";
-$langDear = "尊敬的";
-$langArchive = "資料庫";
-$langCourseCode = "課程編號";
-$langNoDescription = "無形容";
-$langOfficialCode = "編號";
+$Dear = "尊敬的";
+$Archive = "資料庫";
+$CourseCode = "課程編號";
+$NoDescription = "無形容";
+$OfficialCode = "編號";
 $FirstName = "名";
 $LastName = "姓";
 $Status = "身份";
-$langEmail = "電子郵件";
+$Email = "電子郵件";
 $SlideshowConversion = "轉換投映片";
 $UploadFile = "上傳檔案";
 $AvailableFrom = "開始生效日期";
@@ -60,7 +58,6 @@ $Type = "類型";
 $EmailAddress = "電郵地址";
 $Organisation = "機構";
 $Reporting = "報告";
-$Code = "編碼";
 $Update = "更新";
 $CurrentCourse = "當前課程";
 $Back = "返回";
@@ -88,93 +85,88 @@ $dateFormatShort = "%b %d, %y";
 $dateFormatLong = "%A %B %d, %Y";
 $dateTimeFormatLong = "%B %d, %Y at %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "確定";
-$langNo = "否";
+$Yes = "確定";
+$No = "否";
 $Next = "下一個";
-$langAllowed = "允許";
-$langBackHome = "返回主頁";
-$langPropositions = "提出建議";
-$langMaj = "更新";
-$langModify = "修改";
-$langDelete = "刪除";
-$langInvisible = "隱蕆";
-$langSave = "儲存";
-$langMove = "移動";
+$Allowed = "允許";
+$BackHome = "返回主頁";
+$Propositions = "提出建議";
+$Maj = "更新";
+$Modify = "修改";
+$Invisible = "隱蕆";
+$Save = "儲存";
+$Move = "移動";
 $Help = "幫助";
-$langOk = "確定";
-$langAdd = "添加";
-$langAddIntro = "添加介紹文本";
-$langBackList = "返回清單";
-$langText = "內容";
-$langEmpty = "有些項目沒有填寫。<br /><b>返回重試</b>。<br />如果不想填寫課程代碼,請參考教學大綱";
-$langConfirmYourChoice = "確定您的選擇嗎?";
-$langAnd = "和";
-$langChoice = "選擇答案";
-$langFinish = "完成";
-$langCancel = "取消";
-$langNotAllowed = "禁用";
-$langNotLogged = "你並沒有登錄一項課程";
-$langManager = "管理員";
-$langOptional = "可選";
+$Ok = "確定";
+$Add = "添加";
+$AddIntro = "添加介紹文本";
+$BackList = "返回清單";
+$Text = "內容";
+$Empty = "有些項目沒有填寫。<br /><b>返回重試</b>。<br />如果不想填寫課程代碼,請參考教學大綱";
+$ConfirmYourChoice = "確定您的選擇嗎?";
+$And = "和";
+$Choice = "選擇答案";
+$Finish = "完成";
+$Cancel = "取消";
+$NotAllowed = "禁用";
+$NotLogged = "你並沒有登錄一項課程";
+$Manager = "管理員";
+$Optional = "可選";
 $NextPage = "下一頁";
 $PreviousPage = "上一頁";
-$langUse = "使用";
-$langTotal = "總計";
-$langTake = "參與";
-$langOne = "一個";
-$langSeveral = "多個";
-$langNotice = "注意";
-$langDate = "日期";
-$langAmong = "在";
-$langShow = "顯示";
-$langMyCourses = "我的課程";
-$langModifyProfile = "個人資料";
-$langMyStats = "檢視狀態";
-$langLogout = "退出";
-$langMyAgenda = "日程安排";
-$langCourseHomepage = "課程主頁";
-$langCourseManagerview = "教師界面";
-$langStudentView = "學生界面";
+$Use = "使用";
+$Total = "總計";
+$Take = "參與";
+$One = "一個";
+$Several = "多個";
+$Notice = "注意";
+$Date = "日期";
+$Among = "在";
+$Show = "顯示";
+$MyCourses = "我的課程";
+$ModifyProfile = "個人資料";
+$MyStats = "檢視狀態";
+$Logout = "退出";
+$MyAgenda = "日程安排";
+$CourseHomepage = "課程主頁";
+$CourseManagerview = "教師界面";
+$StudentView = "學生界面";
 $AddResource = "加入";
 $AddedResources = "附件";
-$lang_modify_resource = "修改/添加資源";
-$lang_resource = "資源";
-$lang_resources = "資源";
-$langPlatform = "系統";
+$Platform = "系統";
 $localLangName = "語言";
 $email = "電郵";
-$langCourseCodeAlreadyExists = "對不起,這課程編號已經存在,請選另外一個。";
+$CourseCodeAlreadyExists = "對不起,這課程編號已經存在,請選另外一個。";
 $Statistics = "統計";
-$langGrouplist = "群組清單";
-$langPrevious = "上一步";
+$Grouplist = "群組清單";
+$Previous = "上一步";
 $DestDirectoryDoesntExist = "目標檔案夾不存在";
 $Courses = "課程";
-$langShowAll = "全部顯示";
-$langPage = "頁";
+$ShowAll = "全部顯示";
+$Page = "頁";
 $Home = "首頁";
-$langAreYouSureToDelete = "確定要刪除";
+$AreYouSureToDelete = "確定要刪除";
 $SelectAll = "全選";
 $UnSelectAll = "全不選";
 $WithSelected = "用已選的";
-$langOnLine = "線上";
-$langUsers = "用戶";
-$langPlatformAdmin = "系統管理";
+$OnLine = "線上";
+$Users = "用戶";
+$PlatformAdmin = "系統管理";
 $UserInfo = "用戶訊息";
-$langModifyQuestion = "修改題目";
-$langCheckAll = "全部選定";
-$langNbAnnoucement = "通知";
-$lang_no_access_here = "不開放";
-$langOtherCourses = "其它課程";
+$ModifyQuestion = "修改題目";
+$CheckAll = "全部選定";
+$NbAnnoucement = "通知";
+$OtherCourses = "其它課程";
 $Doc = "學習路徑";
 $PlataformAdmin = "平台管理員";
 $Groups = "組別";
 $GroupManagement = "組別管理";
 $All = "全部";
 $None = "沒有";
-$langSorry = "先選擇一個課程";
-$langDenied = "此功能只供課程管理員使用";
+$Sorry = "先選擇一個課程";
+$Denied = "此功能只供課程管理員使用";
 $Today = "今天";
-$langCourseHomepageLink = "課程首頁";
+$CourseHomepageLink = "課程首頁";
 $Attachment = "附件";
 $User = "使用者";
 $MondayLong = "星期一";
@@ -196,10 +188,10 @@ $SeptemberLong = "九月";
 $OctoberLong = "十月";
 $NovemberLong = "十一月";
 $DecemberLong = "十二月";
-$langMyCompetences = "我的資歷";
-$langMyDiplomas = "我的文憑";
-$langMyPersonalOpenArea = "我的個人公開天地";
-$langMyTeach = "我能任教的項目";
+$MyCompetences = "我的資歷";
+$MyDiplomas = "我的文憑";
+$MyPersonalOpenArea = "我的個人公開天地";
+$MyTeach = "我能任教的項目";
 $Agenda = "日程";
 $PleaseTryAgain = "請再嘗試!";
 $UplNoFileUploaded = "未有上傳文件";
@@ -208,7 +200,7 @@ $UplNotAZip = "你選的檔案並非 zip 格式。";
 $UplUploadSucceeded = "成功上傳檔案!";
 $ExportAsCSV = "以 CSV 檔匯出";
 $ExportAsXLS = "以 XLS 檔匯出";
-$langOpenarea = "個人開放區";
+$Openarea = "個人開放區";
 $Done = "完成";
 $Documents = "文件";
 $DocumentAdded = "已加入文件";
@@ -221,7 +213,7 @@ $Link = "連結";
 $Announcement = "公告";
 $Dropbox = "投遞箱";
 $Quiz = "小測驗";
-$langChat = "聊天";
+$Chat = "聊天";
 $Conference = "研討會";
 $Student_publication = "課業";
 $Tracking = "報告";
@@ -234,8 +226,8 @@ $StartDate = "開始日期";
 $EndDate = "結束日期";
 $StartTime = "開始時間";
 $EndTime = "結束時間";
-$langYouWereCalled = "有人邀請你聊天,邀請者是:";
-$langDoYouAccept = "是否同意?";
+$YouWereCalled = "有人邀請你聊天,邀請者是:";
+$DoYouAccept = "是否同意?";
 $Everybody = "每一個人";
 $SentTo = "顯示給";
 $Export = "匯出";
@@ -259,7 +251,7 @@ $FormHasErrorsPleaseComplete = "表格中有不完整或不正確的資料。請
 $StartDateShouldBeBeforeEndDate = "開始日期必須早於結束日期";
 $InvalidDate = "無效日期";
 $OnlyLettersAndNumbersAllowed = "只可使用英文字母及數字";
-$langBasicOverview = "基本";
+$BasicOverview = "基本";
 $CourseAdminRole = "課程管理員";
 $UserRole = "角色";
 $OnlyImagesAllowed = "只允許 PNG, JPG or GIF 圖片";
@@ -269,16 +261,14 @@ $DeleteRight = "刪除";
 $OverviewCourseRights = "檢視角色及權限";
 $SeeAllRightsAllLocationsForSpecificRole = "集中於角色";
 $SeeAllRolesAllLocationsForSpecificRight = "集中於權限";
-$langAdvanced = "進階";
+$Advanced = "進階";
 $RightValueModified = "數值已被更新";
 $course_rights = "檢視角色及權限";
 $Visio_conference = "虛擬會議";
 $CourseAdminRoleDescription = "課程管理員";
-$Move = "移動";
 $MoveTo = "移到";
 $Delete = "刪除";
 $MoveFileTo = "把檔案移到";
-$Save = "儲存";
 $Error = "錯誤";
 $Anonymous = "匿名";
 $Actions = "行動";
@@ -288,9 +278,9 @@ $Other = "其他";
 $AddRight = "加入";
 $CampusHomepage = "站台首頁";
 $YouHaveNewMessage = "你收到新訊息!";
-$langMyActiveSessions = "我的活躍 sessions";
-$langMyInActiveSessions = "我的不活躍 Sessions";
-$langMySpace = "學習進度";
+$MyActiveSessions = "我的活躍 sessions";
+$MyInActiveSessions = "我的不活躍 Sessions";
+$MySpace = "學習進度";
 $MyStudents = "我的學員";
 $Progress = "進程";
 $Or = "或";

+ 92 - 99
main/lang/turkish/trad4all.inc.php

@@ -8,54 +8,52 @@ $NoTimeLimits = "Zaman sınırlaması yok";
 $Title = "Başlık";
 $UsersOnline = "Online kullanıcılar";
 $Remove = "Kaldır";
-$langEnter = "Derslerinizin listesi";
+$Enter = "Derslerinizin listesi";
 $Description = "Açıklama";
 $Links = "Bağlantılar";
-$langWorks = "Öğrenci Yazıları";
+$Works = "Öğrenci Yazıları";
 $Forums = "Forumlar";
-$langExercices = "Alıştırmalar";
-$langCreateDir = "Dizin yarat";
+$Exercices = "Alıştırmalar";
+$CreateDir = "Dizin yarat";
 $Name = "İsim";
-$langComment = "Yorum";
-$langVisible = "Görünür/Görünmez";
-$langNewDir = "Yeni dosya ismi";
-$langDirCr = "Dizin yaratıldı";
+$Comment = "Yorum";
+$Visible = "Görünür/Görünmez";
+$NewDir = "Yeni dosya ismi";
+$DirCr = "Dizin yaratıldı";
 $Download = "Gönder";
-$langGroup = "Grup";
-$langEdit = "düzenle";
-$langGroupForum = "Forum";
+$Group = "Grup";
+$Edit = "düzenle";
+$GroupForum = "Forum";
 $Language = "Dil";
 $LoginName = "Kullanıcı adı";
 $AutostartMp3 = "Ses dosyasını otomatik başlatmak istiyor musunuz ?";
 $Assignments = "Öğrenci Çalışmaları";
 $Forum = "Forumlar";
-$langDelImage = "Fotoyu kaldır";
-$langCode = "Ders kodu";
-$langUp = "Yukarı";
+$DelImage = "Fotoyu kaldır";
+$Code = "Ders kodu";
+$Up = "Yukarı";
 $Down = "aşağı";
-$Up = "yukarı";
 $Theme = "Grafik  tema";
 $TheListIsEmpty = "Liste boş.";
-$langUniqueSelect = "Çoktan seçme (Tek cevap)";
+$UniqueSelect = "Çoktan seçme (Tek cevap)";
 $SendFile = "Belge yükle";
 $SaveChanges = "Değişiklikleri kaydet";
 $SearchTerm = "Arama terimi";
 $TooShort = "Çok kısa";
-$langCourseCreate = "Ders web sitesi oluştur";
-$langTodo = "Yapılacaklar";
+$CourseCreate = "Ders web sitesi oluştur";
+$Todo = "Yapılacaklar";
 $UserName = "Kullanıcı ismi";
-$lang_show_hide = "Göster / Gizle";
-$langCategoryMod = "Kategori düzenle";
+$CategoryMod = "Kategori düzenle";
 $Hide = "Sakla";
-$langDear = "Sayın";
-$langArchive = "Arşiv";
-$langCourseCode = "Kurs Kod";
-$langNoDescription = "Açıklama yok";
-$langOfficialCode = "Kod";
+$Dear = "Sayın";
+$Archive = "Arşiv";
+$CourseCode = "Kurs Kod";
+$NoDescription = "Açıklama yok";
+$OfficialCode = "Kod";
 $FirstName = "Adınız";
 $LastName = "Soyadınız";
 $Status = "Profil";
-$langEmail = "E-posta";
+$Email = "E-posta";
 $Preview = "Önizleme";
 $EmailAddress = "E-posta adresi";
 $Update = "Güncelle";
@@ -75,58 +73,54 @@ $dateFormatShort = "%d %b %y";
 $dateFormatLong = "%A %d %B %Y";
 $dateTimeFormatLong = "%d %B %Y Saat %I:%M %p";
 $timeNoSecFormat = "%I:%M %p";
-$langYes = "evet";
-$langNo = "Hayır";
+$Yes = "evet";
+$No = "Hayır";
 $Next = "Sonraki";
-$langAllowed = "EVET";
-$langBackHome = "Dönülecek AnaSayfa:";
-$langPropositions = "Öner";
-$langMaj = "Güncelle";
-$langModify = "düzenle";
-$langDelete = "sil";
-$langInvisible = "Görünmez yap";
-$langSave = "Mesaj gönder";
-$langMove = "Taşı";
+$Allowed = "EVET";
+$BackHome = "Dönülecek AnaSayfa:";
+$Propositions = "Öner";
+$Maj = "Güncelle";
+$Modify = "düzenle";
+$Invisible = "Görünmez yap";
+$Save = "Mesaj gönder";
+$Move = "Taşı";
 $Help = "Yardım";
-$langOk = "Tamam";
-$langAdd = "Ekle";
-$langAddIntro = "Giriş metni ekle";
-$langBackList = "Listeye dön";
-$langText = "Metin";
-$langEmpty = "Bazı alanları boş bıraktınız.<br>Gezgininizin <b>Geri</b> düğmesini kullanarak doldurunuz.<br>Eğer ders kodunu yazmadıysanız Ders Programına bakınız";
-$langConfirmYourChoice = "Lütfen seçiminizi onaylayın";
-$langAnd = "ve";
-$langChoice = "Seçiminiz";
-$langFinish = "Bitir";
-$langCancel = "İptal";
-$langNotAllowed = "İzin verilmiyor";
-$langNotLogged = "Bir derse kullanıcı girişi yapmadınız.";
-$langManager = "Yönetici";
-$langOptional = "Seçmeli";
+$Ok = "Tamam";
+$Add = "Ekle";
+$AddIntro = "Giriş metni ekle";
+$BackList = "Listeye dön";
+$Text = "Metin";
+$Empty = "Bazı alanları boş bıraktınız.<br>Gezgininizin <b>Geri</b> düğmesini kullanarak doldurunuz.<br>Eğer ders kodunu yazmadıysanız Ders Programına bakınız";
+$ConfirmYourChoice = "Lütfen seçiminizi onaylayın";
+$And = "ve";
+$Choice = "Seçiminiz";
+$Finish = "Bitir";
+$Cancel = "İptal";
+$NotAllowed = "İzin verilmiyor";
+$NotLogged = "Bir derse kullanıcı girişi yapmadınız.";
+$Manager = "Yönetici";
+$Optional = "Seçmeli";
 $NextPage = "Sonraki sayfa>>>";
 $PreviousPage = "<<<Önceki Sayfa";
-$langUse = "Kullanım";
-$langTotal = "Toplam";
-$langTake = "al";
-$langOne = "Bir";
-$langSeveral = "Birkaç";
-$langNotice = "Uyarı";
-$langDate = "Tarih";
-$langAmong = "arasında";
-$langShow = "Göster";
-$langMyCourses = "Derslerim";
-$langModifyProfile = "Profilimi değiştir";
-$langMyStats = "İstatistiklerimi Göster";
-$langLogout = "Çıkış";
-$langMyAgenda = "Ajandam";
-$langCourseHomepage = "Ders AnaSayfası";
-$langCourseManagerview = "Öğretmen Görünümü";
-$langStudentView = "Öğrenci Görünümü";
+$Use = "Kullanım";
+$Total = "Toplam";
+$Take = "al";
+$One = "Bir";
+$Several = "Birkaç";
+$Notice = "Uyarı";
+$Date = "Tarih";
+$Among = "arasında";
+$Show = "Göster";
+$MyCourses = "Derslerim";
+$ModifyProfile = "Profilimi değiştir";
+$MyStats = "İstatistiklerimi Göster";
+$Logout = "Çıkış";
+$MyAgenda = "Ajandam";
+$CourseHomepage = "Ders AnaSayfası";
+$CourseManagerview = "Öğretmen Görünümü";
+$StudentView = "Öğrenci Görünümü";
 $AddResource = "Ekle";
 $AddedResources = "Ekler";
-$lang_modify_resource = "Kaynakları Düzenle / Ekle";
-$lang_resource = "Kaynak";
-$lang_resources = "Kaynak";
 $langNameOfLang['arabic'] = "Arapça";
 $langNameOfLang['brazilian'] = "Portekizce(Brezilya)";
 $langNameOfLang['bulgarian'] = "Bulgarca";
@@ -150,26 +144,26 @@ $langNameOfLang['russian'] = "russian";
 $langNameOfLang['simpl_chinese'] = "Temel Çince";
 $langNameOfLang['spanish'] = "spanish";
 $Close = "Kapat";
-$langPlatform = "Geliştiren";
+$Platform = "Geliştiren";
 $localLangName = "lisan";
 $email = "e-posta";
-$langCourseCodeAlreadyExists = "Üzgünüm, Bu ders kodu zaten var. Lütfen başka bir kod belirleyiniz.";
+$CourseCodeAlreadyExists = "Üzgünüm, Bu ders kodu zaten var. Lütfen başka bir kod belirleyiniz.";
 $Statistics = "İstatistik";
-$langGrouplist = "grup listesi";
-$langPrevious = "önceki";
+$Grouplist = "grup listesi";
+$Previous = "önceki";
 $Courses = "dersler";
 $In = "in";
-$langShowAll = "Hepsini göster";
-$langPage = "Sayfa";
+$ShowAll = "Hepsini göster";
+$Page = "Sayfa";
 $englishLangName = "İngilizce";
 $Home = "Ana sayfa";
-$langAreYouSureToDelete = "Silmek istediğinizden emin misiniz?";
+$AreYouSureToDelete = "Silmek istediğinizden emin misiniz?";
 $SelectAll = "Tümünü seç";
 $UnSelectAll = "hiçbirini seçme";
 $WithSelected = "Seçilenler ile";
-$langOnLine = "Online";
-$langUsers = "Kullanıcılar";
-$langPlatformAdmin = "Platform Yönetimi";
+$OnLine = "Online";
+$Users = "Kullanıcılar";
+$PlatformAdmin = "Platform Yönetimi";
 $langNameOfLang['hungarian'] = "hungarian";
 $langNameOfLang['indonesian'] = "indonesian";
 $langNameOfLang['malay'] = "malay";
@@ -180,21 +174,20 @@ $langNameOfLang['thai'] = "thai";
 $langNameOfLang['turkce'] = "Türkçe";
 $langNameOfLang['vietnamese'] = "vietnamese";
 $UserInfo = "kullanıcı bilgisi";
-$langModifyQuestion = "Soruyu düzenle";
-$langCheckAll = "Hepsini seç";
-$langNbAnnoucement = "Duyuru";
-$lang_no_access_here = "Erişim yetkiniz yok";
-$langOtherCourses = "diğer dersler";
+$ModifyQuestion = "Soruyu düzenle";
+$CheckAll = "Hepsini seç";
+$NbAnnoucement = "Duyuru";
+$OtherCourses = "diğer dersler";
 $Doc = "belge";
 $PlataformAdmin = "Platform Yöneticisi";
 $Groups = "Gruplar";
 $GroupManagement = "Grup Yönetimi";
 $All = "Hepsi";
 $None = "hiçbiri";
-$langSorry = "Lütfen önce bir ders seçin";
-$langDenied = "Bu i&#351;lev sadece ders yetkilileri içindir";
+$Sorry = "Lütfen önce bir ders seçin";
+$Denied = "Bu i&#351;lev sadece ders yetkilileri içindir";
 $Today = "bugün";
-$langCourseHomepageLink = "Geçerli Ders";
+$CourseHomepageLink = "Geçerli Ders";
 $Attachment = "eki";
 $User = "Kullanıcı";
 $MondayInit = "Pzt";
@@ -254,10 +247,10 @@ $SeptemberLong = "Eylül";
 $OctoberLong = "Ekim";
 $NovemberLong = "Kasım";
 $DecemberLong = "Aralık";
-$langMyCompetences = "Becerilerim";
-$langMyDiplomas = "Diplomalarım";
-$langMyPersonalOpenArea = "Kişisel açık alanım";
-$langMyTeach = "Ne öğretebilirim";
+$MyCompetences = "Becerilerim";
+$MyDiplomas = "Diplomalarım";
+$MyPersonalOpenArea = "Kişisel açık alanım";
+$MyTeach = "Ne öğretebilirim";
 $Agenda = "Ajanda";
 $HourShort = ":";
 $PleaseTryAgain = "Lütfen tekrar deneyin !";
@@ -267,7 +260,7 @@ $UplNotAZip = "Seçtiğiniz dosya Zip dosyası değil.";
 $UplUploadSucceeded = "Dosya gönderildi!";
 $ExportAsCSV = "CSV dosyası olarak Export";
 $ExportAsXLS = "XLS dosyası olarak Export";
-$langOpenarea = "Kişisel alan";
+$Openarea = "Kişisel alan";
 $Done = "Tamam";
 $Documents = "Belgeler";
 $DocumentAdded = "Belge eklendi";
@@ -280,7 +273,7 @@ $Link = "Bağlantı";
 $Announcement = "Duyurular";
 $Dropbox = "GelenGiden Kutusu";
 $Quiz = "Kısa Alıştırmalar";
-$langChat = "Sohbet";
+$Chat = "Sohbet";
 $Conference = "Konferans";
 $Student_publication = "Öğrenci Çalışmaları";
 $Tracking = "İzleme";
@@ -293,8 +286,8 @@ $StartDate = "Başlangıç tarihi";
 $EndDate = "Bitiş tarihi";
 $StartTime = "Başlangıç zamanı";
 $EndTime = "Bitiş zamanı";
-$langYouWereCalled = "Sohbet için çağrı var.Çağrı yapan :";
-$langDoYouAccept = "Kabul ediyormusunuz ?";
+$YouWereCalled = "Sohbet için çağrı var.Çağrı yapan :";
+$DoYouAccept = "Kabul ediyormusunuz ?";
 $Everybody = "Herkes";
 $SentTo = "Kim görebilir";
 $Export = "Export";
@@ -327,7 +320,7 @@ $DeleteRight = "Sil";
 $OverviewCourseRights = "Rollere ve haklara göz at";
 $SeeAllRightsAllLocationsForSpecificRole = "Roldeki";
 $SeeAllRolesAllLocationsForSpecificRight = "Haktakileri seç";
-$langAdvanced = "Gelişmiş";
+$Advanced = "Gelişmiş";
 $RightValueModified = "Değer değiştirildi";
 $course_rights = "Roller ve haklara göz at";
 $CourseAdminRoleDescription = "Ders Öğretmeni";

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.