diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-02 12:01:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 12:01:40 +0200 |
| commit | 35e9d099b3febd75d1613dfc8a494e769a98c3a6 (patch) | |
| tree | 2aceaee757bd292e3d05811673a7bfe419e7b064 /config/locales/simple_form.zh-CN.yml | |
| parent | 4e60a0d5433f5dfa4f71a452cc5c6ceb0f21ceab (diff) | |
| parent | 6ad76069096005d7b55d9c63a567f843997a8068 (diff) | |
Merge pull request #758 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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index b84f7107d..36b5a3f66 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -55,7 +55,6 @@ zh-CN: setting_default_privacy: 嘟文默认可见范围 setting_default_sensitive: 总是将我发送的媒体文件标记为敏感内容 setting_delete_modal: 在删除嘟文前询问我 - setting_display_sensitive_media: 总是显示标记为敏感的媒体文件 setting_hide_network: 隐藏你的社交网络 setting_noindex: 禁止搜索引擎建立索引 setting_reduce_motion: 降低过渡动画效果 |