i18n: Update zh-CN [ Chinese (China) ] translations. #2699

KenOokamiHoro · 2017-05-02T01:08:57Z

No description provided.

PeterCxy

Translations are generally acceptable.

Artoria2e5

Mostly good. Awoo.

Artoria2e5 · 2017-05-02T15:23:03Z

config/locales/zh-CN.yml

+    lock_link: 保护你的账户
+    purge: 从关注者中移除
+    success:
+      one: In the process of soft-blocking followers from one domain...


Remove the one line as Chinese won't use it anyway.

Artoria2e5 · 2017-05-02T15:24:19Z

config/locales/zh-CN.yml

@@ -5,6 +5,7 @@ zh-CN:
    about_this: 关于本实例
    apps: 应用程序
    business_email: 商业电邮︰
+    closed_registrations: 这个实例暂时（或者永久）不开放注册 _(:3」∠)_


I do not like the idea of "temporarily (or permanently)". How about "目前" (currently)? Let's not try to probe into the future...

Artoria2e5 · 2017-05-02T15:24:40Z

app/views/user_mailer/reset_password_instructions.zh-cn.html.erb

+
+<p>有人（可能是你）请求更改你 Mastodon 账户的密码。如果是你的话，请点击下面的链接：</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>


Change my password -> 更改密码

Artoria2e5 · 2017-05-02T15:25:01Z

app/views/user_mailer/confirmation_instructions.zh-cn.text.erb

+你刚刚在 <%= @instance %> 创建了帐号。
+
+点击下面的链接来完成注册啦 : <br>
+<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>


Confirm my account -> 确认帐号

Artoria2e5 · 2017-05-02T15:25:17Z

app/views/user_mailer/confirmation_instructions.zh-cn.text.erb

+点击下面的链接来完成注册啦 : <br>
+<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>
+
+别忘了看看 <%= link_to 'terms and conditions', terms_url %>。


missing translation, 使用条款

Artoria2e5 · 2017-05-02T15:29:32Z

config/locales/doorkeeper.zh-CN.yml

@@ -15,7 +15,6 @@ zh-CN:
              invalid_uri: '必须是有效的 URL 格式'
              relative_uri: '必须是绝对的 URL 地址'
              secured_uri: '必须是 HTTPS/SSL 的 URL 地址'
-


KenOokamiHoro · 2017-05-02T15:41:43Z

😌…… & @Artoria2e5 😅

Artoria2e5 · 2017-05-02T16:01:57Z

app/views/user_mailer/reset_password_instructions.zh-cn.html.erb

@@ -0,0 +1,7 @@
+<p><%= @resource.email %> ，嗨呀!!</p>
+
+<p>有人（可能是你）请求更改你 Mastodon 账户的密码。如果是你的话，请点击下面的链接：</p>


What about "hopefully you"（但愿是你）?

KenOokamiHoro

awoo~

Artoria2e5 · 2017-05-03T05:41:05Z

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

  "navigation_bar.logout": "注销",
-  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.mutes": "被静音的用户",
+  // intentional departure from https://github.com/tootsuite/mastodon/blob/f864fee1/config/locales/zh-CN.yml#L126:


Ah, remove the comments.

Artoria2e5 · 2017-05-03T05:41:47Z

app/views/user_mailer/reset_password_instructions.zh-cn.html.erb

@@ -0,0 +1,7 @@
+<p><%= @resource.email %> ，嗨呀!!</p>
+
+<p>有人（但愿是你 ~ ）请求更改你 Mastodon 账户的密码。如果是你的话，请点击下面的链接：</p>


Please, no tildes, no ASCII tildes, and no spaces around tildes or before a closing parenthesis.

Gargron · 2017-05-03T10:16:15Z

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

This is a JSON file now, so no trailing comma, and nothing after the closing }

…82283

Gargron · 2017-05-03T10:39:34Z

config/locales/doorkeeper.zh-CN.yml

@@ -124,4 +123,9 @@ zh-CN:
          home: '首页'
      application:
        title: 'OAuth 认证'
+     scopes:


There seems to be some sort of YML syntax error in this file, but I am not sure which exactly.

I18n::InvalidLocaleData: can not load translations from /home/travis/build/tootsuite/mastodon/config/locales/doorkeeper.zh-CN.yml: #<Psych::SyntaxError: (/home/travis/build/tootsuite/mastodon/config/locales/doorkeeper.zh-CN.yml): did not find expected key while parsing a block mapping at line 19 column 5>

unexpected indent ? 😂

Gargron · 2017-05-03T11:01:33Z

Looks like the last failing part is these unused keys:

Unused keys (3) | i18n-tasks v0.9.13

