Updating Chinese (Simplified) translations #5643

SerCom-KC · 2017-11-09T18:17:40Z

Fixed a bug caused by typo.
Further improvements.
Translations for Devise and Doorkeeper updated. @Artoria2e5 please review
Manually added an entry in app/javascript/mastodon/locales/zh-CN.json to keep up with Show confirmation dialog on leaving WebUI while composing #5616 (en.json does not have that entry yet)

SerCom-KC

(see below)

This reverts commit 27bf9a9. Looks like this commit can't get pass the checks, revert it for now.

SerCom-KC · 2017-11-10T04:12:25Z

config/locales/zh-CN.yml

-  support:
-    array:
-      last_word_connector: 以及
-      words_connector: "、"


Since the authorization page is the only place that uses to_sentence, can we include the support.array key, which overrides the existing one from rails-i18n, for better wording? Not sure about patching this to rails-i18n directly since 以及 might sound weird in some occasions.

We should probably keep this override. Are they using the backwards comma (、) correctly in rails-i18n? If not let's keep overriding them and maybe send a bug report.

@Artoria2e5 Nope, here's the file. We need a developer's help to keep this override.

Pull request submitted at svenfuchs/rails-i18n#756

Fixed at upstream at svenfuchs/rails-i18n#757

Artoria2e5

Need to change 验证 (verification) back to 认证 (auth), &c. Consider pushing devise & doorkeeper changes back upstream. Consider synchongizing to zh-TW/HK with opencc.byvoid.com and common sense.

Artoria2e5 · 2017-11-10T09:50:07Z

app/javascript/mastodon/locales/zh-CN.json

-  "compose_form.spoiler_placeholder": "隐藏文字的警告消息",
+  "compose_form.sensitive": "将媒体文件标记为敏感内容",
+  "compose_form.spoiler": "折叠嘟文内容",
+  "compose_form.spoiler_placeholder": "请填写折叠部分的警告消息",


I don't think it helps to go from a description to an instruction here.

@Artoria2e5 I'll change it back

Artoria2e5 · 2017-11-10T09:50:35Z

app/javascript/mastodon/locales/zh-CN.json

-  "compose_form.spoiler": "将部分文字隐藏于警告消息之后",
-  "compose_form.spoiler_placeholder": "隐藏文字的警告消息",
+  "compose_form.sensitive": "将媒体文件标记为敏感内容",
+  "compose_form.spoiler": "折叠嘟文内容",


consider 被折叠/隐藏的内容

@Artoria2e5 You mean compose_form.spoiler? That's the description for the CW (Content Warning) button. 被 is obviously not suitable here.

Artoria2e5 · 2017-11-10T09:52:06Z

config/locales/devise.zh-CN.yml

      not_found_in_database: "%{authentication_keys}或密码错误。"
-      timeout: 您已登录超时，请重新登录。
+      timeout: 你已登录超时，请重新登录。


Good catch on that formal "您". Mastodon is indeed supposed to be cute and casual. (But should we upstream this change back to devise? Your copyright your decision…)

@Artoria2e5 No need, this is a Mastodon-specific thing. 您 is better for general use.

How about the other changes though?

@Artoria2e5 Will open a pull request after this

Artoria2e5 · 2017-11-10T09:53:53Z

config/locales/doorkeeper.zh-CN.yml

        title: 你的应用
      new:
        title: 创建新应用
      show:
        actions: 操作
-        application_id: 应用 ID
-        callback_urls: 登录回调地址
+        application_id: 客户端 ID


Not a good idea to turn AppID into client ID here. Also should we send this back upstream too? See https://github.com/tootsuite/documentation/blob/master/Contributing-to-Mastodon/Translating.md#translating-1 for a list of upstream repos.

@Artoria2e5 I'll open a pull request to the upstream repos after we merge this

Artoria2e5 · 2017-11-10T09:54:44Z

config/locales/doorkeeper.zh-CN.yml

      index:
        application: 应用
        created_at: 授权时间
-        date_format: "%Y-%m-%d %H:%M:%S"
-        title: 你授权的应用列表
+        date_format: "%Y年%-m月%d日%H:%M:%S"


We can, and probably should, keep ISO-8601 here. Highly readable and space-efficient. Also leave a space between date (日) and time.

@Artoria2e5 Looks like the actual format in use is this one. Good advice on that space though.

Artoria2e5 · 2017-11-10T09:55:05Z

config/locales/doorkeeper.zh-CN.yml

    errors:
      messages:
        access_denied: 用户或服务器拒绝了请求
