about summary refs log tree commit diff
path: root/config/locales
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-12-30 18:24:38 -0600
committerGitHub <noreply@github.com>2017-12-30 18:24:38 -0600
commitd817c0a958efda990af654f72d15d6f42b43dd49 (patch)
tree0cff3632163fadeba3585f56ecdd8d1d919e12c7 /config/locales
parent65c87ca0ae20eb5dc62751047bda3e8b11e37ce0 (diff)
parent4cca1d1e7efce51eecb64489f412a7b8631f0aed (diff)
Merge pull request #291 from glitch-soc/merge-upstream
Merge with upstream @ f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml6
-rw-r--r--config/locales/ko.yml6
2 files changed, 12 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b283f94f0..2691b9ed9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -265,12 +265,18 @@ en:
       unresolved: Unresolved
       view: View
     settings:
+      activity_api_enabled:
+        desc_html: Counts of locally posted statuses, active users, and new registrations in weekly buckets
+        title: Publish aggregate statistics about user activity
       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
+      peers_api_enabled:
+        desc_html: Domain names this instance has encountered in the fediverse
+        title: Publish list of discovered instances
       registrations:
         closed_message:
           desc_html: Displayed on frontpage when registrations are closed. You can use HTML tags
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 31c946c00..2edb7ffd7 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -265,12 +265,18 @@ ko:
       unresolved: 미해결
       view: 표시
     settings:
+      activity_api_enabled:
+        desc_html: 주별 로컬에 게시 된 글, 활성 사용자 및 새로운 가입자 수
+        title: 유저 활동에 대한 통계 발행
       bootstrap_timeline_accounts:
         desc_html: 콤마로 여러 유저명을 구분. 로컬의 잠기지 않은 계정만 가능합니다. 비워 둘 경우 모든 로컬 관리자가 기본으로 사용 됩니다.
         title: 새 유저가 팔로우 할 계정들
       contact_information:
         email: 공개할 메일 주소를 입력
         username: 아이디를 입력
+      peers_api_enabled:
+        desc_html: 이 인스턴스가 페디버스에서 만났던 도메인 네임들
+        title: 발견 된 인스턴스들의 리스트 발행
       registrations:
         closed_message:
           desc_html: 신규 등록을 받지 않을 때 프론트 페이지에 표시됩니다. <br>HTML 태그를 사용할 수 있습니다.