Skip to content

Commit 1d3161e

Browse files
committed
Merge
2 parents 4ecbde7 + c880586 commit 1d3161e

15 files changed

+251
-3
lines changed

main/lang/english/admin.inc.php

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1403,4 +1403,56 @@
14031403
$ExerciseAndLPsAreInvisibleInTheNewCourse = "Exercises and learning paths are invisible in the new course";
14041404
$YouMustChooseARelationType = "You have to choose a relation type";
14051405
$SelectARelationType = "Relation type selection";
1406+
$AddUserToURL = "Add user to this URL";
1407+
$CourseBelongURL = "Course registered to the URL";
1408+
$AtLeastOneSessionAndOneURL = "You have to select at least one session and one URL";
1409+
$SelectURL = "Select a URL";
1410+
$SessionsWereEdited = "The sessions have been updated.";
1411+
$URLDeleted = "URL deleted.";
1412+
$CannotDeleteURL = "Cannot delete this URL.";
1413+
$CoursesInPlatform = "Courses on the platform.";
1414+
$UsersEdited = "Users updated.";
1415+
$CourseHome = "Course homepage";
1416+
$ComingSoon = "Coming soon...";
1417+
$DummyCourseOnlyOnTestServer = "Dummy course content - only available on test platforms.";
1418+
$ThereAreNotSelectedCoursesOrCoursesListIsEmpty = "There are no selected courses or the courses list is empty.";
1419+
$CodeTwiceInFile = "A code has been used twice in the file. This is not authorized. Courses codes should be unique.";
1420+
$CodeExists = "This code exists";
1421+
$UnkownCategoryCourseCode = "The category could not be found";
1422+
$LinkedCourseTitle = "Title of related course";
1423+
$LinkedCourseCode = "Linked course's code";
1424+
$AssignUsersToSessionsAdministrator = "Assign users to sessions administrator";
1425+
$AssignedUsersListToSessionsAdministrator = "Assign a users list to the sessions administrator";
1426+
$GroupDeleted = "Class deleted.";
1427+
$CannotDeleteGroup = "The class could not be deleted.";
1428+
$SomeGroupsNotDeleted = "Some of the classes could not be deleted.";
1429+
$DontUnchek = "Don't uncheck";
1430+
$Modified = "Modified";
1431+
$SessionsList = "Sessions list";
1432+
$Promotion = "Promotion";
1433+
$UpdateSession = "Update session";
1434+
$Path = "Path";
1435+
$SelectOptionExport = "Select export option";
1436+
$FieldEdited = "Field added.";
1437+
$LanguageParentNotExist = "The parent language does not exist.";
1438+
$TheSubLanguageHasNotBeenRemoved = "The sub-language has not been removed.";
1439+
$ShowOrHide = "Show/Hide";
1440+
$StatusCanNotBeChangedToHumanResourcesManager = "The status of this user cannot be changed to human resources manager.";
1441+
$FieldTaken = "Field taken";
1442+
$UsersSubscribedToSeveralCoursesBecauseOfVirtualCourses = "Users subscribed to several courses through the use of virtual courses.";
1443+
$NoUrlForThisUser = "This user doesn't have a related URL.";
1444+
$ExtraData = "Extra data";
1445+
$ExercisesInLp = "Exercises in learning paths";
1446+
$Id = "Id";
1447+
$ThereWasAnError = "There was an error.";
1448+
$CantMoveToTheSameSession = "Cannot move this to the same session.";
1449+
$StatsMoved = "Stats moved.";
1450+
$UserInformationOfThisCourse = "User information for this course";
1451+
$OriginCourse = "Original course";
1452+
$OriginSession = "Original session";
1453+
$DestinyCourse = "Destination course";
1454+
$DestinySession = "Destination session";
1455+
$CourseDoesNotExistInThisSession = "The course does not exist in this session. The copy will work only from one course in one session to the same course in another session.";
1456+
$UserNotRegistered = "User not registered.";
1457+
$ViewStats = "View stats";
14061458
?>

main/lang/english/agenda.inc.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,6 @@
7777
$RepeatEvent = "Repeat event";
7878
$RepeatDate = "Repeat date";
7979
$EndDateMustBeMoreThanStartDate = "End date must be more than the start date";
80+
$SelectACourse = "Select a course";
81+
$PleaseSelectACourseOrASessionInTheLeftColumn = "Please select a course or a session in the sidebar.";
8082
?>

