From 8bdabac2a2897aead751e331158dd7a02c4f9780 Mon Sep 17 00:00:00 2001
From: Eugeny Galkovskiy <zhegal@gmail.com>
Date: Thu, 18 May 2017 17:42:07 +0300
Subject: [PATCH] Переводы

---
 backend/controllers/AjaxController.php |  4 ++--
 backend/models/Analytics.php           |  2 +-
 common/messages/ru/app.php             | 28 ++++++++++++++++++++++++++++
 composer.lock                          | 30 ++++++++++++++++++------------
 4 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/backend/controllers/AjaxController.php b/backend/controllers/AjaxController.php
index fc7c01f..c41e4cc 100755
--- a/backend/controllers/AjaxController.php
+++ b/backend/controllers/AjaxController.php
@@ -50,11 +50,11 @@
                 'plot'      => $data[ 'plot' ],
                 'pie'       => [
                     [
-                        "category" => "Новый посетитель",
+                        "category" => "Новых посетителей",
                         "column-1" => round(intval($data[ 'new' ]), 2),
                     ],
                     [
-                        "category" => "Вернувшийся посетитель",
+                        "category" => "Вернувшихся посетителей",
                         "column-1" => 100 - round(intval($data[ 'new' ]), 2),
                     ],
                 ],
diff --git a/backend/models/Analytics.php b/backend/models/Analytics.php
index eac22d6..188fb1e 100755
--- a/backend/models/Analytics.php
+++ b/backend/models/Analytics.php
@@ -37,7 +37,7 @@
              */
             $sessions = new \Google_Service_AnalyticsReporting_Metric();
             $sessions->setExpression('ga:sessions');
-            $sessions->setAlias('Сеансы');
+            $sessions->setAlias('Сессии');
             
             $users = new \Google_Service_AnalyticsReporting_Metric();
             $users->setExpression('ga:users');
diff --git a/common/messages/ru/app.php b/common/messages/ru/app.php
index b1828ae..139cb7e 100755
--- a/common/messages/ru/app.php
+++ b/common/messages/ru/app.php
@@ -34,4 +34,32 @@
         'Update'                    =>  'Обновить',
         'Search'                    =>  'Найти',
         'Reset'                     =>  'Сбросить',
+        'Alias Value'							=>	'Значение псевдонима',
+        'Update Category'						=>	'Обновить категорию',
+        'Image'									=>	'Изображение',
+        'Brand Title'							=>	'Заголовок бренда',
+        'Created At'							=>	'Создано',
+        'Status'								=>	'Статус',
+        'Sort'									=>	'Сортировка',
+        'Upload Document'						=>	'Загрузить документ',
+        'Send'									=>	'Отправить',
+        'Generate'								=>	'Сгенерировать',
+        'Common'								=>	'Общее',
+        'Gallery'								=>	'Галерея',
+        'Add'									=>	'Добавить',
+        'Product option group complementary'	=>	'Дополнительные группы опций товара',
+        'Is Filter'								=>	'Является фильтром',
+        'Search for a categories ...'			=>	'Поиск категорий ..',
+        'Product option group exclude'			=>	'Исключения группы опций товара',
+        'Variant option group exclude'			=>	'Исключения группы варианта товара',
+        'Option Groups'							=>	'Группы опций',
+        'Image Id'								=>	'ID изображения',
+        'Updated At'							=>	'Обновлено',
+        'Body'									=>	'Тело',
+        'Body Preview'							=>	'Предпросмотр',
+        'Author ID'								=>	'ID автора',
+        'Description'							=>	'Описание',
+        'Parent ID'								=>	'Родительский ID',
+        'Count'                                 =>  'Количество',
+        'Color'                                 =>  'Цвет',
     ];
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 072cbbc..182e5ee 100755
--- a/composer.lock
+++ b/composer.lock
@@ -82,7 +82,10 @@
             },
             "type": "bower-asset-library",
             "extra": {
-                "bower-asset-main": "./dist/amcharts/amcharts.js"
+                "bower-asset-main": "./dist/amcharts/amcharts.js",
+                "branch-alias": {
+                    "dev-master": "3.18.5-dev"
+                }
             },
             "time": "2016-01-04 17:22:55"
         },
@@ -102,7 +105,10 @@
             },
             "type": "bower-asset-library",
             "extra": {
-                "bower-asset-main": "./dist/amcharts/amcharts.js"
+                "bower-asset-main": "./dist/amcharts/amcharts.js",
+                "branch-alias": {
+                    "dev-master": "3.13.0-dev"
+                }
             },
             "time": "2015-01-28 07:40:20"
         },
@@ -1226,16 +1232,16 @@
         },
         {
             "name": "kartik-v/bootstrap-fileinput",
-            "version": "v4.3.9",
+            "version": "v4.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/bootstrap-fileinput.git",
-                "reference": "4aec9b00de25b4b3cca1f11ffbaa823c67c33590"
+                "reference": "eea8e20f20302c52a346cd31ffe154561ee609a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/bootstrap-fileinput/zipball/4aec9b00de25b4b3cca1f11ffbaa823c67c33590",
-                "reference": "4aec9b00de25b4b3cca1f11ffbaa823c67c33590",
+                "url": "https://api.github.com/repos/kartik-v/bootstrap-fileinput/zipball/eea8e20f20302c52a346cd31ffe154561ee609a3",
+                "reference": "eea8e20f20302c52a346cd31ffe154561ee609a3",
                 "shasum": ""
             },
             "type": "library",
@@ -1275,7 +1281,7 @@
                 "progress",
                 "upload"
             ],
-            "time": "2017-04-02T18:38:08+00:00"
+            "time": "2017-05-13T22:52:09+00:00"
         },
         {
             "name": "kartik-v/yii2-krajee-base",
@@ -1624,16 +1630,16 @@
         },
         {
             "name": "noam148/yii2-image-manager",
-            "version": "1.2.3",
+            "version": "1.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/noam148/yii2-image-manager.git",
-                "reference": "82466e453b5b68e2567d3dae6f8af0ab687ae098"
+                "reference": "7df3ce72d4fb14caca4749790bfdccc46b9e7184"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/noam148/yii2-image-manager/zipball/82466e453b5b68e2567d3dae6f8af0ab687ae098",
-                "reference": "82466e453b5b68e2567d3dae6f8af0ab687ae098",
+                "url": "https://api.github.com/repos/noam148/yii2-image-manager/zipball/7df3ce72d4fb14caca4749790bfdccc46b9e7184",
+                "reference": "7df3ce72d4fb14caca4749790bfdccc46b9e7184",
                 "shasum": ""
             },
             "require": {
@@ -1669,7 +1675,7 @@
                 "widget",
                 "yii2"
             ],
-            "time": "2017-05-10T19:29:49+00:00"
+            "time": "2017-05-14T20:08:45+00:00"
         },
         {
             "name": "noam148/yii2-image-resize",
--
libgit2 0.21.4