From 01cf4cc1ed4dcf26eeb8a9722bc828ef9664778b Mon Sep 17 00:00:00 2001
From: Sergey Morozov <sergey@slack-corp.com>
Date: Fri, 6 Jan 2017 11:21:20 -0800
Subject: [PATCH] Added Russian Translations

Redo of the PR #598

**Added:**
- Russian Translations

**Fixed:**
- corrected .gitignore rules for default modules

(Reasoning behind change: when I added translation for `alert` module `git add` was telling me that `.gitignore` rule excludes files and folders under `modules/default`)

I also noticed that `.gitignore:56` has following declaration:

```
!/modules/node_helper
!/modules/node_helper/**
```
but I don't think this directory structure exists today (also there is a small typo)
---
 .gitignore                                 |  5 ++--
 CHANGELOG.md                               |  8 +++++
 modules/default/alert/translations/ru.json |  4 +++
 translations/ru.json                       | 34 ++++++++++++++++++++++
 translations/translations.js               |  1 +
 5 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 modules/default/alert/translations/ru.json
 create mode 100644 translations/ru.json

diff --git a/.gitignore b/.gitignore
index 67feae54..9e51215c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,8 +58,9 @@ Temporary Items
 !/modules/node_helper/**
 
 # Ignore all modules except the default modules.
-/modules/**
-!/modules/default/**
+!/modules/
+/modules/*
+!/modules/default/
 !/modules/README.md**
 
 # Ignore changes to the custom css files.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9551b79..bc627832 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.1] - Unreleased
+
+### Added
+- Russian Translation
+
+### Fixed
+- corrected .gitignore rules for default modules
+
 ## [2.1.0] - 2016-12-31
 
 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`
diff --git a/modules/default/alert/translations/ru.json b/modules/default/alert/translations/ru.json
new file mode 100644
index 00000000..ef7ee708
--- /dev/null
+++ b/modules/default/alert/translations/ru.json
@@ -0,0 +1,4 @@
+{
+  "sysTitle": "MagicMirror Уведомление",
+  "welcome": "Добро пожаловать, старт был успешным!""
+}
diff --git a/translations/ru.json b/translations/ru.json
new file mode 100644
index 00000000..053385ee
--- /dev/null
+++ b/translations/ru.json
@@ -0,0 +1,34 @@
+{
+	/* GENERAL */
+	"LOADING": "Загрузка &hellip;",
+
+	/* CALENDAR */
+	"TODAY": "Сегодня",
+	"TOMORROW": "Завтра",
+	"DAYAFTERTOMORROW": "Послезавтра",
+	"RUNNING": "Заканчивается через",
+	"EMPTY": "Нет предстоящих событий",
+
+	/* WEATHER */
+	"N": "С",
+	"NNE": "ССВ",
+	"NE": "СВ",
+	"ENE": "ВСВ",
+	"E": "В",
+	"ESE": "ВЮВ",
+	"SE": "ЮВ",
+	"SSE": "ЮЮВ",
+	"S": "Ю",
+	"SSW": "ЮЮЗ",
+	"SW": "ЮЗ",
+	"WSW": "ЗЮЗ",
+	"W": "З",
+	"WNW": "ЗСЗ",
+	"NW": "СЗ",
+	"NNW": "ССЗ",
+
+	/* UPDATE INFO */
+	"UPDATE_NOTIFICATION": "Есть обновление для MagicMirror².",
+	"UPDATE_NOTIFICATION_MODULE": "Есть обновление для MODULE_NAME модуля.",
+	"UPDATE_INFO": "Данная инсталляция позади BRANCH_NAME ветки на COMMIT_COUNT коммитов."
+}
diff --git a/translations/translations.js b/translations/translations.js
index d572c803..71d086f5 100644
--- a/translations/translations.js
+++ b/translations/translations.js
@@ -26,4 +26,5 @@ var translations = {
 	"gr" : "translations/gr.json",  // Greek
 	"da" : "translations/da.json", // Danish
 	"tr" : "translations/tr.json", // Turkish
+	"ru" : "translations/ru.json", // Russian
 };