main/lang/english/document.inc.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,4 +271,5 @@
271271
$RenameAndComment = "Rename and comment";
272272
$YouAreCurrentlyUsingXOfYourX = "You are currently using %s MB (%s) of your %s MB.";
273273
$UplUploadFailedSizeIsZero = "There was a problem uploading your document: the received file had a 0 bytes size on the server. Please, review your local file for any corruption or damage, then try again.";
274+
$NewImage = "New image";
274275
?>

main/lang/english/dropbox.inc.php

100755100644
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,7 @@
125125
$AddComment = "Save feedback";
126126
$SentCatgoryDeleted = "The folder has been deleted";
127127
$ReceivedCatgoryDeleted = "The folder has been deleted";
128+
$InvalideUserDetected = "Invalid user detected.";
129+
$InvalideGroupDetected = "Invalid group detected.";
130+
$OverviewOfFilesInThisZip = "Overview of diles in this Zip";
128131
?>

main/lang/english/exercice.inc.php

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,4 +386,27 @@
386386
$EnableEndTime = "Enable end time";
387387
$ExerciseAvailableFromX = "Exercise available from %s";
388388
$ExerciseAvailableUntilX = "Exercise available until %s";
389+
$TestLimitsAdded = "Tests limits added";
390+
$AddLimits = "Add limits";
391+
$Unlimited = "Unlimited";
392+
$LimitedTime = "Limited time";
393+
$LimitedAttempts = "Limited attempts";
394+
$Times = "Times";
395+
$Random = "Random";
396+
$ExerciseTimerControlMinutes = "Enable exercise timer controller.";
397+
$Numeric = "Numerical";
398+
$Acceptable = "Acceptable";
399+
$Hotspot = "Zones sur image";
400+
$ChangeTheVisibilityOfTheCurrentImage = "Change the visibility of the current image";
401+
$Steps = "Steps";
402+
$OriginalValue = "Original value";
403+
$ChooseAnAnswer = "Choose an answer";
404+
$ImportExercise = "Import exercise";
405+
$MultipleChoiceMultipleAnswers = "Multiple choice, multiple answers";
406+
$MultipleChoiceUniqueAnswer = "Multiple choice, unique answer";
407+
$HotPotatoesFiles = "HotPotatoes files";
408+
$HotPotatoes = "HotPotatoes";
409+
$OAR = "Zones at risk";
410+
$TotalScoreTooBig = "Total score is too big";
411+
$InvalidQuestionType = "Invalid question type";
389412
?>

main/lang/english/forum.inc.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,8 @@
144144
$UpdateImage = "Update Image";
145145
$EnableTimeLimits = "Enable time limits";
146146
$RemoveSearchResults = "Clean search results";
147+
$InsertQualificationCorrespondingToMaxScore = "Insert qualification corresponding to max score";
148+
$ThreadMoved = "Thread moved";
149+
$MigrateForum = "Migrate forum";
150+
$YouWillBeNotified = "You will be notified";
147151
?>

main/lang/english/gradebook.inc.php

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,32 @@
191191
$LinkMod = "Save";
192192
$EditLink = "Edit link";
193193
$CategoryDeleted = "The category has been deleted.";
194-
$AreYouSureToLockedTheEvaluation = "Are you sure to locked the evaluation?";
195-
$AreYouSureToUnLockedTheEvaluation = "Are you sure to unlocked the evaluation?";
194+
$AreYouSureToLockedTheEvaluation = "Are you sure you want to lock the evaluation?";
195+
$AreYouSureToUnLockedTheEvaluation = "Are you sure you want to unlock the evaluation?";
196196
$EvaluationHasBeenUnLocked = "Evaluation has been unlocked";
197197
$EvaluationHasBeenLocked = "Evaluation has been locked";
198+
$Over100 = "Over 100";
199+
$UnderMin = "Under the minimum.";
200+
$MoveWarning = "Warning: moving gradebook elements can be dangerous for the data inside your gradebook.";
201+
$CategoryMoved = "The gradebook has been moved.";
202+
$EvaluationMoved = "The gradebook component has been moved.";
203+
$NoLinkItems = "There are not linked components.";
204+
$NoUniqueScoreRanges = "There is no unique score range possibility.";
205+
$DidNotTakeTheExamAcronym = "The user did not take the exam.";
206+
$DidNotTakeTheExam = "The user did not take the exam.";
207+
$DeleteUser = "Delete user";
208+
$ResultDeleted = "Result deleted.";
209+
$ResultsDeleted = "Results deleted.";
210+
$OverWriteMax = "Overwrite the maximum.";
211+
$ImportOverWriteScore = "The import should overwrite the score.";
212+
$NoDecimals = "No decimals";
213+
$NegativeValue = "Negative value";
214+
$ToExportMustLockEvaluation = "To export, you must lock the evaluation.";
215+
$ShowLinks = "Show links";
216+
$TotalForThisCategory = "Total for this category.";
217+
$OpenDocument = "Open document";
218+
$LockEvaluation = "Lock evaluation";
219+
$UnLockEvaluation = "Unlock evaluation.";
220+
$TheEvaluationIsLocked = "The evaluation is locked.";
221+
$BackToEvaluation = "Back to evaluation.";
198222
?>

