From 7d7844a47fdfb8862847f025dc4c1b1bc5fdafe5 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 10 Sep 2017 09:58:38 +0200
Subject: Default follows for new users (#4871)

When a new user confirms their e-mail, bootstrap their home timeline
by automatically following a set of accounts. By default, all local
admin accounts (that are unlocked). Can be customized by new admin
setting (comma-separated usernames, local and unlocked only)
---
 config/locales/en.yml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'config/locales')

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4160745f8..64fc556f3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -167,6 +167,9 @@ en:
       unresolved: Unresolved
       view: View
     settings:
+      bootstrap_timeline_accounts:
+        desc_html: Separate multiple usernames by comma. Only local and unlocked accounts will work. Default when empty is all local admins.
+        title: Default follows for new users
       contact_information:
         email: Business e-mail
         username: Contact username
-- 
cgit 


From 15b886a6f0b0b9cdb3a5d938a7ec5c902d65410d Mon Sep 17 00:00:00 2001
From: yoshipc <yoooo@yoshipc.net>
Date: Sun, 10 Sep 2017 20:34:15 +0900
Subject: Fix Japanese translation (#4876)

I translated the additional text ( added by #4871)
---
 config/locales/ja.yml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'config/locales')

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index fa9e1d112..fcaa64dab 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -167,6 +167,9 @@ ja:
       unresolved: 未解決
       view: 表示
     settings:
+      bootstrap_timeline_accounts:
+        desc_html: 複数のユーザー名はコンマで区切ります。ローカルの公開アカウントのみ有効です。指定しない場合は管理者がデフォルトで指定されます。
+        title: 新規ユーザーが自動フォローするアカウント
       contact_information:
         email: ビジネスメールアドレス
         username: 連絡先のユーザー名
-- 
cgit