-        credential_flow_not_configured: Resource Owner Password Credentials flow failed，原因是 Doorkeeper.configure.resource_owner_from_credentials 尚未设置。
-        invalid_client: 由于未知、不支持或没有客户端，认证失败
+        credential_flow_not_configured: 由于 Doorkeeper.configure.resource_owner_from_credentials 尚未配置，客户端验证授权流程失败。


Good we should send this to https://github.com/doorkeeper-gem/doorkeeper-i18n.

Artoria2e5 · 2017-11-10T09:55:21Z

config/locales/simple_form.zh-CN.yml

@@ -8,7 +8,7 @@ zh-CN:
        display_name: 还能输入 <span class="name-counter">%{count}</span> 个字符
        header: 文件大小限制 2MB，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 700×335px
        locked: 你需要手动审核所有关注请求
-        note: 还能输入 <span class="name-counter">%{count}</span> 个字符
+        note: 还能输入 <span class="note-counter">%{count}</span> 个字符


how did we get this wrong?

@Artoria2e5 My fault lol - copying & pasting and I didn't notice this until I deploy this to my own instance 🙇

Artoria2e5 · 2017-11-10T09:56:11Z

config/locales/simple_form.zh-CN.yml

@@ -32,7 +32,7 @@ zh-CN:
        locked: 保护你的帐户（锁嘟）
        new_password: 新密码
        note: 简介
-        otp_attempt: 两步认证代码
+        otp_attempt: 两步验证代码


I would not call it a 验证 (verification), especially when we use words like 验证码 ("verification code") for captcha. Let's keep it as 认证 (auth).

@Artoria2e5 I'm not sure about this - most people tend to translate it as 两步验证. See Google, Evernote, Coding and Facebook (which translates as 双重验证) for examples. Indeed two-factor authentication should be translated as 两步认证 (or 双重认证 which is better IMO) though.

Here is the thing: fuck those big companies. Wait until you see what Microsoft has done to zh-TW. They're really bad at using human languages. See also Apple's zh-CN. 我跟你讲啊，这种怪腔调，我越开越开心……

Occasionally you really need to make an explicit move at keeping the terminology sane. Also, +1 for that 双重 translation. Indeed it's about things you use as apposed to steps you go through. And it transitions better to multi-factor. Aaaaand it doesn't feel like going two-factor is about making things harder for yourself.

@Artoria2e5 Then I'll use 双重认证

Yeah, people do learn and adapt. If they ever object we will change it to 两步认证. Lu Xun's roof and windows…

Artoria2e5 · 2017-11-10T09:56:23Z

config/locales/zh-CN.yml

      confirm: 确认
      confirmed: 已确认
-      disable_two_factor_authentication: 停用两步认证
+      disable: 停用
+      disable_two_factor_authentication: 停用两步验证


ditto for auth above.

Artoria2e5 · 2017-11-10T09:56:35Z

config/locales/zh-CN.yml

@@ -591,22 +600,22 @@ zh-CN:
    formats:
      default: "%Y年%-m月%d日%H:%M"
  two_factor_authentication:
-    code_hint: 输入你的认证器生成的代码以确认
-    description_html: 启用<strong>两步认证</strong>后，你需要输入手机认证器生成的代码才能登录
+    code_hint: 输入你的验证器生成的代码以确认


Gargron · 2017-11-13T04:04:59Z

Can I already merge or this still WIP?

SerCom-KC · 2017-11-13T04:09:35Z

@Gargron Not yet, we still need some discussions :P

SerCom-KC · 2017-11-13T04:44:06Z

config/locales/zh-CN.yml

+      role: 用户组
+      roles:
+        admin: 管理员
+        moderator: 协管


Usually Moderator should be translated as 版主, but Mastodon is not a forum so I didn't use that. I was also thinking about translate Administrator as 总管 here, but I'd like to wait for other suggestions.

I don't think Mastodon is like a BBS board, so 版主 definitely won't work. 总管 evokes some reference to weird stupid managers in workplaces, so I for one don't like it…

@Artoria2e5 Hmm, then just 协管 for now.

SerCom-KC · 2017-11-13T11:54:07Z

@Gargron Also, should I include "ui.beforeunload": "Your draft will be lost if you leave Mastodon.", for #5616 in app/javascript/mastodon/locales/en.json in this PR?

@Artoria2e5 Anything else?

Artoria2e5 · 2017-11-14T04:13:18Z

config/locales/zh-CN.yml

    generate_recovery_codes: 生成恢复代码
