Merge remote-tracking branch 'origin/unstable' into unstable

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

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",

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">