Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into develop #4775

Merged
merged 13 commits into from
Aug 26, 2024
Merged
27 changes: 15 additions & 12 deletions lang/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -439,9 +439,6 @@
"5sg7KC": {
"defaultMessage": "Password"
},
"5y5rID": {
"defaultMessage": "We will review your application shortly, stay tuned for the event!"
},
"6+eeJ4": {
"defaultMessage": "Lowercase letters, numbers and underscores",
"description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
Expand Down Expand Up @@ -754,6 +751,9 @@
"defaultMessage": "That's all",
"description": "src/components/Interaction/InfiniteScroll/EndOfResults/index.tsx"
},
"B9IFMF": {
"defaultMessage": "Yes, apply"
},
"BDbgCL": {
"defaultMessage": "Heading 3"
},
Expand Down Expand Up @@ -1078,9 +1078,6 @@
"HAlOn1": {
"defaultMessage": "Name"
},
"HB2VOx": {
"defaultMessage": "System or connection abnormality, please refresh the page and click “Apply” again."
},
"HBxXD/": {
"defaultMessage": "License"
},
Expand Down Expand Up @@ -1261,6 +1258,9 @@
"defaultMessage": "Topics",
"description": "src/components/Dialogs/TagListDialog/index.tsx"
},
"KkHQZ+": {
"defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information. (Application confirmation usually takes a few minutes for review. Your avatar will then appear among the writers.)"
},
"KlJEP9": {
"defaultMessage": "Wallet connected",
"description": "src/components/Forms/WalletAuthForm/Connect.tsx"
Expand Down Expand Up @@ -1701,6 +1701,9 @@
"Sfql0+": {
"defaultMessage": "Congratulations! You've got the Grand Badge!"
},
"Sj+TN8": {
"defaultMessage": "Announcement"
},
"SuRTsQ": {
"defaultMessage": "Register for ISCN"
},
Expand Down Expand Up @@ -2188,9 +2191,6 @@
"beLe/F": {
"defaultMessage": "Broadcast"
},
"buf5vO": {
"defaultMessage": "Event Information"
},
"c/z318": {
"defaultMessage": "Incorrect email or password",
"description": "src/components/Forms/EmailLoginForm/index.tsx"
Expand Down Expand Up @@ -2669,6 +2669,9 @@
"defaultMessage": "You have not invited anyone yet! Invite friends to join your circle by clicking 'invite friends'.",
"description": "src/views/Circle/Settings/ManageInvitation/Invites/Pending/index.tsx"
},
"lO7wKc": {
"defaultMessage": "Not yet"
},
"lT6Dt8": {
"defaultMessage": "Confirm Resignation"
},
Expand Down Expand Up @@ -2807,9 +2810,6 @@
"oGiO//": {
"defaultMessage": "Insert audio"
},
"oLOus+": {
"defaultMessage": "Application has been submitted 🎉"
},
"ob+HDS": {
"defaultMessage": "View Circle"
},
Expand All @@ -2821,6 +2821,9 @@
"defaultMessage": "Following",
"description": "src/components/UserProfile/index.tsx"
},
"on+DYO": {
"defaultMessage": "Confirm application"
},
"onDesU": {
"defaultMessage": "Congratulations! Now you can browse all works within the circle for free and chat with everyone."
},
Expand Down
27 changes: 15 additions & 12 deletions lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -439,9 +439,6 @@
"5sg7KC": {
"defaultMessage": "Password"
},
"5y5rID": {
"defaultMessage": "We will review your application shortly, stay tuned for the event!"
},
"6+eeJ4": {
"defaultMessage": "Lowercase letters, numbers and underscores",
"description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
Expand Down Expand Up @@ -754,6 +751,9 @@
"defaultMessage": "That's all",
"description": "src/components/Interaction/InfiniteScroll/EndOfResults/index.tsx"
},
"B9IFMF": {
"defaultMessage": "Yes, apply"
},
"BDbgCL": {
"defaultMessage": "Heading 3"
},
Expand Down Expand Up @@ -1078,9 +1078,6 @@
"HAlOn1": {
"defaultMessage": "Name"
},
"HB2VOx": {
"defaultMessage": "System or connection abnormality, please refresh the page and click “Apply” again."
},
"HBxXD/": {
"defaultMessage": "License"
},
Expand Down Expand Up @@ -1261,6 +1258,9 @@
"defaultMessage": "Topics",
"description": "src/components/Dialogs/TagListDialog/index.tsx"
},
"KkHQZ+": {
"defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information. (Application confirmation usually takes a few minutes for review. Your avatar will then appear among the writers.)"
},
"KlJEP9": {
"defaultMessage": "Wallet connected",
"description": "src/components/Forms/WalletAuthForm/Connect.tsx"
Expand Down Expand Up @@ -1701,6 +1701,9 @@
"Sfql0+": {
"defaultMessage": "Congratulations! You've got the Grand Badge!"
},
"Sj+TN8": {
"defaultMessage": "Announcement"
},
"SuRTsQ": {
"defaultMessage": "Register for ISCN"
},
Expand Down Expand Up @@ -2188,9 +2191,6 @@
"beLe/F": {
"defaultMessage": "Broadcast"
},
"buf5vO": {
"defaultMessage": "Event Information"
},
"c/z318": {
"defaultMessage": "Incorrect email or password",
"description": "src/components/Forms/EmailLoginForm/index.tsx"
Expand Down Expand Up @@ -2669,6 +2669,9 @@
"defaultMessage": "You have not invited anyone yet! Invite friends to join your circle by clicking 'invite friends'.",
"description": "src/views/Circle/Settings/ManageInvitation/Invites/Pending/index.tsx"
},
"lO7wKc": {
"defaultMessage": "Not yet"
},
"lT6Dt8": {
"defaultMessage": "Confirm Resignation"
},
Expand Down Expand Up @@ -2807,9 +2810,6 @@
"oGiO//": {
"defaultMessage": "Insert audio"
},
"oLOus+": {
"defaultMessage": "Application has been submitted 🎉"
},
"ob+HDS": {
"defaultMessage": "View Circle"
},
Expand All @@ -2821,6 +2821,9 @@
"defaultMessage": "Following",
"description": "src/components/UserProfile/index.tsx"
},
"on+DYO": {
"defaultMessage": "Confirm application"
},
"onDesU": {
"defaultMessage": "Congratulations! Now you can browse all works within the circle for free and chat with everyone."
},
Expand Down
31 changes: 17 additions & 14 deletions lang/zh-Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -439,9 +439,6 @@
"5sg7KC": {
"defaultMessage": "密码"
},
"5y5rID": {
"defaultMessage": "我们将尽快处理你的申请,敬请期待活动开跑!"
},
"6+eeJ4": {
"defaultMessage": "可使用小写英文、数字及下划线",
"description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
Expand Down Expand Up @@ -754,6 +751,9 @@
"defaultMessage": "没有更多",
"description": "src/components/Interaction/InfiniteScroll/EndOfResults/index.tsx"
},
"B9IFMF": {
"defaultMessage": "好的,我报名"
},
"BDbgCL": {
"defaultMessage": "标题 3"
},
Expand Down Expand Up @@ -1078,9 +1078,6 @@
"HAlOn1": {
"defaultMessage": "用户名"
},
"HB2VOx": {
"defaultMessage": "系统或连线异常,请刷新页面后重新点击报名参加"
},
"HBxXD/": {
"defaultMessage": "版权声明"
},
Expand Down Expand Up @@ -1261,6 +1258,9 @@
"defaultMessage": "标签",
"description": "src/components/Dialogs/TagListDialog/index.tsx"
},
"KkHQZ+": {
"defaultMessage": "现在报名,写作之旅将于数天后开始,活动细则可查看公告。(报名确认通常需要几分钟审核时间,之后你的头像将出现在作者之中)"
},
"KlJEP9": {
"defaultMessage": "钱包已绑定",
"description": "src/components/Forms/WalletAuthForm/Connect.tsx"
Expand Down Expand Up @@ -1554,7 +1554,7 @@
"defaultMessage": "换一批"
},
"Pq/7m5": {
"defaultMessage": "晚鸟参与处理中",
"defaultMessage": "晚鸟参与处理中",
"description": "type:join"
},
"PtV68+": {
Expand Down Expand Up @@ -1701,6 +1701,9 @@
"Sfql0+": {
"defaultMessage": "恭喜获得七日书大满贯"
},
"Sj+TN8": {
"defaultMessage": "公告"
},
"SuRTsQ": {
"defaultMessage": "注册 ISCN"
},
Expand Down Expand Up @@ -2188,9 +2191,6 @@
"beLe/F": {
"defaultMessage": "广播"
},
"buf5vO": {
"defaultMessage": "活动公告"
},
"c/z318": {
"defaultMessage": "邮箱或密码错误",
"description": "src/components/Forms/EmailLoginForm/index.tsx"
Expand Down Expand Up @@ -2544,7 +2544,7 @@
"description": "src/components/Forms/SelectAuthMethodForm/NormalFeed.tsx"
},
"jLkKbI": {
"defaultMessage": "报名处理中",
"defaultMessage": "报名处理中",
"description": "type:apply"
},
"jiB0Z2": {
Expand Down Expand Up @@ -2669,6 +2669,9 @@
"defaultMessage": "你还没有邀请任何用户喔!点击新增邀请,添加站内或站外朋友加入围炉赠与对方免费资格的固定时长",
"description": "src/views/Circle/Settings/ManageInvitation/Invites/Pending/index.tsx"
},
"lO7wKc": {
"defaultMessage": "再想想"
},
"lT6Dt8": {
"defaultMessage": "确认辞去"
},
Expand Down Expand Up @@ -2807,9 +2810,6 @@
"oGiO//": {
"defaultMessage": "插入音频"
},
"oLOus+": {
"defaultMessage": "报名申请已递交 🎉"
},
"ob+HDS": {
"defaultMessage": "马上逛逛"
},
Expand All @@ -2821,6 +2821,9 @@
"defaultMessage": "追踪中",
"description": "src/components/UserProfile/index.tsx"
},
"on+DYO": {
"defaultMessage": "确认报名"
},
"onDesU": {
"defaultMessage": "恭喜成为围炉一员。现在你可以免费浏览围炉内作品,还可以去围炉与大家谈天说地。"
},
Expand Down
31 changes: 17 additions & 14 deletions lang/zh-Hant.json
Original file line number Diff line number Diff line change
Expand Up @@ -439,9 +439,6 @@
"5sg7KC": {
"defaultMessage": "密碼"
},
"5y5rID": {
"defaultMessage": "我們將盡快處理你的申請,敬請期待活動開跑!"
},
"6+eeJ4": {
"defaultMessage": "可使用小寫英文、數字及下劃線",
"description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
Expand Down Expand Up @@ -754,6 +751,9 @@
"defaultMessage": "沒有更多",
"description": "src/components/Interaction/InfiniteScroll/EndOfResults/index.tsx"
},
"B9IFMF": {
"defaultMessage": "好的,我報名"
},
"BDbgCL": {
"defaultMessage": "標題 3"
},
Expand Down Expand Up @@ -1078,9 +1078,6 @@
"HAlOn1": {
"defaultMessage": "用戶名"
},
"HB2VOx": {
"defaultMessage": "系统或连线异常,请刷新页面后重新点击报名参加"
},
"HBxXD/": {
"defaultMessage": "版權聲明"
},
Expand Down Expand Up @@ -1261,6 +1258,9 @@
"defaultMessage": "標籤",
"description": "src/components/Dialogs/TagListDialog/index.tsx"
},
"KkHQZ+": {
"defaultMessage": "現在報名,寫作之旅將於數天後開始,活動細則可查看公告。(報名確認通常需要幾分鐘審核時間,之後你的頭像將出現在作者之中)"
},
"KlJEP9": {
"defaultMessage": "錢包已綁定",
"description": "src/components/Forms/WalletAuthForm/Connect.tsx"
Expand Down Expand Up @@ -1554,7 +1554,7 @@
"defaultMessage": "換一批"
},
"Pq/7m5": {
"defaultMessage": "晚鳥參與處理中",
"defaultMessage": "晚鳥參與處理中",
"description": "type:join"
},
"PtV68+": {
Expand Down Expand Up @@ -1701,6 +1701,9 @@
"Sfql0+": {
"defaultMessage": "恭喜獲得七日書大滿貫"
},
"Sj+TN8": {
"defaultMessage": "公告"
},
"SuRTsQ": {
"defaultMessage": "註冊 ISCN"
},
Expand Down Expand Up @@ -2188,9 +2191,6 @@
"beLe/F": {
"defaultMessage": "廣播"
},
"buf5vO": {
"defaultMessage": "活動公告"
},
"c/z318": {
"defaultMessage": "郵件地址或密碼錯誤",
"description": "src/components/Forms/EmailLoginForm/index.tsx"
Expand Down Expand Up @@ -2544,7 +2544,7 @@
"description": "src/components/Forms/SelectAuthMethodForm/NormalFeed.tsx"
},
"jLkKbI": {
"defaultMessage": "報名處理中",
"defaultMessage": "報名處理中",
"description": "type:apply"
},
"jiB0Z2": {
Expand Down Expand Up @@ -2669,6 +2669,9 @@
"defaultMessage": "你還沒有邀請任何用戶喔!點擊新增邀請,添加站內或站外朋友加入圍爐贈與對方免費資格的固定時長",
"description": "src/views/Circle/Settings/ManageInvitation/Invites/Pending/index.tsx"
},
"lO7wKc": {
"defaultMessage": "再想想"
},
"lT6Dt8": {
"defaultMessage": "確認辭去"
},
Expand Down Expand Up @@ -2807,9 +2810,6 @@
"oGiO//": {
"defaultMessage": "插入音訊"
},
"oLOus+": {
"defaultMessage": "報名申請已遞交 🎉"
},
"ob+HDS": {
"defaultMessage": "馬上逛逛"
},
Expand All @@ -2821,6 +2821,9 @@
"defaultMessage": "追蹤中",
"description": "src/components/UserProfile/index.tsx"
},
"on+DYO": {
"defaultMessage": "確認報名"
},
"onDesU": {
"defaultMessage": "恭喜成為圍爐一員。現在你可以免費瀏覽圍爐內作品,還可以去圍爐與大家談天說地。"
},
Expand Down
Loading
Loading