-    instructions_html: "<strong>请使用 Google 身份验证器或其他类似的 TOTP 两步验证手机应用扫描此处的二维码</strong>。启用两部验证后，你需要输入该应用生成的代码来登录你的帐户。"
+    instructions_html: "<strong>请使用 Google 身份验证器或其他类似的 TOTP 双重认证手机应用扫描此处的二维码</strong>。启用双重认证后，你需要输入该应用生成的代码来登录你的帐户。"


类似的 probably redundant

* i18n: (zh-CN) Bug fix for note-counter. * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add support.array key for better wording * Revert "i18n: (zh-CN) Add support.array key for better wording" This reverts commit 27bf9a9. Looks like this commit can't get pass the checks, revert it for now. * i18n: (zh-CN) Change `客户端` to `应用` * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations (mastodon#5635) * i18n: (zh-CN) Change `两步验证` to `双重认证` * i18n: (zh-CN) Improve translations

SerCom-KC added 6 commits November 9, 2017 23:39

i18n: (zh-CN) Bug fix for note-counter.

3a2830e

i18n: (zh-CN) Improve translations

aceed6f

i18n: (zh-CN) Improve translations

cf4d09d

i18n: (zh-CN) Add missing translations

dd21a4c

i18n: (zh-CN) Improve translations

00dc99d

i18n: (zh-CN) Add support.array key for better wording

27bf9a9

SerCom-KC commented Nov 10, 2017

View reviewed changes

Revert "i18n: (zh-CN) Add support.array key for better wording"

b208355

This reverts commit 27bf9a9. Looks like this commit can't get pass the checks, revert it for now.

SerCom-KC commented Nov 10, 2017

View reviewed changes

Artoria2e5 suggested changes Nov 10, 2017

View reviewed changes

SerCom-KC mentioned this pull request Nov 13, 2017

zh-CN: Minor fix svenfuchs/rails-i18n#756

Merged

i18n: (zh-CN) Change 客户端 to 应用

67c187b

SerCom-KC added 2 commits November 13, 2017 12:12

i18n: (zh-CN) Improve translations

fa24ff9

i18n: (zh-CN) Add missing translations (#5635)

7f7218f

SerCom-KC commented Nov 13, 2017

View reviewed changes

i18n: (zh-CN) Change 两步验证 to 双重认证

0aa3fb3

Artoria2e5 approved these changes Nov 14, 2017

View reviewed changes

Artoria2e5 reviewed Nov 14, 2017

View reviewed changes

ykzts added the l10n label Nov 14, 2017

i18n: (zh-CN) Improve translations

f6fc5ba

Gargron approved these changes Nov 14, 2017

View reviewed changes

Gargron merged commit c3ec1e8 into mastodon:master Nov 14, 2017

SerCom-KC deleted the zh-cn branch November 16, 2017 13:02

SerCom-KC mentioned this pull request Nov 29, 2017

Update Chinese (Simplified) translations for version 2.1.0rc1 #5849

Merged

10 tasks

Updating Chinese (Simplified) translations #5643

Updating Chinese (Simplified) translations #5643

Conversation

SerCom-KC commented Nov 9, 2017 • edited Loading

SerCom-KC left a comment • edited Loading

Choose a reason for hiding this comment

SerCom-KC Nov 10, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SerCom-KC Nov 13, 2017 • edited Loading

Choose a reason for hiding this comment

Artoria2e5 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SerCom-KC Nov 10, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SerCom-KC Nov 10, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SerCom-KC Nov 13, 2017 • edited Loading

Choose a reason for hiding this comment

Artoria2e5 Nov 13, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Artoria2e5 Nov 13, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Gargron commented Nov 13, 2017

SerCom-KC commented Nov 13, 2017 • edited Loading

SerCom-KC Nov 13, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SerCom-KC commented Nov 13, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SerCom-KC commented Nov 9, 2017 •

edited

Loading

SerCom-KC left a comment •

edited

Loading

SerCom-KC Nov 10, 2017 •

edited

Loading

SerCom-KC Nov 13, 2017 •

edited

Loading

SerCom-KC Nov 10, 2017 •

edited

Loading

SerCom-KC Nov 10, 2017 •

edited

Loading

SerCom-KC Nov 13, 2017 •

edited

Loading

Artoria2e5 Nov 13, 2017 •

edited

Loading

Artoria2e5 Nov 13, 2017 •

edited

Loading

SerCom-KC commented Nov 13, 2017 •

edited

Loading

SerCom-KC Nov 13, 2017 •

edited

Loading

SerCom-KC commented Nov 13, 2017 •

edited

Loading