diff options
author | ThibG <thib@sitedethib.com> | 2018-05-23 19:19:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-23 19:19:28 +0200 |
commit | 88ec5193cb377500c4500d31d7ba9fa441f1f5ee (patch) | |
tree | d517f10fdeffb6adaf7e349ea78593c02534c84a /config/locales/simple_form.zh-CN.yml | |
parent | 7719fe0df27a59cb7292989688efaa4efc6cbccc (diff) | |
parent | e0ef89c73f6b380a2841b9dcde07725d515340a4 (diff) |
Merge pull request #510 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/simple_form.zh-CN.yml')
-rw-r--r-- | config/locales/simple_form.zh-CN.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index b12538b35..5b3b25ab1 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -13,7 +13,7 @@ zh-CN: note: 还能输入 <span class="note-counter">%{count}</span> 个字符 setting_hide_network: 你关注的人和关注你的人将不会在你的个人资料页上展示 setting_noindex: 此设置会影响到你的公开个人资料以及嘟文页面 - setting_theme: 此设置会影响到你从任意设备登录时 Mastodon 的显示样式 + setting_theme: 此设置会影响到所有已登录设备上 Mastodon 的显示样式 imports: data: 请上传从其他 Mastodon 实例导出的 CSV 文件 sessions: |