Merge branch 'develop' into calendar-timeformat-pr

CHANGELOG.md

@@ -25,6 +25,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification
 - Add ability to change the path of the `custom.css`.
 - Add translation Dutch to Alert module.
+- Added Romanian translation.
 
 ### Updated
 - Added missing keys to Polish translation.
@@ -38,6 +39,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Corrected Swedish translations for TODAY/TOMORROW/DAYAFTERTOMORROW.
 - Removed unused import from js/electron.js
 - Made calendar.js respect config.timeFormat irrespecive of locale setting
+- Fixed alignment of analog clock when a large calendar is displayed in the same side bar
 
 ## [2.1.1] - 2017-04-01
 

modules/default/clock/clock.js

@@ -180,7 +180,6 @@ Module.register("clock",{
 			wrapper.appendChild(weekWrapper);
 		} else if (this.config.displayType === "analog") {
 			// Display only an analog clock
-			dateWrapper.style.textAlign = "center";
 
 			if (this.config.showWeek) {
 				weekWrapper.style.paddingBottom = "15px";

modules/default/clock/clock_styles.css

@@ -1,5 +1,5 @@
 .clockCircle {
-  margin: 0 auto;
+  margin: 0;
   position: relative;
   border-radius: 50%;
   background-size: 100%;

translations/ro.json

@@ -0,0 +1,32 @@
+{
+	"LOADING": "Se încarcă …",
+
+	"TODAY": "Astăzi",
+	"TOMORROW": "Mâine",
+	"DAYAFTERTOMORROW": "Poimâine",
+	"RUNNING": "Se termină în",
+	"EMPTY": "Nici un eveniment.",
+
+	"WEEK": "Săptămâna",
+
+	"N": "N",
+	"NNE": "NNE",
+	"NE": "NE",
+	"ENE": "ENE",
+	"E": "E",
+	"ESE": "ESE",
+	"SE": "SE",
+	"SSE": "SSE",
+	"S": "S",
+	"SSW": "SSW",
+	"SW": "SW",
+	"WSW": "WSW",
+	"W": "W",
+	"WNW": "WNW",
+	"NW": "NW",
+	"NNW": "NNW",
+
+	"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."
+}

translations/translations.js

@@ -33,6 +33,7 @@ var translations = {
 	"is" : "translations/is.json", // Icelandic
 	"et" : "translations/et.json", // Estonian
 	"kr" : "translations/kr.json", // Korean
+	"ro" : "translations/ro.json", // Romanian
 };
 
 if (typeof module !== "undefined") {module.exports = translations;}