Merge branch 'develop' of https://github.com/MichMich/MagicMirror into develop

CHANGELOG.md

@@ -15,6 +15,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Added missing keys to Polish translation.
 - Added missing key to German translation.
 
+### Fixed
+- Fix instruction in README for using automatically installer script.
+
 ## [2.1.1] - 2017-04-01
 
 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`

README.md

@@ -31,7 +31,7 @@ Electron, the app wrapper around MagicMirror², only supports the Raspberry Pi 2
 
 Execute the following command on your Raspberry Pi to install MagicMirror²:
 ````
-curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/raspberry.sh | bash
+bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/raspberry.sh)"
 ````
 
 ### Manual Installation

config/config.js.sample

@@ -12,9 +12,9 @@ var config = {
 	port: 8080,
 	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses
 	                                                       // or add a specific IPv4 of 192.168.1.5 :
-							       // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"],
+	                                                       // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"],
-							       // or IPv4 range of 192.168.3.0 --> 192.168.3.15 use CIDR format :
+	                                                       // or IPv4 range of 192.168.3.0 --> 192.168.3.15 use CIDR format :
-							       // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.3.0/28"],
+	                                                       // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.3.0/28"],
 
 	language: "en",
 	timeFormat: 24,

translations/ru.json

@@ -7,6 +7,8 @@
 	"RUNNING": "Заканчивается через",
 	"EMPTY": "Нет предстоящих событий",
 
+	"WEEK": "Неделя",
+
 	"N": "С",
 	"NNE": "ССВ",
 	"NE": "СВ",