main/lang/english/install.inc.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,9 @@
119119
$SuggestionOnlyToEnableCSSUploadFeature = "Suggestion only if you want to enable the CSS upload feature";
120120
$SuggestionOnlyToEnableSubLanguageFeature = "Suggestion only if you want to enable the sub-language feature";
121121
$IfYouPlanToUpgradeFromOlderVersionYouMightWantToHaveAlookAtTheChangelog = "If you plan to upgrade from an older version of Chamilo, you might want to <a href=\"../../documentation/changelog.html\" target=\"_blank\">have a look at the changelog</a> to know what's new and what has been changed";
122+
$WelcomeToTheDokeosInstaller = "Welcome to the Chamilo installer";
123+
$PHPVersionError = "Your PHP version does not match the requirements for this software. Please check you have the latest version, then try again.";
124+
$ExtensionSessionsNotAvailable = "Sessions extension not available";
125+
$ExtensionZlibNotAvailable = "Zlib extension not available";
126+
$ExtensionPCRENotAvailable = "PCRE extension not available";
122127
?>

main/lang/english/learnpath.inc.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,4 +257,6 @@
257257
$DisableLPAutoLaunch = "Disable learning path auto-launch";
258258
$ViewModeEmbedFrame = "Current view mode: external embed. Use only for embedding in external sites.";
259259
$LPNotVisibleToStudent = "Students cannot see this learning path";
260+
$EditCurrentModule = "Edit current module";
261+
$SearchFeatureTerms = "Terms for the search feature";
260262
?>

main/lang/english/reservation.inc.php

100755100644
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,49 @@
132132
$Step2SelectResource = "Step 2: select the resource";
133133
$Step3SelectBookingPeriod = "Step 3: select the booking period";
134134
$NoReservations = "No reservations";
135+
$ItemRightDeleted = "Item permissions removed.";
136+
$MItemRights = "Item rights";
137+
$MReservationRight = "Reservation right";
138+
$ItemRightEdited = "Item permissions updated.";
139+
$NoRights = "No rights";
140+
$MItemRights2 = "Item permissions";
141+
$MAddClassgroup = "Add class/group";
142+
$EditItemRight = "Edit item permissions";
143+
$DeleteItemRight = "Delete item permissions";
144+
$MBookingPeriodsRight = "Booking period permissions";
145+
$ViewItemRight = "View item permissions";
146+
$DeleteSelectedItemRights = "Delete selected item permissions";
147+
$SetEditRights = "Set edit permissions";
148+
$UnsetEditRights = "Remove edit permissions";
149+
$SetDeleteRights = "Assign delete permissions";
150+
$UnsetDeleteRights = "Remove delete permissions";
151+
$SetMresRights = "Set reservation permissions";
152+
$UnsetMresRights = "Remove reservation permissions";
153+
$SetViewRights = "Assign view permissions";
154+
$UnsetViewRights = "Remove viewing permissions";
155+
$SetAllRights = "Assign all permissions";
156+
$UnsetAllRights = "Remove all permissions";
157+
$ItemCourse = "Course item";
158+
$MItemRight = "Item permissions";
159+
$EditItem2 = "Edit item";
160+
$ItemManagerHeader = "Item manager";
161+
$LangClass = "Class";
162+
$MReservationPeriodsRight = "Reservation periods permissions";
163+
$AddNewItem = "Add a new item";
164+
$ItemName = "Item name";
165+
$ItemDescription = "Item description";
166+
$ItemExist = "The item exists";
167+
$EditItem = "Edit item";
168+
$ItemEdited = "Item updated.";
169+
$CategoryFilter = "Category filter";
170+
$ItemCreator = "Item creator";
171+
$DeleteSelectedItems = "Delete selected items";
172+
$BookingPeriodTimepickerLimitation = "Limitation on booking period timepicker";
173+
$Blackout = "Blackout";
174+
$EveryDay = "Every day";
175+
$EveryWeek = "Every week";
176+
$EveryMonth = "Every month";
177+
$ReservationForDenied = "Booking denied";
178+
$BookingPeriodTooSmall = "The booking period is too small.";
179+
$BookingPeriodTooBig = "Booking period too long.";
135180
?>

0 commit comments

Comments
 (0)