Merge pull request #5 from MichMich/develop

Update the develop branch from the original repo
2025-06-27 11:50:00 +00:00 · 2018-12-14 09:13:37 +01:00 · 2018-12-14 09:13:37 +01:00 · f38203ef62
commit f38203ef62
parent f4c6bcfb8e 92accf99b4
54 changed files with 1689 additions and 2066 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,11 +5,36 @@ This project adheres to [Semantic Versioning](http://semver.org/).

 ---

-## [2.5.0] - Unreleased
+## [2.6.0] - Unreleased

 *This release is scheduled to be released on 2018-10-01.*

 ### Added
+- Possibility to add classes to the cell of symbol, title and time of the events of calendar.
+- Font-awesome 5, still has 4 for backwards compatibility.
+- Missing `showEnd` in calendar documentation
+- Screenshot for the new feed module
+- Screenshot for the compliments module
+- Screenshot for the clock module
+- Screenshot for the current weather
+- Screenshot for the weather forecast module
+- Portuguese translation for "Feels"
+- Fading for dateheaders timeFormat in Calendar [#1464](https://github.com/MichMich/MagicMirror/issues/1464)
+
+### Fixed
+- Allow to parse recurring calendar events where the start date is before 1900
+- Fixed Polish translation for Single Update Info
+- Ignore entries with unparseable details in the calendar module
+- Bug showing FullDayEvents one day too long in calendar fixed 
+
+### Updated
+- The default calendar setting `showEnd` is changed to `false`.
+
+## [2.5.0] - 2018-10-01
+
+### Added
+- Support multi-line compliments
+- Simplified Chinese translation for "Feels"
 - Polish translate for "Feels"
 - French translate for "Feels"
 - Translations for newsfeed module
@ -21,8 +46,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Support for showing end of events through config parameters showEnd and dateEndFormat

 ### Fixed
+- Fixed gzip encoded calendar loading issue #1400.
 - Mixup between german and spanish translation for newsfeed.
 - Fixed close dates to be absolute, if no configured in the config.js - module Calendar
+- Fixed the UpdateNotification module message about new commits in the repository, so they can be correctly localized in singular and plural form.
 - Fix for weatherforecast rainfall rounding [#1374](https://github.com/MichMich/MagicMirror/issues/1374)
 - Fix calendar parsing issue for Midori on RasperryPi Zero w, related to issue #694.
 - Fix weather city ID link in sample config
@ -30,6 +57,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).

 ### Updated

+- Updated Simplified Chinese translation
 - Swedish translations
 - Hungarian translations for the updatenotification module
 - Updated Norsk bokmål translation
--- a/README.md
+++ b/README.md
@ -38,7 +38,7 @@ MagicMirror² focuses on a modular plugin system and uses [Electron](http://elec

 *Electron*, the app wrapper around MagicMirror², only supports the Raspberry Pi 2/3. The Raspberry Pi 0/1 is currently **not** supported. If you want to run this on a Raspberry Pi 1, use the [server only](#server-only) feature and setup a fullscreen browser yourself. (Yes, people have managed to run MM² also on a Pi0, so if you insist, search in the forums.)

-Note that you will need to install the lastest full version of Raspbian, **don't use the Lite version**.
+Note that you will need to install the latest full version of Raspbian, **don't use the Lite version**.

 Execute the following command on your Raspberry Pi to install MagicMirror²:

@ -48,7 +48,9 @@ bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/maste

 #### Manual Installation

-1. Download and install the latest *Node.js* version.
+1. Download and install the latest *Node.js* version:
+- `curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -`
+- `sudo apt install -y nodejs`
 2. Clone the repository and check out the master branch: `git clone https://github.com/MichMich/MagicMirror`
 3. Enter the repository: `cd MagicMirror/`
 4. Install and run the app with: `npm install && npm start` \
--- a/config/config.js.sample
+++ b/config/config.js.sample
@ -44,7 +44,7 @@ var config = {
 			config: {
 				calendars: [
 					{
-						symbol: "calendar-check-o ",
+						symbol: "calendar-check",
 						url: "webcal://www.calendarlabs.com/templates/ical/US-Holidays.ics"
 					}
 				]
@ -69,7 +69,7 @@ var config = {
 			header: "Weather Forecast",
 			config: {
 				location: "New York",
-				locationID: "5128581",  //ID from http://www.openweathermap.org/help/city_list.txt
+				locationID: "5128581",  //ID from https://openweathermap.org/city
 				appid: "YOUR_OPENWEATHER_API_KEY"
 			}
 		},
--- a/css/main.css
+++ b/css/main.css
@ -128,6 +128,10 @@ sup {
  text-overflow: ellipsis;
 }

+.pre-line {
+  white-space: pre-line;
+}
+
 /**
 * Region Definitions.
 */
--- a/modules/default/calendar/README.md
+++ b/modules/default/calendar/README.md
@ -1,7 +1,6 @@
 # Module: Calendar
 The `calendar` module is one of the default modules of the MagicMirror.
 This module displays events from a public .ical calendar. It can combine multiple calendars.
-Note that calendars may not contain any entry before 1st January 1970, otherwise the calendar won't be displayed and the module will crash.

 ## Using the module

@ -44,6 +43,7 @@ The following properties can be configured:
 | `dateFormat`                 | Format to use for the date of events (when using absolute dates) <br><br> **Possible values:** See [Moment.js formats](http://momentjs.com/docs/#/parsing/string-format/) <br> **Default value:** `MMM Do` (e.g. Jan 18th)
 | `fullDayEventDateFormat`     | Format to use for the date of full day events (when using absolute dates) <br><br> **Possible values:** See [Moment.js formats](http://momentjs.com/docs/#/parsing/string-format/) <br> **Default value:** `MMM Do` (e.g. Jan 18th)
 | `timeFormat`                 | Display event times as absolute dates, or relative time, or using absolute date headers with times for each event next to it <br><br> **Possible values:** `absolute` or `relative` or `dateheaders` <br> **Default value:** `relative`
+| `showEnd`                 | Display the end of a date as well <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
 | `getRelative`                | How much time (in hours) should be left until calendar events start getting relative? <br><br> **Possible values:** `0` (events stay absolute) - `48` (48 hours before the event starts) <br> **Default value:** `6`
 | `urgency`                    | When using a timeFormat of `absolute`, the `urgency` setting allows you to display events within a specific time frame as `relative`. This allows events within a certain time frame to be displayed as relative (in xx days) while others are displayed as absolute dates <br><br> **Possible values:** a positive integer representing the number of days for which you want a relative date, for example `7` (for 7 days) <br><br> **Default value:** `7`
 | `broadcastEvents`            | If this property is set to true, the calendar will broadcast all the events to all other modules with the notification message: `CALENDAR_EVENTS`. The event objects are stored in an array and contain the following fields: `title`, `startDate`, `endDate`, `fullDayEvent`, `location` and `geo`. <br><br> **Possible values:** `true`, `false` <br><br> **Default value:** `true`
@ -86,6 +86,9 @@ config: {
 | `maximumEntries`      | The maximum number of events shown.  Overrides global setting. **Possible values:** `0` - `100`
 | `maximumNumberOfDays` | The maximum number of days in the future.  Overrides global setting
 | `auth`                | The object containing options for authentication against the calendar.
+| `symbolClass`         | Add a class to the cell of symbol.
+| `titleClass`          | Add a class to the title's cell.
+| `timeClass`           | Add a class to the time's cell.


 #### Calendar authentication options:
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@ -27,7 +27,7 @@ Module.register("calendar", {
 		dateFormat: "MMM Do",
 		dateEndFormat: "HH:mm",
 		fullDayEventDateFormat: "MMM Do",
-		showEnd: true,
+		showEnd: false,
 		getRelative: 6,
 		fadePoint: 0.25, // Start on 1/4th of the list.
 		hidePrivate: false,
@ -51,7 +51,7 @@ Module.register("calendar", {

 	// Define required scripts.
 	getStyles: function () {
-		return ["calendar.css", "font-awesome.css"];
+		return ["calendar.css", "font-awesome5.css", "font-awesome5.v4shims.css"];
 	},

 	// Define required scripts.
@ -82,6 +82,15 @@ Module.register("calendar", {
 				maximumEntries: calendar.maximumEntries,
 				maximumNumberOfDays: calendar.maximumNumberOfDays
 			};
+			if (calendar.symbolClass === "undefined" || calendar.symbolClass === null) {
+				calendarConfig.symbolClass = "";
+			}
+			if (calendar.titleClass === "undefined" || calendar.titleClass === null) {
+				calendarConfig.titleClass = "";
+			}
+			if (calendar.timeClass === "undefined" || calendar.timeClass === null) {
+				calendarConfig.timeClass = "";
+			}

 			// we check user and password here for backwards compatibility with old configs
 			if(calendar.user && calendar.pass) {
@ -135,6 +144,15 @@ Module.register("calendar", {
 			return wrapper;
 		}

+		if (this.config.fade && this.config.fadePoint < 1) {
+			if (this.config.fadePoint < 0) {
+				this.config.fadePoint = 0;
+			}
+			var startFade = events.length * this.config.fadePoint;
+			var fadeSteps = events.length - startFade;
+		}
+
+		var currentFadeStep = 0;
 		var lastSeenDate = "";

 		for (var e in events) {
@ -143,7 +161,7 @@ Module.register("calendar", {
 			if(this.config.timeFormat === "dateheaders"){
 				if(lastSeenDate !== dateAsString){
 					var dateRow = document.createElement("tr");
-					dateRow.className = "normal"
+					dateRow.className = "normal";
 					var dateCell = document.createElement("td");

 					dateCell.colSpan = "3";
@ -151,6 +169,10 @@ Module.register("calendar", {
 					dateRow.appendChild(dateCell);
 					wrapper.appendChild(dateRow);

+					if (e >= startFade) {			//fading
+						currentFadeStep = e - startFade;
+						dateRow.style.opacity = 1 - (1 / fadeSteps * currentFadeStep);
+					}

 					lastSeenDate = dateAsString;
 				}
@ -172,7 +194,9 @@ Module.register("calendar", {
 					symbolWrapper.style.cssText = "color:" + this.colorForUrl(event.url);
 				}

-				symbolWrapper.className = "symbol align-right";
+				var symbolClass = this.symbolClassForUrl(event.url);
+				symbolWrapper.className = "symbol align-right " + symbolClass;
+
 				var symbols = this.symbolsForUrl(event.url);
 				if(typeof symbols === "string") {
 					symbols = [symbols];
@ -189,7 +213,7 @@ Module.register("calendar", {
 				eventWrapper.appendChild(symbolWrapper);
 			}else if(this.config.timeFormat === "dateheaders"){
 				var blankCell = document.createElement("td");
-				blankCell.innerHTML = "&nbsp;&nbsp;&nbsp;"
+				blankCell.innerHTML = "&nbsp;&nbsp;&nbsp;";
 				eventWrapper.appendChild(blankCell);
 			}

@ -210,10 +234,12 @@ Module.register("calendar", {

 			titleWrapper.innerHTML = this.titleTransform(event.title) + repeatingCountTitle;

+			var titleClass = this.titleClassForUrl(event.url);
+
 			if (!this.config.colored) {
-				titleWrapper.className = "title bright";
+				titleWrapper.className = "title bright " + titleClass;
 			} else {
-				titleWrapper.className = "title";
+				titleWrapper.className = "title " + titleClass;
 			}

 			if(this.config.timeFormat === "dateheaders"){
@ -223,26 +249,13 @@ Module.register("calendar", {
 					titleWrapper.align = "left";

 				}else{
+
+					var timeClass = this.timeClassForUrl(event.url);
 					var timeWrapper = document.createElement("td");
-					timeWrapper.className = "time light";
+					timeWrapper.className = "time light " + timeClass;
 					timeWrapper.align = "left";
 					timeWrapper.style.paddingLeft = "2px";
-					var timeFormatString = "";
-					switch (config.timeFormat) {
-					case 12: {
-						timeFormatString = "h:mm A";
-						break;
-					}
-					case 24: {
-						timeFormatString = "HH:mm";
-						break;
-					}
-					default: {
-						timeFormatString = "HH:mm";
-						break;
-					}
-					}
-					timeWrapper.innerHTML = moment(event.startDate, "x").format(timeFormatString);
+					timeWrapper.innerHTML = moment(event.startDate, "x").format("LT");
 					eventWrapper.appendChild(timeWrapper);
 					titleWrapper.align = "right";
 				}
@ -260,6 +273,8 @@ Module.register("calendar", {
 				var oneHour = oneMinute * 60;
 				var oneDay = oneHour * 24;
 				if (event.fullDayEvent) {
+					//subtract one second so that fullDayEvents end at 23:59:59, and not at 0:00:00 one the next day
+					event.endDate -= oneSecond;
 					if (event.today) {
 						timeWrapper.innerHTML = this.capFirst(this.translate("TODAY"));
 					} else if (event.startDate - now < oneDay && event.startDate - now > 0) {
@ -343,23 +358,17 @@ Module.register("calendar", {
 				}
 				//timeWrapper.innerHTML += ' - '+ moment(event.startDate,'x').format('lll');
 				//console.log(event);
-				timeWrapper.className = "time light";
+				var timeClass = this.timeClassForUrl(event.url);
+				timeWrapper.className = "time light " + timeClass;
 				eventWrapper.appendChild(timeWrapper);
 			}

 			wrapper.appendChild(eventWrapper);

 			// Create fade effect.
-			if (this.config.fade && this.config.fadePoint < 1) {
-				if (this.config.fadePoint < 0) {
-					this.config.fadePoint = 0;
-				}
-				var startingPoint = events.length * this.config.fadePoint;
-				var steps = events.length - startingPoint;
-				if (e >= startingPoint) {
-					var currentStep = e - startingPoint;
-					eventWrapper.style.opacity = 1 - (1 / steps * currentStep);
-				}
+			if (e >= startFade) {
+				currentFadeStep = e - startFade;
+				eventWrapper.style.opacity = 1 - (1 / fadeSteps * currentFadeStep);
 			}
 		}

@ -472,11 +481,15 @@ Module.register("calendar", {
 			maximumEntries: calendarConfig.maximumEntries || this.config.maximumEntries,
 			maximumNumberOfDays: calendarConfig.maximumNumberOfDays || this.config.maximumNumberOfDays,
 			fetchInterval: this.config.fetchInterval,
+			symbolClass: calendarConfig.symbolClass,
+			titleClass: calendarConfig.titleClass,
+			timeClass: calendarConfig.timeClass,
 			auth: auth
 		});
 	},

-	/* symbolsForUrl(url)
+	/**
+	 * symbolsForUrl(url)
 	 * Retrieves the symbols for a specific url.
 	 *
 	 * argument url string - Url to look for.
@ -487,6 +500,42 @@ Module.register("calendar", {
 		return this.getCalendarProperty(url, "symbol", this.config.defaultSymbol);
 	},

+	/**
+	 * symbolClassForUrl(url)
+	 * Retrieves the symbolClass for a specific url.
+	 *
+	 * @param url string - Url to look for.
+	 *
+	 * @returns string
+	 */
+	symbolClassForUrl: function (url) {
+		return this.getCalendarProperty(url, "symbolClass", "");
+	},
+
+	/**
+	 * titleClassForUrl(url)
+	 * Retrieves the titleClass for a specific url.
+	 *
+	 * @param url string - Url to look for.
+	 *
+	 * @returns string
+	 */
+	titleClassForUrl: function (url) {
+		return this.getCalendarProperty(url, "titleClass", "");
+	},
+
+	/**
+	 * timeClassForUrl(url)
+	 * Retrieves the timeClass for a specific url.
+	 *
+	 * @param url string - Url to look for.
+	 *
+	 * @returns string
+	 */
+	timeClassForUrl: function (url) {
+		return this.getCalendarProperty(url, "timeClass", "");
+	},
+
 	/* colorForUrl(url)
 	 * Retrieves the color for a specific url.
 	 *
--- a/modules/default/calendar/calendarfetcher.js
+++ b/modules/default/calendar/calendarfetcher.js
@ -29,7 +29,8 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 		var opts = {
 			headers: {
 				"User-Agent": "Mozilla/5.0 (Node.js "+ nodeVersion + ") MagicMirror/"  + global.version +  " (https://github.com/MichMich/MagicMirror/)"
-			}
+			},
+			gzip: true
 		};

 		if (auth) {
@ -170,8 +171,16 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 					var geo = event.geo || false;
 					var description = event.description || false;

-					if (typeof event.rrule != "undefined" && !isFacebookBirthday) {
+					if (typeof event.rrule != "undefined" && event.rrule != null && !isFacebookBirthday) {
 						var rule = event.rrule;
+
+						// can cause problems with e.g. birthdays before 1900
+						if(rule.origOptions && rule.origOptions.dtstart && rule.origOptions.dtstart.getFullYear() < 1900 ||
+							rule.options && rule.options.dtstart && rule.options.dtstart.getFullYear() < 1900){
+							rule.origOptions.dtstart.setYear(1900);
+							rule.options.dtstart.setYear(1900);
+						}
+
 						var dates = rule.between(today, future, true, limitFunction);

 						for (var d in dates) {
--- a/modules/default/calendar/vendor/ical.js/node-ical.js
+++ b/modules/default/calendar/vendor/ical.js/node-ical.js
@ -44,7 +44,13 @@ ical.objectHandlers['END'] = function(val, params, curr, stack){
      rule += ' EXDATE:' + curr.exdates[i].toISOString().replace(/[-:]/g, '');
      rule = rule.replace(/\.[0-9]{3}/, '');
    }
-    curr.rrule = rrulestr(rule);
+    try {
+      curr.rrule = rrulestr(rule);
+    }
+    catch(err) {
+      console.log("Unrecognised element in calendar feed, ignoring: " + rule);
+      curr.rrule = null;
+    }
  }
  return originalEnd.call(this, val, params, curr, stack);
 }
--- a/modules/default/clock/README.md
+++ b/modules/default/clock/README.md
@ -2,6 +2,11 @@
 The `clock` module is one of the default modules of the MagicMirror.
 This module displays the current date and time. The information will be updated realtime.

+## Screenshot
+
+- Current time
+![Current time](clock_screenshot.png)
+
 ## Using the module

 To use this module, add it to the modules array in the `config/config.js` file:
--- a/modules/default/clock/clock_screenshot.png
+++ b/modules/default/clock/clock_screenshot.png
--- a/modules/default/compliments/README.md
+++ b/modules/default/compliments/README.md
@ -2,6 +2,10 @@
 The `compliments` module is one of the default modules of the MagicMirror.
 This module displays a random compliment.

+## Screenshots
+- Compliments Screenshot
+![Compliments Screenshot](compliments_screenshot.png)
+
 ## Using the module

 To use this module, add it to the modules array in the `config/config.js` file:
@ -45,22 +49,22 @@ The `compliments` property contains an object with four arrays: <code>morning</c


 If use the currentweather is possible use a actual weather for set compliments. The availables properties are:
-* `day_sunny`
-* `day_cloudy`
-* `cloudy`
-* `cloudy_windy`
-* `showers`
-* `rain`
-* `thunderstorm`
-* `snow`
-* `fog`
-* `night_clear`
-* `night_cloudy`
-* `night_showers`
-* `night_rain`
-* `night_thunderstorm`
-* `night_snow`
-* `night_alt_cloudy_windy`
+- `day_sunny`
+- `day_cloudy`
+- `cloudy`
+- `cloudy_windy`
+- `showers`
+- `rain`
+- `thunderstorm`
+- `snow`
+- `fog`
+- `night_clear`
+- `night_cloudy`
+- `night_showers`
+- `night_rain`
+- `night_thunderstorm`
+- `night_snow`
+- `night_alt_cloudy_windy`

 #### Example use with currentweather module
 ````javascript
@ -107,6 +111,13 @@ config: {
 }
 ````

+#### Multi-line compliments:
+Use `\n` to split compliment text into multiple lines, e.g. `First line.\nSecond line.` will be shown as:
+```
+First line.
+Second line.
+```
+
 ### External Compliment File
 You may specify an external file that contains the three compliment arrays. This is particularly useful if you have a
 large number of compliments and do not wish to crowd your `config.js` file with a large array of compliments.
--- a/modules/default/compliments/compliments.js
+++ b/modules/default/compliments/compliments.js
@ -159,7 +159,7 @@ Module.register("compliments", {

 		var compliment = document.createTextNode(complimentText);
 		var wrapper = document.createElement("div");
-		wrapper.className = this.config.classes ? this.config.classes : "thin xlarge bright";
+		wrapper.className = this.config.classes ? this.config.classes : "thin xlarge bright pre-line";
 		wrapper.appendChild(compliment);

 		return wrapper;
--- a/modules/default/compliments/compliments_screenshot.png
+++ b/modules/default/compliments/compliments_screenshot.png
--- a/modules/default/currentweather/README.md
+++ b/modules/default/currentweather/README.md
@ -2,6 +2,11 @@
 The `currentweather` module is one of the default modules of the MagicMirror.
 This module displays the current weather, including the windspeed, the sunset or sunrise time, the temperature and an icon to display the current conditions.

+## Screenshot
+
+- Current weather screenshot
+![Current Weather Screenshot](weather_screenshot.png)
+
 ## Using the module

 To use this module, add it to the modules array in the `config/config.js` file:
@ -29,7 +34,7 @@ The following properties can be configured:
 | Option                       | Description
 | ---------------------------- | -----------
 | `location`                   | The location used for weather information. <br><br> **Example:** `'Amsterdam,Netherlands'` <br> **Default value:** `false` <br><br> **Note:** When the `location` and `locationID` are both not set, the location will be based on the information provided by the calendar module. The first upcoming event with location data will be used.
-| `locationID`                 | Location ID from [OpenWeatherMap](http://openweathermap.org/help/city_list.txt) **This will override anything you put in location.** <br> Leave blank if you want to use location. <br> **Example:** `1234567` <br> **Default value:** `false` <br><br> **Note:** When the `location` and `locationID` are both not set, the location will be based on the information provided by the calendar module. The first upcoming event with location data will be used.
+| `locationID`                 | Location ID from [OpenWeatherMap](https://openweathermap.org/find) **This will override anything you put in location.** <br> Leave blank if you want to use location. <br> **Example:** `1234567` <br> **Default value:** `false` <br><br> **Note:** When the `location` and `locationID` are both not set, the location will be based on the information provided by the calendar module. The first upcoming event with location data will be used.
 | `appid`                      | The [OpenWeatherMap](https://home.openweathermap.org) API key, which can be obtained by creating an OpenWeatherMap account. <br><br>  This value is **REQUIRED**
 | `units`                      | What units to use. Specified by config.js <br><br> **Possible values:** `config.units` = Specified by config.js, `default` = Kelvin, `metric` = Celsius, `imperial` =Fahrenheit <br> **Default value:** `config.units`
 | `roundTemp`                  | Round temperature value to nearest integer. <br><br> **Possible values:** `true` (round to integer) or `false` (display exact value with decimal point) <br> **Default value:** `false`
--- a/modules/default/currentweather/weather_screenshot.png
+++ b/modules/default/currentweather/weather_screenshot.png
--- a/modules/default/newsfeed/README.md
+++ b/modules/default/newsfeed/README.md
@ -2,6 +2,10 @@
 The `newsfeed ` module is one of the default modules of the MagicMirror.
 This module displays news headlines based on an RSS feed. Scrolling through news headlines happens time-based (````updateInterval````), but can also be controlled by sending news feed specific notifications to the module.

+## Screenshot
+- News Feed Screenshot using the NYT
+![NYT News Feed Screenshot](newsfeed_screenshot.png)
+
 ## Using the module

 ### Configuration
--- a/modules/default/newsfeed/newsfeed_screenshot.png
+++ b/modules/default/newsfeed/newsfeed_screenshot.png
--- a/modules/default/updatenotification/updatenotification.js
+++ b/modules/default/updatenotification/updatenotification.js
@ -58,8 +58,9 @@ Module.register("updatenotification", {
 			icon.innerHTML = "&nbsp;";
 			message.appendChild(icon);

-			var subtextHtml = this.translate("UPDATE_INFO", {
-				COMMIT_COUNT: this.status.behind + " " + ((this.status.behind == 1) ? "commit" : "commits"),
+			var updateInfoKeyName = this.status.behind == 1 ? "UPDATE_INFO_SINGLE" : "UPDATE_INFO_MULTIPLE";
+			var subtextHtml = this.translate(updateInfoKeyName, {
+				COMMIT_COUNT: this.status.behind,
 				BRANCH_NAME: this.status.current
 			});

--- a/modules/default/weatherforecast/README.md
+++ b/modules/default/weatherforecast/README.md
@ -2,6 +2,11 @@
 The `weatherforecast` module is one of the default modules of the MagicMirror.
 This module displays the weather forecast for the coming week, including an an icon to display the current conditions, the minimum temperature and the maximum temperature.

+## Screenshots
+
+- 5 day forecast
+![Screenshot of 5 day forecast](forecast_screenshot.png)
+
 ## Using the module

 To use this module, add it to the modules array in the `config/config.js` file:
@ -28,7 +33,7 @@ The following properties can be configured:
 | Option                       | Description
 | ---------------------------- | -----------
 | `location`                   | The location used for weather information. <br><br> **Example:** `'Amsterdam,Netherlands'` <br> **Default value:** `false` <br><br> **Note:** When the `location` and `locationID` are both not set, the location will be based on the information provided by the calendar module. The first upcoming event with location data will be used.
-| `locationID`                 | Location ID from [OpenWeatherMap](http://openweathermap.org/help/city_list.txt) **This will override anything you put in location.** <br> Leave blank if you want to use location. <br> **Example:** `1234567` <br> **Default value:** `false` <br><br> **Note:** When the `location` and `locationID` are both not set, the location will be based on the information provided by the calendar module. The first upcoming event with location data will be used.
+| `locationID`                 | Location ID from [OpenWeatherMap](https://openweathermap.org/find) **This will override anything you put in location.** <br> Leave blank if you want to use location. <br> **Example:** `1234567` <br> **Default value:** `false` <br><br> **Note:** When the `location` and `locationID` are both not set, the location will be based on the information provided by the calendar module. The first upcoming event with location data will be used.
 | `appid`                      | The [OpenWeatherMap](https://home.openweathermap.org) API key, which can be obtained by creating an OpenWeatherMap account. <br><br> This value is **REQUIRED**
 | `units`                      | What units to use. Specified by config.js <br><br> **Possible values:** `config.units` = Specified by config.js, `default` = Kelvin, `metric` = Celsius, `imperial` =Fahrenheit <br> **Default value:** `config.units`
 | `roundTemp`                  | Round temperature values to nearest integer. <br><br> **Possible values:** `true` (round to integer) or `false` (display exact value with decimal point) <br> **Default value:** `false`
--- a/modules/default/weatherforecast/forecast_screenshot.png
+++ b/modules/default/weatherforecast/forecast_screenshot.png
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "magicmirror",
-  "version": "2.5.0-dev",
+  "version": "2.6.0-dev",
  "description": "The open source modular smart mirror platform.",
  "main": "js/electron.js",
  "scripts": {
@ -49,7 +49,7 @@
    "jshint": "^2.9.5",
    "mocha": "^4.1.0",
    "mocha-each": "^1.1.0",
-    "spectron": "3.7.x",
+    "spectron": "^3.8.0",
    "stylelint": "^8.4.0",
    "stylelint-config-standard": "latest",
    "time-grunt": "latest"
@ -57,18 +57,18 @@
  "dependencies": {
    "body-parser": "^1.18.2",
    "colors": "^1.1.2",
-    "electron": "^2.0.0",
+    "electron": "^2.0.4",
    "express": "^4.16.2",
    "express-ipfilter": "0.3.1",
    "feedme": "latest",
    "helmet": "^3.9.0",
    "iconv-lite": "latest",
-    "mocha-logger": "^1.0.5",
+    "mocha-logger": "^1.0.6",
    "moment": "latest",
-    "request": "^2.83.0",
-    "rrule-alt": "^2.2.7",
+    "request": "^2.87.0",
+    "rrule-alt": "^2.2.8",
    "simple-git": "^1.85.0",
-    "socket.io": "^2.0.4",
+    "socket.io": "^2.1.1",
    "valid-url": "latest",
    "walk": "latest"
  }
--- a/tests/configs/data/TranslationTest.json
+++ b/tests/configs/data/TranslationTest.json
@ -28,5 +28,6 @@

  "UPDATE_NOTIFICATION": "MagicMirror² update available.",
  "UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.",
-  "UPDATE_INFO": "The current installation is COMMIT_COUNT behind on the BRANCH_NAME branch."
+  "UPDATE_INFO_SINGLE": "The current installation is COMMIT_COUNT commit behind on the BRANCH_NAME branch.",
+  "UPDATE_INFO_MULTIPLE": "The current installation is COMMIT_COUNT commits behind on the BRANCH_NAME branch."
 }
--- a/tests/configs/data/en.json
+++ b/tests/configs/data/en.json
@ -28,5 +28,6 @@

  "UPDATE_NOTIFICATION": "MagicMirror² update available.",
  "UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.",
-  "UPDATE_INFO": "The current installation is COMMIT_COUNT behind on the BRANCH_NAME branch."
+  "UPDATE_INFO_SINGLE": "The current installation is COMMIT_COUNT commit behind on the BRANCH_NAME branch.",
+  "UPDATE_INFO_MULTIPLE": "The current installation is COMMIT_COUNT commits behind on the BRANCH_NAME branch."
 }
--- a/translations/af.json
+++ b/translations/af.json
@ -26,5 +26,6 @@

 	"UPDATE_NOTIFICATION": "MagicMirror² update beskikbaar.",
 	"UPDATE_NOTIFICATION_MODULE": "Update beskikbaar vir {MODULE_NAME} module.",
-	"UPDATE_INFO": "Die huidige installasie is {COMMIT_COUNT} agter op die {BRANCH_NAME} branch."
+	"UPDATE_INFO_SINGLE": "Die huidige installasie is {COMMIT_COUNT} commit agter op die {BRANCH_NAME} branch.",
+	"UPDATE_INFO_MULTIPLE": "Die huidige installasie is {COMMIT_COUNT} commits agter op die {BRANCH_NAME} branch."
 }
--- a/translations/bg.json
+++ b/translations/bg.json
@ -28,5 +28,6 @@

 	"UPDATE_NOTIFICATION": "Налична актуализация за MagicMirror².",
 	"UPDATE_NOTIFICATION_MODULE": "Налична актуализация за {MODULE_NAME} модул.",
-	"UPDATE_INFO": "Текущата инсталация е изостанала с {COMMIT_COUNT} къмита на клон {BRANCH_NAME}."
+	"UPDATE_INFO_SINGLE": "Текущата инсталация е изостанала с {COMMIT_COUNT} commit къмита на клон {BRANCH_NAME}.",
+	"UPDATE_INFO_MULTIPLE": "Текущата инсталация е изостанала с {COMMIT_COUNT} commits къмита на клон {BRANCH_NAME}."
 }
--- a/translations/ca.json
+++ b/translations/ca.json
@ -28,5 +28,6 @@

 	"UPDATE_NOTIFICATION": "MagicMirror² actualizació disponible.",
 	"UPDATE_NOTIFICATION_MODULE": "Disponible una actualizació per al mòdul {MODULE_NAME}.",
-	"UPDATE_INFO": "La teva instal·lació actual està {COMMIT_COUNT} canvis darrere de la branca {BRANCH_NAME}."
+	"UPDATE_INFO_SINGLE": "La teva instal·lació actual està {COMMIT_COUNT} commit canvis darrere de la branca {BRANCH_NAME}.",
+	"UPDATE_INFO_MULTIPLE": "La teva instal·lació actual està {COMMIT_COUNT} commits canvis darrere de la branca {BRANCH_NAME}."
 }
--- a/translations/cs.json
+++ b/translations/cs.json
@ -28,5 +28,6 @@

 	"UPDATE_NOTIFICATION": "Dostupná aktualizace pro MagicMirror².",
 	"UPDATE_NOTIFICATION_MODULE": "Dostupná aktualizace pro modul {MODULE_NAME}.",
-	"UPDATE_INFO": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT}."
+	"UPDATE_INFO_SINGLE": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT} commit.",
+	"UPDATE_INFO_MULTIPLE": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT} commits."
 }
--- a/translations/cy.json
+++ b/translations/cy.json
@ -28,5 +28,6 @@

 	"UPDATE_NOTIFICATION": "MagicMirror² mwy diweddar yn barod.",
 	"UPDATE_NOTIFICATION_MODULE": "Mae diweddaraiad ar gyfer y modiwl {MODULE_NAME}.",
-	"UPDATE_INFO": "Mae'r fersiwn bresenol {COMMIT_COUNT} commit tu ôl i'r gangen {BRANCH_NAME}."
+	"UPDATE_INFO_SINGLE": "Mae'r fersiwn bresenol {COMMIT_COUNT} commit tu ôl i'r gangen {BRANCH_NAME}.",
+	"UPDATE_INFO_MULTIPLE": "Mae'r fersiwn bresenol {COMMIT_COUNT} commit tu ôl i'r gangen {BRANCH_NAME}."
 }
--- a/translations/da.json
+++ b/translations/da.json
@ -27,5 +27,6 @@

 	"UPDATE_NOTIFICATION": "MagicMirror² opdatering tilgængelig.",
 	"UPDATE_NOTIFICATION_MODULE": "Opdatering tilgængelig for {MODULE_NAME} modulet.",
-	"UPDATE_INFO": "Den nuværende installation er {COMMIT_COUNT} bagud på {BRANCH_NAME} branch'en."
+	"UPDATE_INFO_SINGLE": "Den nuværende installation er {COMMIT_COUNT} commit bagud på {BRANCH_NAME} branch'en.",
+	"UPDATE_INFO_MULTIPLE": "Den nuværende installation er {COMMIT_COUNT} commits bagud på {BRANCH_NAME} branch'en."
 }
--- a/translations/de.json
+++ b/translations/de.json
@ -28,7 +28,8 @@

 	"UPDATE_NOTIFICATION": "Aktualisierung für MagicMirror² verfügbar.",
 	"UPDATE_NOTIFICATION_MODULE": "Aktualisierung für das {MODULE_NAME} Modul verfügbar.",
-	"UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} hinter dem {BRANCH_NAME} Branch.",
+	"UPDATE_INFO_SINGLE": "Die aktuelle Installation ist {COMMIT_COUNT} Commit hinter dem {BRANCH_NAME} Branch.",
+	"UPDATE_INFO_MULTIPLE": "Die aktuelle Installation ist {COMMIT_COUNT} Commits hinter dem {BRANCH_NAME} Branch.",
 	
 	"FEELS": "Gefühlt"
 }
--- a/translations/en.json
+++ b/translations/en.json
@ -28,7 +28,8 @@

 	"UPDATE_NOTIFICATION": "MagicMirror² update available.",
 	"UPDATE_NOTIFICATION_MODULE": "Update available for {MODULE_NAME} module.",
-	"UPDATE_INFO": "The current installation is {COMMIT_COUNT} behind on the {BRANCH_NAME} branch.",
+	"UPDATE_INFO_SINGLE": "The current installation is {COMMIT_COUNT} commit behind on the {BRANCH_NAME} branch.",
+	"UPDATE_INFO_MULTIPLE": "The current installation is {COMMIT_COUNT} commits behind on the {BRANCH_NAME} branch.",
 	
 	"FEELS": "Feels"
 }
--- a/translations/es.json
+++ b/translations/es.json
@ -28,7 +28,8 @@

 	"UPDATE_NOTIFICATION": "MagicMirror² actualización disponible.",
 	"UPDATE_NOTIFICATION_MODULE": "Disponible una actualización para el módulo {MODULE_NAME}.",
-	"UPDATE_INFO": "Tu actual instalación está {COMMIT_COUNT} cambios detrás de la rama {BRANCH_NAME}.",
+	"UPDATE_INFO_SINGLE": "Tu actual instalación está {COMMIT_COUNT} commit cambios detrás de la rama {BRANCH_NAME}.",
+	"UPDATE_INFO_MULTIPLE": "Tu actual instalación está {COMMIT_COUNT} commits cambios detrás de la rama {BRANCH_NAME}.",
 	
 	"FEELS": "Sensación térmica de"
 }
--- a/translations/et.json
+++ b/translations/et.json
@ -26,5 +26,6 @@

 	"UPDATE_NOTIFICATION": "MagicMirror²´le uuendus saadaval.",
 	"UPDATE_NOTIFICATION_MODULE": "Uuendus saadaval {MODULE_NAME} moodulile.",
-	"UPDATE_INFO": "Praegune paigaldus on {COMMIT_COUNT} tagapool {BRANCH_NAME} harul."
+	"UPDATE_INFO_SINGLE": "Praegune paigaldus on {COMMIT_COUNT} commit tagapool {BRANCH_NAME} harul.",
+	"UPDATE_INFO_MULTIPLE": "Praegune paigaldus on {COMMIT_COUNT} commits tagapool {BRANCH_NAME} harul."
 }
--- a/translations/fr.json
+++ b/translations/fr.json
@ -28,7 +28,8 @@

 	"UPDATE_NOTIFICATION": "Une mise à jour de MagicMirror² est disponible",
 	"UPDATE_NOTIFICATION_MODULE": "Une mise à jour est disponible pour le module {MODULE_NAME} .",
-	"UPDATE_INFO": "L'installation actuelle est {COMMIT_COUNT} en retard sur la branche {BRANCH_NAME} .",
+	"UPDATE_INFO_SINGLE": "L'installation actuelle est {COMMIT_COUNT} commit en retard sur la branche {BRANCH_NAME} .",
+	"UPDATE_INFO_MULTIPLE": "L'installation actuelle est {COMMIT_COUNT} commits en retard sur la branche {BRANCH_NAME} .",

 	"FEELS": "Ressenti"
 }
--- a/translations/hu.json
+++ b/translations/hu.json
@ -28,7 +28,8 @@

 	"UPDATE_NOTIFICATION": "MagicMirror²-hoz frissítés érhető el.",
 	"UPDATE_NOTIFICATION_MODULE": "A {MODULE_NAME} modulhoz frissítés érhető el.",
-	"UPDATE_INFO": "A jelenlegi telepítés óta {COMMIT_COUNT} commit jelent meg a {BRANCH_NAME} ágon.",
+	"UPDATE_INFO_SINGLE": "A jelenlegi telepítés óta {COMMIT_COUNT} új commit jelent meg a {BRANCH_NAME} ágon.",
+	"UPDATE_INFO_MULTIPLE": "A jelenlegi telepítés óta {COMMIT_COUNT} új commit jelent meg a {BRANCH_NAME} ágon.",

 	"FEELS": "Érzet"
 }
--- a/translations/id.json
+++ b/translations/id.json
@ -28,5 +28,6 @@

 	"UPDATE_NOTIFICATION": "Memperbarui MagicMirror² tersedia.",
 	"UPDATE_NOTIFICATION_MODULE": "Memperbarui tersedia untuk modul {MODULE_NAME}.",
-	"UPDATE_INFO": "Instalasi saat ini tertinggal {COMMIT_COUNT} pada cabang {BRANCH_NAME}."
+	"UPDATE_INFO_SINGLE": "Instalasi saat ini tertinggal {COMMIT_COUNT} commit pada cabang {BRANCH_NAME}.",
+	"UPDATE_INFO_MULTIPLE": "Instalasi saat ini tertinggal {COMMIT_COUNT} commits pada cabang {BRANCH_NAME}."
 }
--- a/translations/is.json
+++ b/translations/is.json
@ -26,5 +26,6 @@

 	"UPDATE_NOTIFICATION": "MagicMirror² uppfærsla í boði.",
 	"UPDATE_NOTIFICATION_MODULE": "Uppfærsla í boði fyrir {MODULE_NAME} module.",
-	"UPDATE_INFO": "Núverandi kerfi er {COMMIT_COUNT} á eftir {BRANCH_NAME} branchinu."
+	"UPDATE_INFO_SINGLE": "Núverandi kerfi er {COMMIT_COUNT} commit á eftir {BRANCH_NAME} branchinu.",
+	"UPDATE_INFO_MULTIPLE": "Núverandi kerfi er {COMMIT_COUNT} commits á eftir {BRANCH_NAME} branchinu."
 }
--- a/translations/it.json
+++ b/translations/it.json
@ -28,5 +28,6 @@

 	"UPDATE_NOTIFICATION": "E' disponibile un aggiornamento di MagicMirror².",
 	"UPDATE_NOTIFICATION_MODULE": "E' disponibile un aggiornamento del modulo {MODULE_NAME}.",
-	"UPDATE_INFO": "L'installazione è {COMMIT_COUNT} indietro rispetto all'attuale branch {BRANCH_NAME}."
+	"UPDATE_INFO_SINGLE": "L'installazione è {COMMIT_COUNT} commit indietro rispetto all'attuale branch {BRANCH_NAME}.",
+	"UPDATE_INFO_MULTIPLE": "L'installazione è {COMMIT_COUNT} commits indietro rispetto all'attuale branch {BRANCH_NAME}."
 }
--- a/translations/kr.json
+++ b/translations/kr.json
@ -26,5 +26,6 @@

 	"UPDATE_NOTIFICATION": "새로운 MagicMirror² 업데이트가 있습니다.",
 	"UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME} 모듈에서 사용 가능한 업데이트 입니다.",
-	"UPDATE_INFO": "설치할 {COMMIT_COUNT} 는 {BRANCH_NAME} 분기에 해당됩니다."
+	"UPDATE_INFO_SINGLE": "설치할 {COMMIT_COUNT} commit 는 {BRANCH_NAME} 분기에 해당됩니다.",
+	"UPDATE_INFO_MULTIPLE": "설치할 {COMMIT_COUNT} commits 는 {BRANCH_NAME} 분기에 해당됩니다."
 }
--- a/translations/nb.json
+++ b/translations/nb.json
@ -28,7 +28,8 @@

 	"UPDATE_NOTIFICATION": "MagicMirror²-oppdatering er tilgjengelig.",
 	"UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengelig for modulen {MODULE_NAME}.",
-	"UPDATE_INFO": "Nåværende installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} grenen.",
+	"UPDATE_INFO_SINGLE": "Nåværende installasjon er {COMMIT_COUNT} commit bak {BRANCH_NAME} grenen.",
+	"UPDATE_INFO_MULTIPLE": "Nåværende installasjon er {COMMIT_COUNT} commits bak {BRANCH_NAME} grenen.",
 	
 	"FEELS": "Føles som"
 }
--- a/translations/nl.json
+++ b/translations/nl.json
@ -26,7 +26,8 @@

 	"UPDATE_NOTIFICATION": "MagicMirror² update beschikbaar.",
 	"UPDATE_NOTIFICATION_MODULE": "Update beschikbaar voor {MODULE_NAME} module.",
-	"UPDATE_INFO": "De huidige installatie loopt {COMMIT_COUNT} achter op de {BRANCH_NAME} branch.",
+	"UPDATE_INFO_SINGLE": "De huidige installatie loopt {COMMIT_COUNT} commit achter op de {BRANCH_NAME} branch.",
+	"UPDATE_INFO_MULTIPLE": "De huidige installatie loopt {COMMIT_COUNT} commits achter op de {BRANCH_NAME} branch.",
 	
 	"FEELS": "Gevoelstemperatuur"
 }
--- a/translations/nn.json
+++ b/translations/nn.json
@ -26,7 +26,8 @@

 	"UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengeleg.",
 	"UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengeleg for modulen {MODULE_NAME}.",
-	"UPDATE_INFO": "noverande installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} greinen.",
+	"UPDATE_INFO_SINGLE": "noverande installasjon er {COMMIT_COUNT} commit bak {BRANCH_NAME} greinen.",
+	"UPDATE_INFO_MULTIPLE": "noverande installasjon er {COMMIT_COUNT} commits bak {BRANCH_NAME} greinen.",
 	
 	"FEELS": "Kjenst som"
 }
--- a/translations/pl.json
+++ b/translations/pl.json
@ -28,7 +28,8 @@

 	"UPDATE_NOTIFICATION": "Dostępna jest aktualizacja MagicMirror².",
 	"UPDATE_NOTIFICATION_MODULE": "Dostępna jest aktualizacja modułu {MODULE_NAME}.",
-	"UPDATE_INFO": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}.",
-		
+	"UPDATE_INFO_SINGLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commit od gałęzi {BRANCH_NAME}.",
+	"UPDATE_INFO_MULTIPLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}.",
+
 	"FEELS": "Odczuwalna"
 }
--- a/translations/pt-br.json
+++ b/translations/pt-br.json
@ -25,5 +25,6 @@

 	"UPDATE_NOTIFICATION": "Nova atualização para MagicMirror disponível.",
 	"UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.",
-	"UPDATE_INFO": "Sua versão atual é a {COMMIT_COUNT} dentro do seguinte branch {BRANCH_NAME}."
+	"UPDATE_INFO_SINGLE": "Sua versão atual é a {COMMIT_COUNT} commit dentro do seguinte branch {BRANCH_NAME}.",
+	"UPDATE_INFO_MULTIPLE": "Sua versão atual é a {COMMIT_COUNT} commits dentro do seguinte branch {BRANCH_NAME}."
 }
--- a/translations/pt.json
+++ b/translations/pt.json
@ -5,9 +5,9 @@
 	"DAYAFTERTOMORROW": "O dia depois de amanhã",
 	"RUNNING": "Termina em",
 	"EMPTY": "Sem eventos programados.",
-  
+
 	"WEEK": "Semana {weekNumber}",
-  
+
 	"N": "N",
 	"NNE": "NNE",
 	"NE": "NE",
@ -24,8 +24,11 @@
 	"WNW": "ONO",
 	"NW": "NO",
 	"NNW": "NNO",
-  
+
 	"UPDATE_NOTIFICATION": "Atualização do MagicMirror² disponível.",
 	"UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.",
-	"UPDATE_INFO": "A instalação atual está {COMMIT_COUNT} atrasada no branch {BRANCH_NAME}."
+	"UPDATE_INFO_SINGLE": "A instalação atual está {COMMIT_COUNT} commit atrasada no branch {BRANCH_NAME}.",
+	"UPDATE_INFO_MULTIPLE": "A instalação atual está {COMMIT_COUNT} commits atrasada no branch {BRANCH_NAME}.",
+
+	"FEELS": "Sentida"
 }
--- a/translations/ro.json
+++ b/translations/ro.json
@ -28,5 +28,6 @@

 	"UPDATE_NOTIFICATION": "Un update este disponibil pentru MagicMirror².",
 	"UPDATE_NOTIFICATION_MODULE": "Un update este disponibil pentru modulul {MODULE_NAME}.",
-	"UPDATE_INFO": "Există {COMMIT_COUNT} commit-uri noi pe branch-ul {BRANCH_NAME}."
+	"UPDATE_INFO_SINGLE": "Există {COMMIT_COUNT} commit-uri noi pe branch-ul {BRANCH_NAME}.",
+	"UPDATE_INFO_MULTIPLE": "Există {COMMIT_COUNT} commit-uri noi pe branch-ul {BRANCH_NAME}."
 }
--- a/translations/ru.json
+++ b/translations/ru.json
@ -28,5 +28,6 @@

 	"UPDATE_NOTIFICATION": "Есть обновление для MagicMirror².",
 	"UPDATE_NOTIFICATION_MODULE": "Есть обновление для {MODULE_NAME} модуля.",
-	"UPDATE_INFO": "Данная инсталляция позади {BRANCH_NAME} ветки на {COMMIT_COUNT} коммитов."
+	"UPDATE_INFO_SINGLE": "Данная инсталляция позади {BRANCH_NAME} commit ветки на {COMMIT_COUNT} коммитов.",
+	"UPDATE_INFO_MULTIPLE": "Данная инсталляция позади {BRANCH_NAME} commits ветки на {COMMIT_COUNT} коммитов."
 }
--- a/translations/sv.json
+++ b/translations/sv.json
@ -29,7 +29,8 @@

 	"UPDATE_NOTIFICATION": "MagicMirror² uppdatering finns tillgänglig.",
 	"UPDATE_NOTIFICATION_MODULE": "Uppdatering finns tillgänglig av {MODULE_NAME} modulen.",
-	"UPDATE_INFO": "Denna installation ligger {COMMIT_COUNT} steg bakom {BRANCH_NAME} grenen.",
+	"UPDATE_INFO_SINGLE": "Denna installation ligger {COMMIT_COUNT} commit steg bakom {BRANCH_NAME} grenen.",
+	"UPDATE_INFO_MULTIPLE": "Denna installation ligger {COMMIT_COUNT} commits steg bakom {BRANCH_NAME} grenen.",

 	"FEELS": "Känns som"
 }
--- a/translations/zh-cn.json
+++ b/translations/zh-cn.json
@ -5,7 +5,9 @@
 	"TOMORROW": "明天",
 	"DAYAFTERTOMORROW": "后天",
 	"RUNNING": "结束日期",
-	"EMPTY": "没有更多的活动。",
+	"EMPTY": "无日程安排。",
+
+	"WEEK": "第{weekNumber}周",

 	"N": "北风",
 	"NNE": "北偏东风",
@ -24,7 +26,10 @@
 	"NW": "西北风",
 	"NNW": "北偏西风",

-	"UPDATE_NOTIFICATION": "MagicMirror² 有新的更新",
-	"UPDATE_NOTIFICATION_MODULE": "模块 {MODULE_NAME} 可更新",
-	"UPDATE_INFO": "当前已安装版本为 {COMMIT_COUNT} 落后于分支 {BRANCH_NAME} "
+	"UPDATE_NOTIFICATION": "MagicMirror²有新的版本。",
+	"UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME}模块可更新。",
+	"UPDATE_INFO_SINGLE": "当前已安装版本比{BRANCH_NAME}分支落后{COMMIT_COUNT}次代码更新。",
+	"UPDATE_INFO_MULTIPLE": "当前已安装版本比{BRANCH_NAME}分支落后{COMMIT_COUNT}次代码更新。",
+
+	"FEELS": "体感"
 }
--- a/vendor/package-lock.json
+++ b/vendor/package-lock.json
--- a/vendor/package.json
+++ b/vendor/package.json
@ -10,6 +10,7 @@
    "url": "https://github.com/MichMich/MagicMirror/issues"
  },
  "dependencies": {
+    "@fortawesome/fontawesome-free": "^5.3.1",
    "font-awesome": "^4.7.0",
    "moment": "^2.17.1",
    "moment-timezone": "^0.5.11",
--- a/vendor/vendor.js
+++ b/vendor/vendor.js
@ -13,6 +13,8 @@ var vendor = {
 	"weather-icons.css": "node_modules/weathericons/css/weather-icons.css",
 	"weather-icons-wind.css": "node_modules/weathericons/css/weather-icons-wind.css",
 	"font-awesome.css": "node_modules/font-awesome/css/font-awesome.min.css",
+	"font-awesome5.css": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
+	"font-awesome5.v4shims.css": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css",
 	"nunjucks.js": "node_modules/nunjucks/browser/nunjucks.min.js"
 };

--- a/vendor/yarn.lock
+++ b/vendor/yarn.lock