about summary refs log tree commit diff
path: root/config/locales/simple_form.zh-CN.yml
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-04-09 11:40:14 +0200
committerClaire <claire.github-309c@sitedethib.com>2023-04-09 11:45:08 +0200
commitce12934f5b1804cc144014d9d0a93fdd16d13bf1 (patch)
treee6cb0c166392c28b38d86abe8f27344ce1d7752f /config/locales/simple_form.zh-CN.yml
parentff168ef2024626f37fa776fde5739dcd58ecb9f2 (diff)
parent99e3e152cd2180cfa9a5bcafae208d44f31078f8 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency.
Diffstat (limited to 'config/locales/simple_form.zh-CN.yml')
-rw-r--r--config/locales/simple_form.zh-CN.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 18ba22921..09e051cb5 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -33,7 +33,7 @@ zh-CN:
         autofollow: 通过邀请链接注册的用户将会自动关注你
         avatar: 文件大小限制 %{size},只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 %{dimensions}px
         bot: 来自这个账户的绝大多数操作都是自动进行的,并且可能无人监控
-        context: 过滤器的应用环境
+        context: 过滤器的应用场景
         current_password: 为了安全起见,请输入当前账号的密码
         current_username: 请输入当前账号的用户名以确认
         digest: 仅在你长时间未登录,且收到了私信时发送
@@ -171,7 +171,7 @@ zh-CN:
         chosen_languages: 语言过滤
         confirm_new_password: 确认新密码
         confirm_password: 确认密码
-        context: 过滤器环境
+        context: 过滤场景
         current_password: 当前密码
         data: 数据文件
         discoverable: 在本站用户目录中收录此账号