diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-26 20:36:49 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-26 20:41:43 +0200 |
| commit | 5bb8563f6c0ec9021d6e70d85544147e6c2d0f44 (patch) | |
| tree | 96a939def53ee44f19d28c66f1d1f2195806ccc2 /config/locales/simple_form.zh-CN.yml | |
| parent | 0e8de56a22aee089da8aa1c64bab941bc5911e5d (diff) | |
| parent | 82e7988afcde5b19b99ad9ecf7973560a8a17f7f (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
Diffstat (limited to 'config/locales/simple_form.zh-CN.yml')
| -rw-r--r-- | config/locales/simple_form.zh-CN.yml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index 36b5a3f66..cfa6840a6 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -4,15 +4,13 @@ zh-CN: hints: defaults: autofollow: 通过邀请链接注册的用户将会自动关注你 - avatar: 文件大小限制 %{size}，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 400×400px + avatar: 文件大小限制 %{size}，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 %{dimensions}px bot: 来自这个帐户的绝大多数操作都是自动进行的，并且可能无人监控 digest: 仅在你长时间未登录，且收到了私信时发送 - display_name: 还能输入 <span class="name-counter">%{count}</span> 个字符 fields: 这将会在个人资料页上以表格的形式展示，最多 4 个项目 - header: 文件大小限制 %{size}，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 700×335px + header: 文件大小限制 %{size}，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 %{dimensions}px locale: 用户界面、电子邮件和推送通知中使用的语言 locked: 你需要手动审核所有关注请求 - note: 还能输入 <span class="note-counter">%{count}</span> 个字符 setting_default_language: 嘟文语言自动检测的结果有可能不准确（此设置仅影响你的嘟文） setting_hide_network: 你关注的人和关注你的人将不会在你的个人资料页上展示 setting_noindex: 此设置会影响到你的公开个人资料以及嘟文页面 |