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/simple_form.zh-CN.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/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: 降低过渡动画效果 |