diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-19 16:19:32 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-19 18:36:16 +0200 |
| commit | 356e9150dfec5bbb8a56b128c1d3372cd5731ec6 (patch) | |
| tree | b5270b3fe3c38ef2d94670f06613c4bdf71d0631 /config/locales/simple_form.zh-CN.yml | |
| parent | f4b008906dcfc3333ec533884aa10b65f8ae41a2 (diff) | |
| parent | ede0be5dba6836606db772a007ad9be5d60c7b99 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/lib/sanitize_config.rb Keep our version, we support the tags upstream transforms. - package.json - yarn.lock
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 2dbd7d66e..b781deb32 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -90,7 +90,7 @@ zh-CN: password: 密码 phrase: 关键词 setting_advanced_layout: 启用高级 web 界面 - setting_aggregate_reblogs: 在时间线中合并转嘟 + setting_aggregate_reblogs: 在时间轴中合并转嘟 setting_auto_play_gif: 自动播放 GIF 动画 setting_boost_modal: 在转嘟前询问我 setting_default_language: 发布语言 |