diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 12:43:20 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 12:43:20 +0200 |
| commit | c91d9b7389c489980fe98812a8f3884b2d41e19e (patch) | |
| tree | 78509567984a32411c661167e254c8645eba2919 /config/locales/zh-TW.yml | |
| parent | 4e60a0d5433f5dfa4f71a452cc5c6ceb0f21ceab (diff) | |
| parent | 5d5d1b528eda560191b2813714c9e461fda3c9d8 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb
Diffstat (limited to 'config/locales/zh-TW.yml')
| -rw-r--r-- | config/locales/zh-TW.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index ad73c5583..e2b9b520e 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -12,7 +12,9 @@ zh-TW: contact_missing: 未設定 contact_unavailable: 未公開 documentation: 文件 - extended_description_html: "<h3>這裡可以寫一些網站規則</h3> <p>本站點未有詳細介紹</p>\n" + extended_description_html: | + <h3>這裡可以寫一些網站規則</h3> + <p>本站點未有詳細介紹</p> features: humane_approach_body: Mastodon 從其他網路的失敗經驗中汲取教訓，以合乎道德的設計對抗社交媒體的濫用問題。 humane_approach_title: 以人為本 |