diff options
38 files changed, 64 insertions, 64 deletions
diff --git a/doc/design_guidelines b/doc/design_guidelines index defc626c..ba94e39e 100644 --- a/doc/design_guidelines +++ b/doc/design_guidelines @@ -15,7 +15,7 @@ Button colors: speciel actions (e.g. send test mail) = yellow (btn-warning) Secondary action (e.g. cancel) = white (btn-default) -Prefered glyphicons: +Preferred glyphicons: add (create) = glyphicon-plus add (assign) = glyphicon-share-alt delete = glyphicon-trash diff --git a/doc/locationinfo b/doc/locationinfo index e8f4ea50..a4397480 100644 --- a/doc/locationinfo +++ b/doc/locationinfo @@ -64,7 +64,7 @@ optional: daystoshow:[1,2,3,4,5,6,7] sets how many days the calendar shows scale:[10-90] scales the calendar and Roomplan in mode 1 switchtime:[1-120] sets the time between switchen in mode 4 (in seconds) - calupdate: Time the calender querys for updates,in minutes. + calupdate: Time the calendar queries for updates,in minutes. roomupdate: Time the PCs in the room gets updated,in seconds. rotation:[0-3] rotation of the roomplan vertical:[true] only mode 1, sets the calendar above the roomplan @@ -80,7 +80,7 @@ overwrite it for all rooms. First you need an Image(svg,png,jpg), add it to ./locationinfo/frontend/img/overlay. You can add your own css class if you want. To do so create an css calss named .overlay-YOUR_IMAGE_NAME in the doorsign.html. You can find an example in the doorsign.html called ".overlay-rollstuhl". -The backend functionaltiy is right now not implemented since it relays on the roominfo module. +The backend functionality is right now not implemented since it relays on the roominfo module. But you can add it manually. You need to add the image name (without ending) in the machine database on the position column with the key overlays in an array. diff --git a/inc/dictionary.inc.php b/inc/dictionary.inc.php index b69007a6..e366207f 100644 --- a/inc/dictionary.inc.php +++ b/inc/dictionary.inc.php @@ -240,7 +240,7 @@ class Dictionary * * @param $caption bool with caption next to <img> * @param $langCC string Language cc to get flag code for - defaults to current language - * @retrun string html code of img tag for language + * @return string html code of img tag for language */ public static function getFlagHtml($caption = false, $langCC = false) { diff --git a/inc/render.inc.php b/inc/render.inc.php index 34e064bc..2c3a1da7 100644 --- a/inc/render.inc.php +++ b/inc/render.inc.php @@ -257,7 +257,7 @@ class Render } /** - * Close the given tag. Will check if it maches the tag last opened + * Close the given tag. Will check if it matches the tag last opened */ public static function closeTag($tag) { diff --git a/inc/session.inc.php b/inc/session.inc.php index 6204c98c..cb52cd38 100644 --- a/inc/session.inc.php +++ b/inc/session.inc.php @@ -37,7 +37,7 @@ class Session { // Try to load session id from cookie if (!self::loadSessionId()) return false; - // Succeded, now try to load session data. If successful, job is done + // Succeeded, now try to load session data. If successful, job is done if (self::readSessionData()) return true; // Loading session data failed self::delete(); diff --git a/inc/taskmanager.inc.php b/inc/taskmanager.inc.php index 547a75d4..6c8eb056 100644 --- a/inc/taskmanager.inc.php +++ b/inc/taskmanager.inc.php @@ -35,7 +35,7 @@ class Taskmanager * @param string $task name of task to start * @param array $data data to pass to the task. the structure depends on the task. * @param boolean $async if true, the function will not wait for the reply of the taskmanager, which means - * the return value is just true (and you won't know if the task could acutally be started) + * the return value is just true (and you won't know if the task could actually be started) * @return array|false struct representing the task status (as a result of submit); false on communication error */ public static function submit($task, $data = false, $async = false) diff --git a/inc/util.inc.php b/inc/util.inc.php index 21d784a8..a15b9faf 100644 --- a/inc/util.inc.php +++ b/inc/util.inc.php @@ -8,7 +8,7 @@ class Util * Displays an error message and stops script execution. * If CONFIG_DEBUG is true, it will also dump a stack trace * and all globally defined variables. - * (As this might reveal sensistive data you should never enable it in production) + * (As this might reveal sensitive data you should never enable it in production) */ public static function traceError($message) { diff --git a/install.php b/install.php index e566b5a4..1038b400 100644 --- a/install.php +++ b/install.php @@ -41,7 +41,7 @@ function finalResponse($status, $message = '') define('UPDATE_DONE', 'UPDATE_DONE'); // Process completed successfully. This is a success return code. define('UPDATE_NOOP', 'UPDATE_NOOP'); // Nothing had to be done, everything is up to date. This is also a success code. define('UPDATE_RETRY', 'UPDATE_RETRY'); // Install/update process failed, but should be retried later. -define('UPDATE_FAILED', 'UPDATE_FAILED'); // Fatal error occured, retry will not resolve the issue. +define('UPDATE_FAILED', 'UPDATE_FAILED'); // Fatal error occurred, retry will not resolve the issue. /* * Helper functions for dealing with the database diff --git a/modules-available/adduser/lang/en/template-tags.json b/modules-available/adduser/lang/en/template-tags.json index dc68d7a6..89413d12 100644 --- a/modules-available/adduser/lang/en/template-tags.json +++ b/modules-available/adduser/lang/en/template-tags.json @@ -1,7 +1,7 @@ { "lang_addUser": "Add user", "lang_assignRoles": "Assign roles", - "lang_changeLoginHint": "You can change the login identifier used for logging in. This is only enabled for local acounts that are not linked to LDAP\/AD servers.", + "lang_changeLoginHint": "You can change the login identifier used for logging in. This is only enabled for local accounts that are not linked to LDAP\/AD servers.", "lang_changeOwnPasswordHint": "You can change your own password by clicking the \"change password\" button in the menu.", "lang_changePassword": "Change password", "lang_confirmation": "Confirm Password", diff --git a/modules-available/backup/lang/en/template-tags.json b/modules-available/backup/lang/en/template-tags.json index a4711810..b70ce793 100644 --- a/modules-available/backup/lang/en/template-tags.json +++ b/modules-available/backup/lang/en/template-tags.json @@ -4,7 +4,7 @@ "lang_backupRestore": "Backup and Restore", "lang_browseForFile": "Browse", "lang_download": "Download", - "lang_dozmodExplanation": "This restores all the virtual machine and lecture meta data created using the bwLehrpool-Suite. Please make sure the VM-storage configured still contains all the VM-Images associated with the virtual machines. If the location of the storage changed, make sure the relative pathes on the share are still the same, otherwise the virtual machines won't be usable.", + "lang_dozmodExplanation": "This restores all the virtual machine and lecture meta data created using the bwLehrpool-Suite. Please make sure the VM-storage configured still contains all the VM-Images associated with the virtual machines. If the location of the storage changed, make sure the relative paths on the share are still the same, otherwise the virtual machines won't be usable.", "lang_lastBackup": "Last backup", "lang_reboot": "System reboot", "lang_restore": "Upload", diff --git a/modules-available/baseconfig_bwlp/lang/en/config-variables.json b/modules-available/baseconfig_bwlp/lang/en/config-variables.json index b35aefbe..00cfa4df 100644 --- a/modules-available/baseconfig_bwlp/lang/en/config-variables.json +++ b/modules-available/baseconfig_bwlp/lang/en/config-variables.json @@ -28,7 +28,7 @@ "SLX_SHUTDOWN_SCHEDULE": "Fixed time to turn off the computer, even if there is a user active.\r\nSeveral times can be specified, separated by spaces.", "SLX_SHUTDOWN_TIMEOUT": "Time in seconds after which a computer is switched off, if no user is logged on.\r\nLeave blank to disable the function.", "SLX_SYSTEM_STANDBY_TIMEOUT": "Timeout in seconds after which the computer enters stand-by mode if no user is logged on.\r\nLeave blank to disable.\r\n\r\nNote that some hardware might not properly support stand-by and crash or freeze on wakeup. It's recommended to only enable this feature for rooms where it's known that the hardware supports stand-by mode. You can manually trigger stand-by mode on a client by logging in as root and executing *systemctl suspend*.", - "SLX_VMCHOOSER_FORLOCATION": "Defines how lectures special to the user's location are handled in the vmChooser.\r\n*IGNORE*: Sort them alphabetically among the global lectures.\r\n*BUMP*: Put them atop the global lectures.\r\n*EXCLUSIVE*: Put them atop the global lectures and aditionally collapse the node which contains the global lectures.", + "SLX_VMCHOOSER_FORLOCATION": "Defines how lectures special to the user's location are handled in the vmChooser.\r\n*IGNORE*: Sort them alphabetically among the global lectures.\r\n*BUMP*: Put them atop the global lectures.\r\n*EXCLUSIVE*: Put them atop the global lectures and additionally collapse the node which contains the global lectures.", "SLX_VMCHOOSER_TAB": "Defines which tab is show by default, if the user doesn't have stored a last used session on his persistent home directory.\r\n*0*: Native Linux sessions\r\n*1*: User specific lectures\r\n*2*: All lectures\r\n*AUTO*: If the computer has low system specs, show the Linux sessions, otherwise, show all lectures", "SLX_VMCHOOSER_TEMPLATES": "Defines how lectures that link to template VMs are treated wrt sorting.\r\n*IGNORE*: Sort among regular lectures\r\n*BUMP*: Move to top of list", "SLX_VMCHOOSER_TIMEOUT": "Timeout in seconds after which the session will be closed if the user doesn't make any selection in vmChooser. Mouse or keyboard activity resets this timeout.\r\n\r\nIf *SLX_AUTOLOGIN* is enabled, this setting is not available.", diff --git a/modules-available/dnbd3/lang/en/template-tags.json b/modules-available/dnbd3/lang/en/template-tags.json index 509f0436..cae5ad39 100644 --- a/modules-available/dnbd3/lang/en/template-tags.json +++ b/modules-available/dnbd3/lang/en/template-tags.json @@ -41,7 +41,7 @@ "lang_manageAccessTo": "Manage access to server:", "lang_managedServer": "Automatically configured DNBD3-Proxy", "lang_managedServerAdd": "Add automatically configured proxy", - "lang_managedServerHelp": "Automatically configured DNBD3-Proxies will boot like normal bwLehrpool-Clients over PXE and the satellite server. If a client is configured as proxy it will boot with a different configuration and acts exclusively as proxy. The client can therefore not be used as a normal working station.\r\nThe advantage is that you don't need to install or configure anything else. The client will reboot every week to get possible updates ot the minilinux.\r\nIf you want to use this feature, please create a partition with ID 45 on the local hard disk of the proxy server. In contrast to the ID 44 partition which is formated after every reboot, this partition is persistent. As a rule of thumb the partition should be as big as possible. If there is no space left the proxy will delete the VM which hasn't be used for the longest time. More information in the wiki.", + "lang_managedServerHelp": "Automatically configured DNBD3-Proxies will boot like normal bwLehrpool-Clients over PXE and the satellite server. If a client is configured as proxy it will boot with a different configuration and acts exclusively as proxy. The client can therefore not be used as a normal working station.\r\nThe advantage is that you don't need to install or configure anything else. The client will reboot every week to get possible updates ot the minilinux.\r\nIf you want to use this feature, please create a partition with ID 45 on the local hard disk of the proxy server. In contrast to the ID 44 partition which is formatted after every reboot, this partition is persistent. As a rule of thumb the partition should be as big as possible. If there is no space left the proxy will delete the VM which hasn't be used for the longest time. More information in the wiki.", "lang_manualRefresh": "Manual refresh", "lang_manualRefreshInfo": "All servers are queried every 5 minutes to update the table below. Hit the refresh button to update the table immediately.", "lang_numFails": "Errors", diff --git a/modules-available/dozmod/lang/en/permissions.json b/modules-available/dozmod/lang/en/permissions.json index b0fbb071..3d82bdda 100644 --- a/modules-available/dozmod/lang/en/permissions.json +++ b/modules-available/dozmod/lang/en/permissions.json @@ -15,7 +15,7 @@ "templates.save": "Save email templates.", "users.setlogin": "Enable\/Disable Login.", "users.setmail": "Enable\/Disable Email Notification.", - "users.setorglogin": "Enalbe\/Disable Login for Users from certain organisations.", + "users.setorglogin": "Enable\/Disable Login for Users from certain organisations.", "users.setsu": "Set User to superuser.", "users.view": "View user list." }
\ No newline at end of file diff --git a/modules-available/js_jqueryui/style.css b/modules-available/js_jqueryui/style.css index be57c0fa..ba648761 100755 --- a/modules-available/js_jqueryui/style.css +++ b/modules-available/js_jqueryui/style.css @@ -885,7 +885,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; margin-left: .4em; margin-right: 22px; } .ui-spinner{} .ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; text-align: center; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; } -.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */ +.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to override default borders */ .ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */ .ui-spinner-up { top: 0; } .ui-spinner-down { bottom: 0; } diff --git a/modules-available/js_stupidtable/clientscript.js b/modules-available/js_stupidtable/clientscript.js index 0baa1546..419335a0 100644 --- a/modules-available/js_stupidtable/clientscript.js +++ b/modules-available/js_stupidtable/clientscript.js @@ -150,7 +150,7 @@ if ($table.stupidtable.settings.will_manually_build_table) $table.stupidtable_build(); } - // Run sorting asynchronously on a timout to force browser redraw after + // Run sorting asynchronously on a timeout to force browser redraw after // `beforetablesort` callback. Also avoids locking up the browser too much. setTimeout(function() { if(!$table.stupidtable.settings.will_manually_build_table){ diff --git a/modules-available/js_weekcalendar/clientscript.js b/modules-available/js_weekcalendar/clientscript.js index 67637e65..45c97707 100755 --- a/modules-available/js_weekcalendar/clientscript.js +++ b/modules-available/js_weekcalendar/clientscript.js @@ -193,7 +193,7 @@ function MyDate() { }, /** * reads the id(s) of user(s) for who the event should be displayed. - * @param {Object} calEvent the calEvent to read informations from. + * @param {Object} calEvent the calEvent to read information from. * @param {jQuery} calendar the calendar object. * @return {number|String|Array} the user id(s) to appened events for. */ @@ -202,7 +202,7 @@ function MyDate() { }, /** * sets user id(s) to the calEvent - * @param {Object} calEvent the calEvent to set informations to. + * @param {Object} calEvent the calEvent to set information to. * @param {jQuery} calendar the calendar object. * @return {Object} the calEvent with modified user id. */ @@ -218,7 +218,7 @@ function MyDate() { displayFreeBusys: false, /** * read the id(s) for who the freebusy is available - * @param {Object} calEvent the calEvent to read informations from. + * @param {Object} calEvent the calEvent to read information from. * @param {jQuery} calendar the calendar object. * @return {number|String|Array} the user id(s) to appened events for. */ @@ -277,7 +277,7 @@ function MyDate() { title: '%start% - %end%', /** * default options to pass to callback - * you can pass a function returning an object or a litteral object + * you can pass a function returning an object or a literal object * @type {object|function(#calendar)} */ jsonOptions: {}, @@ -352,7 +352,7 @@ function MyDate() { * Go to the previous week relative to the currently displayed week */ prevWeek: function() { - //minus more than 1 day to be sure we're in previous week - account for daylight savings or other anomolies + //minus more than 1 day to be sure we're in previous week - account for daylight savings or other anomalies var newDate = new Date(this.element.data('startDate').getTime() - (MILLIS_IN_WEEK / 6)); this._clearCalendar(); this._loadCalEvents(newDate); @@ -362,7 +362,7 @@ function MyDate() { * Go to the next week relative to the currently displayed week */ nextWeek: function() { - //add 8 days to be sure of being in prev week - allows for daylight savings or other anomolies + //add 8 days to be sure of being in prev week - allows for daylight savings or other anomalies var newDate = new Date(this.element.data('startDate').getTime() + MILLIS_IN_WEEK + MILLIS_IN_DAY); this._clearCalendar(); this._loadCalEvents(newDate); @@ -1827,7 +1827,7 @@ function MyDate() { }, /* - * Add droppable capabilites to weekdays to allow dropping of calEvents only + * Add droppable capabilities to weekdays to allow dropping of calEvents only */ _addDroppableToWeekDay: function($weekDay) { var self = this; @@ -2464,14 +2464,14 @@ function MyDate() { end = (options.businessHours.limitDisplay ? options.businessHours.end : 24); $freeBusyPlaceholders.each(function() { - var $placehoder = $(this); - var s = self._cloneDate($placehoder.data('startDate')), + var $placeholder = $(this); + var s = self._cloneDate($placeholder.data('startDate')), e = self._cloneDate(s); s.setHours(start); e.setHours(end); - $placehoder.find('.wc-freebusy').remove(); - $.each($placehoder.data('wcFreeBusyManager').getFreeBusys(s, e), function() { - self._renderFreeBusy(this, $placehoder); + $placeholder.find('.wc-freebusy').remove(); + $.each($placeholder.data('wcFreeBusyManager').getFreeBusys(s, e), function() { + self._renderFreeBusy(this, $placeholder); }); }); } @@ -2537,7 +2537,7 @@ function MyDate() { }, /** - * retrives the first freebusy manager matching demand. + * retrieves the first freebusy manager matching demand. */ getFreeBusyManagersFor: function(date, users) { var calEvent = { @@ -2548,21 +2548,21 @@ function MyDate() { return this.getFreeBusyManagerForEvent(calEvent); }, /** - * retrives the first freebusy manager for given event. + * retrieves the first freebusy manager for given event. */ getFreeBusyManagerForEvent: function(newCalEvent) { var self = this, options = this.options, freeBusyManager; if (options.displayFreeBusys) { - var $freeBusyPlaceHoders = self.element.find('.wc-grid-row-freebusy .wc-column-freebusy'), + var $freeBusyPlaceHolders = self.element.find('.wc-grid-row-freebusy .wc-column-freebusy'), freeBusy = new FreeBusy({start: newCalEvent.start, end: newCalEvent.end}), showAsSeparatedUser = options.showAsSeparateUsers && options.users && options.users.length, userId = showAsSeparatedUser ? self._getEventUserId(newCalEvent) : null; if (!$.isArray(userId)) { userId = [userId]; } - $freeBusyPlaceHoders.each(function() { + $freeBusyPlaceHolders.each(function() { var manager = $(this).data('wcFreeBusyManager'), has_overlap = manager.isWithin(freeBusy.getEnd()) || manager.isWithin(freeBusy.getEnd()) || @@ -2585,12 +2585,12 @@ function MyDate() { options = this.options; if (options.displayFreeBusys) { var $toRender, - $freeBusyPlaceHoders = self.element.find('.wc-grid-row-freebusy .wc-column-freebusy'), + $freeBusyPlaceHolders = self.element.find('.wc-grid-row-freebusy .wc-column-freebusy'), _freeBusys = self._cleanFreeBusys(freeBusys); $.each(_freeBusys, function(index, _freeBusy) { - var $weekdays = self._findWeekDaysForFreeBusy(_freeBusy, $freeBusyPlaceHoders); + var $weekdays = self._findWeekDaysForFreeBusy(_freeBusy, $freeBusyPlaceHolders); //if freebusy has a placeholder if ($weekdays && $weekdays.length) { $weekdays.each(function(index, day) { @@ -2751,8 +2751,8 @@ function MyDate() { * if you do not pass any argument, returns all freebusys. * if you only pass a start date, only matchinf freebusy will be returned. * if you pass 2 arguments, then all freebusys available within the time period will be returned - * @param {Date} start [optionnal] if you do not pass end date, will return the freeBusy within which this date falls. - * @param {Date} end [optionnal] the date where to stop the search. + * @param {Date} start [optional] if you do not pass end date, will return the freeBusy within which this date falls. + * @param {Date} end [optional] the date where to stop the search. * @return {Array} an array of FreeBusy matching arguments. */ getFreeBusys: function() { @@ -2826,7 +2826,7 @@ function MyDate() { $.each(this.freeBusys, function(index) { //within the loop, we have following vars: // curFreeBusyItem: the current iteration freeBusy, part of manager freeBusys list - // start: the insterted freeBusy start + // start: the inserted freeBusy start // end: the inserted freebusy end var curFreeBusyItem = this; if (curFreeBusyItem.isWithin(start) && curFreeBusyItem.isWithin(end)) { diff --git a/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpEws/Type/WellKnownResponseObjectType.php b/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpEws/Type/WellKnownResponseObjectType.php index f659cbeb..9095f4ff 100644 --- a/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpEws/Type/WellKnownResponseObjectType.php +++ b/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpEws/Type/WellKnownResponseObjectType.php @@ -8,7 +8,7 @@ namespace jamesiarmes\PhpEws\Type; use \jamesiarmes\PhpEws\Type; /** - * Base class fot meeting request replies. + * Base class for meeting request replies. * * @package php-ews\Type */ diff --git a/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpEws/assets/types.xsd b/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpEws/assets/types.xsd index 52f4f189..78150344 100644 --- a/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpEws/assets/types.xsd +++ b/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpEws/assets/types.xsd @@ -2242,7 +2242,7 @@ </xs:restriction> </xs:complexContent> </xs:complexType> - <!-- Smart reponses: ReplyToItem, ReplyAllToItem, ForwardItem--> + <!-- Smart responses: ReplyToItem, ReplyAllToItem, ForwardItem--> <xs:complexType name="SmartResponseBaseType"> <xs:complexContent> <xs:restriction base="t:ResponseObjectType"> diff --git a/modules-available/locationinfo/inc/coursebackend.inc.php b/modules-available/locationinfo/inc/coursebackend.inc.php index bc5b059e..a66d35a3 100644 --- a/modules-available/locationinfo/inc/coursebackend.inc.php +++ b/modules-available/locationinfo/inc/coursebackend.inc.php @@ -19,7 +19,7 @@ abstract class CourseBackend */ protected $error = false; /** - * @var array list of errors that occured, fill using addError() + * @var array list of errors that occurred, fill using addError() */ private $errors; /** @@ -300,7 +300,7 @@ abstract class CourseBackend } /** - * @return array list of errors that occured during processing. + * @return array list of errors that occurred during processing. */ public final function getErrors() { diff --git a/modules-available/locationinfo/inc/coursebackend/coursebackend_exchange.inc.php b/modules-available/locationinfo/inc/coursebackend/coursebackend_exchange.inc.php index 60561586..44847ce2 100755 --- a/modules-available/locationinfo/inc/coursebackend/coursebackend_exchange.inc.php +++ b/modules-available/locationinfo/inc/coursebackend/coursebackend_exchange.inc.php @@ -152,7 +152,7 @@ class CourseBackend_Exchange extends CourseBackend * * @param $roomIds array with local ID as key and serverId as value * @return array a recursive array that uses the roomID as key - * and has the schedule array as value. A shedule array contains an array in this format: + * and has the schedule array as value. A schedule array contains an array in this format: * ["start"=>'JJJJ-MM-DD HH:MM:SS',"end"=>'JJJJ-MM-DD HH:MM:SS',"title"=>string] */ protected function fetchSchedulesInternal($requestedRoomIds) diff --git a/modules-available/locationinfo/inc/infopanel.inc.php b/modules-available/locationinfo/inc/infopanel.inc.php index 7b0c6fe0..1e2e7313 100644 --- a/modules-available/locationinfo/inc/infopanel.inc.php +++ b/modules-available/locationinfo/inc/infopanel.inc.php @@ -212,7 +212,7 @@ class InfoPanel /** * Format the openingtime in the frontend needed format. - * One key per week day, wich contains an array of { + * One key per week day, which contains an array of { * 'HourOpen' => hh, 'MinutesOpen' => mm, * 'HourClose' => hh, 'MinutesClose' => mm } * diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json index 3fc409f4..6411efc0 100644 --- a/modules-available/locationinfo/lang/en/template-tags.json +++ b/modules-available/locationinfo/lang/en/template-tags.json @@ -10,7 +10,7 @@ "lang_browserTooltip": "Which browser shall be used", "lang_calendar": "Calendar", "lang_calendarUpdate": "Calendar Update", - "lang_calupdateTooltip": "Time the calender querys for updates (in minutes)", + "lang_calupdateTooltip": "Time the calendar queries for updates (in minutes)", "lang_checkConnection": "Check connection", "lang_chromium": "Chromium", "lang_closed": "Closed", diff --git a/modules-available/locations/lang/en/template-tags.json b/modules-available/locations/lang/en/template-tags.json index f9bae27c..e1de2a88 100644 --- a/modules-available/locations/lang/en/template-tags.json +++ b/modules-available/locations/lang/en/template-tags.json @@ -4,7 +4,7 @@ "lang_assignSubnetExplanation": "Client machines which fall into an IP range listed below will be assigned to this location and will see an according lecture list (e.g. they will see lectures that are exclusively assigned to this location).", "lang_assignedSubnets": "Assigned subnets \/ IP ranges", "lang_bootMenu": "Boot menu", - "lang_deleteChildLocations": "Delete child locations aswell", + "lang_deleteChildLocations": "Delete child locations as well", "lang_deleteLocation": "Delete location", "lang_deleteSubnet": "Delete range", "lang_deleteSubnetWarning": "All subnets marked for deletion will be deleted. This cannot be undone!", diff --git a/modules-available/main/install.inc.php b/modules-available/main/install.inc.php index ec8554fd..92ad4db1 100644 --- a/modules-available/main/install.inc.php +++ b/modules-available/main/install.inc.php @@ -75,7 +75,7 @@ if (!tableHasColumn('callback', 'args')) { // ####################### // ##### 2018-03-19 -// In preparation for LDAP/AD auth: Column to rembember origin server +// In preparation for LDAP/AD auth: Column to remember origin server if (!tableHasColumn('user', 'serverid')) { Database::exec("ALTER TABLE `user` ADD `serverid` int(10) unsigned NULL DEFAULT NULL"); } diff --git a/modules-available/minilinux/inc/minilinux.inc.php b/modules-available/minilinux/inc/minilinux.inc.php index 005b81fa..da8be3f2 100644 --- a/modules-available/minilinux/inc/minilinux.inc.php +++ b/modules-available/minilinux/inc/minilinux.inc.php @@ -259,7 +259,7 @@ class MiniLinux */ /** - * Geenrate messages regarding setup und update availability. + * Generate messages regarding setup und update availability. * @return bool true if severe problems were found, false otherwise */ public static function generateUpdateNotice() diff --git a/modules-available/permissionmanager/install.inc.php b/modules-available/permissionmanager/install.inc.php index d0f8cdeb..68f01899 100644 --- a/modules-available/permissionmanager/install.inc.php +++ b/modules-available/permissionmanager/install.inc.php @@ -185,7 +185,7 @@ if (Database::exec("INSERT INTO `role` VALUES (2,'systemstatus.*'), (2,'vmstore.edit'), (2,'webinterface.*')"); - // Asign the first user to the superadmin role (if one exists) + // Assign the first user to the superadmin role (if one exists) Database::exec("INSERT INTO `role_x_user` VALUES (1,1)"); $res[] = UPDATE_DONE; } diff --git a/modules-available/rebootcontrol/api.inc.php b/modules-available/rebootcontrol/api.inc.php index 6ebc8399..05fa5699 100644 --- a/modules-available/rebootcontrol/api.inc.php +++ b/modules-available/rebootcontrol/api.inc.php @@ -12,7 +12,7 @@ if (Request::any('action') === 'rebuild' && isLocalExecution()) { } /* Needed POST-Parameters: - 'token' -- for authentification + 'token' -- for authentication 'action' -- which action should be performed (shutdown or reboot) 'clients' -- which are to reboot/shutdown (json encoded array!) 'timer' -- (optional) when to perform action in minutes (default value is 0) diff --git a/modules-available/roomplanner/js/lib/jquery-ui-draggable-collision.js b/modules-available/roomplanner/js/lib/jquery-ui-draggable-collision.js index 3ef553b1..8aa351b9 100644 --- a/modules-available/roomplanner/js/lib/jquery-ui-draggable-collision.js +++ b/modules-available/roomplanner/js/lib/jquery-ui-draggable-collision.js @@ -377,7 +377,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // that the jquery-collision plugin takes into account during the calculations // * Also, the Coords() values get populated with these offsets at various times, so that they reflect "intended position" // - // Note also that the collider, obstacle, and direction data fields are temporarily overriden (because we need them here, + // Note also that the collider, obstacle, and direction data fields are temporarily overridden (because we need them here, // and the user may not have asked for them), and then erased and placed where the user wants them, right before // sending out the collision events // @@ -385,7 +385,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // something relative, it has to get translated right before sending out the events... function handleCollide( event, ui ) { - // Note that $(this) is the draggable that's moving - it has a ui.position that moves acording to where + // Note that $(this) is the draggable that's moving - it has a ui.position that moves according to where // the draggable is "about to move". However, our "collidable" objects might not be the same as $(this) - // they might be child elements. So we need to keep track of recent and present position so we can apply the // "intended" dx and dy to all the moving elements: diff --git a/modules-available/roomplanner/templates/item-selector.html b/modules-available/roomplanner/templates/item-selector.html index 72607e7c..6bc226cb 100644 --- a/modules-available/roomplanner/templates/item-selector.html +++ b/modules-available/roomplanner/templates/item-selector.html @@ -34,7 +34,7 @@ </li> <li> <div itemtype="furniture" scalable="v" itemlook="wall-vertical" class="draggable" - style="width:25px; height:100px;" data-height="100" data-width="25" title="Wand (vertial)"></div> + style="width:25px; height:100px;" data-height="100" data-width="25" title="Wand (vertikal)"></div> </li> <li> <div itemtype="furniture" scalable="h" itemlook="window-horizontal" class="draggable" @@ -311,4 +311,4 @@ </div> </div> -</div>
\ No newline at end of file +</div> diff --git a/modules-available/serversetup-bwlp-ipxe/inc/pxelinux.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/pxelinux.inc.php index ff548c4c..3f406767 100644 --- a/modules-available/serversetup-bwlp-ipxe/inc/pxelinux.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/inc/pxelinux.inc.php @@ -224,7 +224,7 @@ class PxeSection */ public $ipAppend; /** - * @var string Password protecting the entry. This is most likely in crypted form. + * @var string Password protecting the entry. This is most likely in encrypted form. */ public $passwd; /** diff --git a/modules-available/serversetup-bwlp-ipxe/install.inc.php b/modules-available/serversetup-bwlp-ipxe/install.inc.php index 37cfc085..983988bb 100644 --- a/modules-available/serversetup-bwlp-ipxe/install.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/install.inc.php @@ -111,7 +111,7 @@ if (Module::get('location') !== false) { } } -// 2019-09-21 Add modue column to bootentry +// 2019-09-21 Add module column to bootentry if (!tableHasColumn('serversetup_bootentry', 'module')) { if (Database::exec("ALTER TABLE serversetup_bootentry ADD COLUMN `module` varchar(30) CHARACTER SET ascii DEFAULT NULL AFTER `builtin`") !== false) { diff --git a/modules-available/sysconfig/addconfig.inc.php b/modules-available/sysconfig/addconfig.inc.php index 55944cfa..d9bed6f1 100644 --- a/modules-available/sysconfig/addconfig.inc.php +++ b/modules-available/sysconfig/addconfig.inc.php @@ -59,7 +59,7 @@ abstract class AddConfig_Base /** * Called before any HTML rendering happens, so you can - * pepare stuff, validate input, and optionally redirect + * prepare stuff, validate input, and optionally redirect * early if something is wrong, or you received post * data etc. */ diff --git a/modules-available/sysconfig/addmodule.inc.php b/modules-available/sysconfig/addmodule.inc.php index 1f78de81..0dd28651 100644 --- a/modules-available/sysconfig/addmodule.inc.php +++ b/modules-available/sysconfig/addmodule.inc.php @@ -61,7 +61,7 @@ abstract class AddModule_Base /** * Called before any HTML rendering happens, so you can - * pepare stuff, validate input, and optionally redirect + * prepare stuff, validate input, and optionally redirect * early if something is wrong, or you received post * data etc. */ diff --git a/modules-available/sysconfig/addmodule_branding.inc.php b/modules-available/sysconfig/addmodule_branding.inc.php index 6e628926..dd98d7af 100644 --- a/modules-available/sysconfig/addmodule_branding.inc.php +++ b/modules-available/sysconfig/addmodule_branding.inc.php @@ -93,7 +93,7 @@ class Branding_ProcessFile extends AddModule_Base * * @param string $svgName file to download to * @param string $url url to download from - * @return boolean true of download succeded, false on download error (also returns true if downloaded file doesn't + * @return boolean true of download succeeded, false on download error (also returns true if downloaded file doesn't * seem to be svg!) */ private function downloadSvg($svgName, $url, &$title) diff --git a/modules-available/sysconfig/inc/ppd.inc.php b/modules-available/sysconfig/inc/ppd.inc.php index 5ccdbd53..9bd5d171 100644 --- a/modules-available/sysconfig/inc/ppd.inc.php +++ b/modules-available/sysconfig/inc/ppd.inc.php @@ -134,7 +134,7 @@ class Ppd 'JCLEnd' => '.*', // TODO: The above three need to be either completely absent, or all three must be defined /* - * Resolution and Appearence Control, section 5.9 + * Resolution and Appearance Control, section 5.9 */ /* * Gray Levels and Halftoning, section 5.10 @@ -417,7 +417,7 @@ class Ppd $valueTranslation = $value; } // Key-value-pair parsed, now the fun part - // Special cases for openening closing certain groups + // Special cases for opening closing certain groups if ($mainKeyword === 'OpenGroup') { if ($currentBlock !== false) { $this->error = 'Line ' . $no . ': OpenGroup while other block (type=' . $currentBlock->type @@ -433,7 +433,7 @@ class Ppd continue; } elseif ($mainKeyword === 'OpenSubGroup') { if ($currentBlock === false || $currentBlock->type !== 'Group') { - $this->error = 'Line ' . $no . ': OpenSubGroup with no preceeding OpenGroup'; + $this->error = 'Line ' . $no . ': OpenSubGroup with no preceding OpenGroup'; return; } // TODO: Check unique diff --git a/modules-available/sysconfig/lang/en/template-tags.json b/modules-available/sysconfig/lang/en/template-tags.json index 16956bf2..18c32fdb 100644 --- a/modules-available/sysconfig/lang/en/template-tags.json +++ b/modules-available/sysconfig/lang/en/template-tags.json @@ -95,7 +95,7 @@ "lang_rebuild": "Rebuild", "lang_rebuildLong": "Rebuild module or configuration.", "lang_rebuildOutdatedLong": "Rebuild module or configuration. The module\/configuration is outdated or missing and should be regenerated.", - "lang_redirectionWarning": "WARNING: This feature is experimental. It remaps the selected folders after the VM booted (via openslx.exe) to the logged in user's home drive. This might cause problems with applications that start before the pathes are patched, as they will see the old unpatched settings. Please note that this is usign undocumented or unsupported techniques to achieve this goal. It is not guaranteed that this method will work in future versions or updates of Windows. If you want to reliably remap these directories, you might want to change their locations in the VM before uploading it.", + "lang_redirectionWarning": "WARNING: This feature is experimental. It remaps the selected folders after the VM booted (via openslx.exe) to the logged in user's home drive. This might cause problems with applications that start before the paths are patched, as they will see the old unpatched settings. Please note that this is usign undocumented or unsupported techniques to achieve this goal. It is not guaranteed that this method will work in future versions or updates of Windows. If you want to reliably remap these directories, you might want to change their locations in the VM before uploading it.", "lang_restartWizard": "Restart wizard", "lang_rootKey": "root pubkey", "lang_rootKeyInfo": "Here you can add the public key of a keypair that you want to use for authentication as root-user. Leave this field blank to disable the feature.", diff --git a/modules-available/translation/lang/en/template-tags.json b/modules-available/translation/lang/en/template-tags.json index e7365ca6..c0c37cb5 100644 --- a/modules-available/translation/lang/en/template-tags.json +++ b/modules-available/translation/lang/en/template-tags.json @@ -20,5 +20,5 @@ "lang_translation": "Translation", "lang_translationHeading": "Translation Management", "lang_unused": "Unused", - "lang_unusedUnreliableHint": "Detection of unused tags only includes currently activated modules. It's possible that a tag marked \"unused\" is actually refered to in a module not activated." + "lang_unusedUnreliableHint": "Detection of unused tags only includes currently activated modules. It's possible that a tag marked \"unused\" is actually referred to in a module not activated." }
\ No newline at end of file diff --git a/modules-available/vmstore/lang/en/template-tags.json b/modules-available/vmstore/lang/en/template-tags.json index 5ec68318..b1d53db1 100644 --- a/modules-available/vmstore/lang/en/template-tags.json +++ b/modules-available/vmstore/lang/en/template-tags.json @@ -8,7 +8,7 @@ "lang_nfsHelp2": "Alternate configuration using all_squash. The exported directory should be owned (and be writable) by the user with uid 1234.", "lang_nfsHelp3": "The first line allows read\/write access for the satellite server. The second line grants read-only access for every other IP address. You could limit the second line to specific IP ranges only if desired.", "lang_nfsHelp4": "If using DNBD3 in exclusive mode, you can remove the second line completely, so only the satellite server has access to the NFS store.", - "lang_noAdditionalInformation": "No additional cofiguration required", + "lang_noAdditionalInformation": "No additional configuration required", "lang_optionalMountOptions": "Mount options to use (optional):", "lang_readOnly": "Read-only Access", "lang_readWrite": "Read\/Write Access", |