diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:12:17 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:12:17 +0200 |
| commit | 9330ea1f4d34b6ef4ce6e841f1aa931a7f10f749 (patch) | |
| tree | 81e346b3d9ca532b3d252135d82ce20f61780a36 /config/locales/simple_form.zh-CN.yml | |
| parent | 06e299cef591b63bd96f320eadc873b047cd2664 (diff) | |
| parent | 4aea3f88a6d30f102a79c2da7fcfac96465ba1a8 (diff) | |
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
Diffstat (limited to 'config/locales/simple_form.zh-CN.yml')
| -rw-r--r-- | config/locales/simple_form.zh-CN.yml | 4 |
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 6f4edaf48..eafaa972e 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -46,8 +46,8 @@ zh-CN: follow_request: 当有用户要求关注你时，发电邮通知 mention: 当有用户在嘟文中提及你时，发电邮通知 reblog: 当有用户转嘟了你的嘟文时，发电邮通知 - 'no': '否' + 'no': 否 required: mark: "*" text: 必填 - 'yes': '是' + 'yes': 是 |