From 428081922725f127cadc224c020d8392ef57d65d Mon Sep 17 00:00:00 2001
From: YunoHost Bot <yunohost-bot@users.noreply.github.com>
Date: Mon, 7 Aug 2017 18:24:08 +0200
Subject: [PATCH 1/3] Update from Weblate. (#167)

* Added translation using Weblate (Russian)
* [i18n] Translated using Weblate (Russian)
Currently translated at 8.4% (29 of 345 strings)
---
 src/locales/ru.json | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 src/locales/ru.json

diff --git a/src/locales/ru.json b/src/locales/ru.json
new file mode 100644
index 00000000..353fe5e5
--- /dev/null
+++ b/src/locales/ru.json
@@ -0,0 +1,31 @@
+{
+    "action": "Действие",
+    "add": "Добавить",
+    "administration_password": "Пароль администратора",
+    "allowed_users": "Разрешенные пользователи",
+    "api_not_responding": "API не отвечает",
+    "app_access": "Доступ",
+    "app_access_addall_btn": "Включить доступ ко всем",
+    "app_access_addall_desc": "Все существующие пользователи будут иметь доступ к %s.",
+    "app_access_clearall_btn": "Очистить доступы",
+    "app_access_clearall_desc": "Каждый пользователь будет иметь доступ к %s.",
+    "app_access_removeall_btn": "Удалить все доступы",
+    "app_access_removeall_desc": "Пользователи не получат доступа к %s.",
+    "app_access_title": "%s доступ",
+    "app_debug_no_logs": "Журналы приложений недоступны",
+    "app_debug_tab": "Отображать отладочную информацию",
+    "app_info_access_desc": "Управление доступом пользователей. Разрешенные пользователи: %s",
+    "remove": "Удалить",
+    "app_info_default_desc": "Перенаправить домен root в это приложение (%s).",
+    "app_info_uninstall_desc": "Удалите это приложение.",
+    "app_install_cancel": "Установка отменена.",
+    "app_install_custom_no_manifest": "Нет файла manifest.json",
+    "app_list": "Нет файла manifest.json",
+    "app_make_default": "Использовать по умолчанию",
+    "app_repository": "Происхождение приложения: ",
+    "app_state": "Состояние приложения: ",
+    "app_state_inprogress": "Выполняется",
+    "app_state_validated": "Проверенный",
+    "app_state_working": "Работает",
+    "password": "Пароль"
+}

From e2a8b8f7cfdfaf9c49b1d5ad363ee866ce12abf9 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Mon, 7 Aug 2017 12:52:34 -0400
Subject: [PATCH 2/3] Update changelog for 2.7.0 release

---
 debian/changelog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c4ab2d88..ac5782ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+yunohost-admin (2.7.0) testing; urgency=low
+
+  * [enh] Variable assignment code cleanup. (#161)
+  * [fix] Friendlier and more meaningful 'error 500' (#166)
+  * [i18n] Started Russian translation (#167)
+
+Thanks to all contributors (opi, Aleks, Ozhiganov) <3 !
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Mon, 07 Aug 2017 12:49:55 -0400
+
 yunohost-admin (2.6.2) stable; urgency=low
 
 ## Minor fix

From 108d24cdaa29025deec9673ae1e382ca5a265f2e Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sun, 13 Aug 2017 14:07:31 -0400
Subject: [PATCH 3/3] [fix] Tell user that domain dns-conf shows a
 recommendation only

---
 src/locales/en.json            | 1 +
 src/views/domain/domain_dns.ms | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index d7ebf65f..dbccaf85 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -89,6 +89,7 @@
     "default": "Default",
     "delete": "Delete",
     "description": "Description",
+    "domain_dns_conf_is_just_a_recommendation": "This page shows you the *recommended* configuration. It does *not* configure the DNS for you. It is your responsability to configure your DNS zone in your DNS registrar according to this recommendation.",
     "diagnosis": "Diagnosis",
     "diagnosis_hide_private": "Show diagnostic information without private data",
     "diagnosis_view_private": "Show diagnostic information including private data",
diff --git a/src/views/domain/domain_dns.ms b/src/views/domain/domain_dns.ms
index afe0e8a3..e4260837 100644
--- a/src/views/domain/domain_dns.ms
+++ b/src/views/domain/domain_dns.ms
@@ -4,9 +4,12 @@
     <a href="#/domains/{{name}}">{{name}}</a>
     <a href="#/domains/{{name}}/dns">{{t 'dns'}}</a>
 </div>
-
 <div class="separator"></div>
 
+<div class="alert alert-warning">
+    <span class="fa-fw fa-warning"></span> {{t 'domain_dns_conf_is_just_a_recommendation' }}
+</div>
+
 <div class="panel panel-default">
   <div class="panel-heading">
     <h2 class="panel-title">