+--------+------------------------------+--------------------------------+

| Locale | Key                          | Value                          |

+--------+------------------------------+--------------------------------+

| zh-CN  | media_attachments            |                                |

| zh-CN  | validations.images_and_video | 已经有照片的嘟文里没法加入视频 |

| zh-CN  | validations.too_many         | 文件太多（>4）                 |

+--------+------------------------------+--------------------------------+

Artoria2e5 · 2017-06-02T14:01:37Z

Hmm, I will probably change all the 账 to 帐 -- Mastodon is not a banking app after all.

…upstream Merge upstream changes up to a239904

KenOokamiHoro added 2 commits May 2, 2017 09:07

Update zh-CN translations.

557bb8a

Merge branch 'master' into master

491ce20

KenOokamiHoro changed the title ~~Update zh-CN translations.~~ i18n: Update zh-CN [ Chinese (China) ] translations. May 2, 2017

Update doorkeeper.zh-CN.yml

3a085dd

PeterCxy approved these changes May 2, 2017

View reviewed changes

Artoria2e5 suggested changes May 2, 2017

View reviewed changes

Artoria2e5 reviewed May 2, 2017

View reviewed changes

KenOokamiHoro commented May 3, 2017

View reviewed changes

KenOokamiHoro added 4 commits May 3, 2017 12:54

Follow @Artoria2e5 's change advices.

38199ef

forget mail for text format ......

cea4603

change .jsx to json

0c2c635

Merge branch 'tootsuite-master'

16ac515

Artoria2e5 reviewed May 3, 2017

View reviewed changes

KenOokamiHoro added 2 commits May 3, 2017 13:56

fix some changes

f07f18d

mail's html version ......

6a4ffe8

Gargron requested changes May 3, 2017

View reviewed changes

ヨイツの賢狼ホロ | 3rd style added 2 commits May 3, 2017 18:26

Merge branch 'master' into master

cf09672

https://github.com/tootsuite/mastodon/pull/2699#pullrequestreview-359…

b9ef40f

…82283

Gargron requested changes May 3, 2017

View reviewed changes

a space.....

1deb518

delete some unused keys

e5b441a

Gargron approved these changes May 3, 2017

View reviewed changes

Gargron merged commit 1c469ca into mastodon:master May 3, 2017

mkody pushed a commit to im-in-space/mastodon that referenced this pull request May 3, 2024

Merge pull request mastodon#2699 from ClearlyClaire/glitch-soc/merge-…

e7b0948

…upstream Merge upstream changes up to a239904

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

i18n: Update zh-CN [ Chinese (China) ] translations. #2699

i18n: Update zh-CN [ Chinese (China) ] translations. #2699

KenOokamiHoro commented May 2, 2017

PeterCxy left a comment

Artoria2e5 left a comment

Artoria2e5 May 2, 2017

Artoria2e5 May 2, 2017

Artoria2e5 May 2, 2017

Artoria2e5 May 2, 2017

Artoria2e5 May 2, 2017

Artoria2e5 May 2, 2017

KenOokamiHoro commented May 2, 2017 via email

Artoria2e5 May 2, 2017

KenOokamiHoro left a comment

Artoria2e5 May 3, 2017 •

edited

Loading

Artoria2e5 May 3, 2017

Gargron May 3, 2017

Gargron May 3, 2017

KenOokamiHoro May 3, 2017

Gargron commented May 3, 2017

Artoria2e5 commented Jun 2, 2017


		<p>有人（可能是你）请求更改你 Mastodon 账户的密码。如果是你的话，请点击下面的链接：</p>

		<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>

		@@ -0,0 +1,7 @@
		<p><%= @resource.email %> ，嗨呀!!</p>

		<p>有人（可能是你）请求更改你 Mastodon 账户的密码。如果是你的话，请点击下面的链接：</p>

		@@ -0,0 +1,7 @@
		<p><%= @resource.email %> ，嗨呀!!</p>

		<p>有人（但愿是你 ~ ）请求更改你 Mastodon 账户的密码。如果是你的话，请点击下面的链接：</p>

i18n: Update zh-CN [ Chinese (China) ] translations. #2699

i18n: Update zh-CN [ Chinese (China) ] translations. #2699

Conversation

KenOokamiHoro commented May 2, 2017

PeterCxy left a comment

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

Choose a reason for hiding this comment

KenOokamiHoro commented May 2, 2017 via email

Choose a reason for hiding this comment

KenOokamiHoro left a comment

Choose a reason for hiding this comment

Artoria2e5 May 3, 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

Gargron commented May 3, 2017

Artoria2e5 commented Jun 2, 2017

Artoria2e5 May 3, 2017 •

edited

Loading