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 Mon, 07 Aug 2017 12:49:55 -0400 + yunohost-admin (2.6.2) stable; urgency=low ## Minor fix 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 @@ {{name}} {{t 'dns'}} -
+
+ {{t 'domain_dns_conf_is_just_a_recommendation' }} +
+