about summary refs log tree commit diff
path: root/config/locales
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-08-01 22:20:25 +0200
committerThibaut Girka <thib@sitedethib.com>2018-08-01 22:20:25 +0200
commitbf1d3ae3b83726816c78ca6cb40af24d48390bd9 (patch)
tree29c156a7d145f2ec88e4bb708d329202598bdf35 /config/locales
parent71b318dedc5f39382cb15250417429427a69166b (diff)
parent4da03a298a20e5007718764483544593556a5ed4 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	config/settings.yml
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 18f293178..98fa3211a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -372,11 +372,14 @@ en:
         desc_html: Show a staff badge on a user page
         title: Show staff badge
       site_description:
-        desc_html: Introductory paragraph on the frontpage and in meta tags. You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
+        desc_html: Introductory paragraph on the frontpage. Describe what makes this Mastodon server special and anything else important. You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
         title: Instance description
       site_description_extended:
         desc_html: A good place for your code of conduct, rules, guidelines and other things that set your instance apart. You can use HTML tags
         title: Custom extended information
+      site_short_description:
+        desc_html: Displayed in sidebar and meta tags. Describe what Mastodon is and what makes this server special in a single paragraph. If empty, defaults to instance description.
+        title: Short instance description
       site_terms:
         desc_html: You can write your own privacy policy, terms of service or other legalese. You can use HTML tags
         title: Custom terms of service