diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-05 19:35:56 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-05 19:35:56 +0200 |
| commit | 2d8be0a6e1fbe9da892937b05b373ab907d89b77 (patch) | |
| tree | 73eb669adcc8b13c63dded5a887cb5ecc817894d /config/locales/zh-CN.yml | |
| parent | 9b3677d5097fb50f90a6abdce9d722e81d2db469 (diff) | |
| parent | 99f3a5554074d9a12619797c474b3de4c6085f02 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.
Diffstat (limited to 'config/locales/zh-CN.yml')
| -rw-r--r-- | config/locales/zh-CN.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index cb55e5bf4..f93f51af3 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -23,7 +23,7 @@ zh-CN: hosted_on: 一个在 %{domain} 上运行的 Mastodon 实例 instance_actor_flash: '这个账号是个虚拟帐号，不代表任何用户，只用来代表服务器本身。它用于和其它服务器互通，所以不应该被封禁，除非你想封禁整个实例。但是想封禁整个实例的时候，你应该用域名封禁。 - ' +' learn_more: 了解详情 privacy_policy: 隐私政策 see_whats_happening: 看一看现在在发生什么 |