Skip to content

Commit 11f7091

Browse files
author
Yang Zhen
committed
Fix merge error
1 parent 8d97585 commit 11f7091

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

app/dashboard/i18n/en_US/global.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,6 @@
7676
"submitting": "Submitting...",
7777
"eventStreamBulletin1": "Dear developer, due to ",
7878
"eventStreamBulletin2": "[ event-stream package event ]",
79-
"eventStreamBulletin3": " Impact, your plugin needs to manually delete the `yarn.lock` file and reinstall the dependencies, then push the code to release a new version or pre-release."
80-
}
79+
"eventStreamBulletin3": " Impact, your plugin needs to manually delete the `yarn.lock` file and reinstall the dependencies, then push the code to release a new version or pre-release.",
80+
"remove": "Remove"
81+
}

app/dashboard/i18n/zh_CN/global.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,8 @@
7474
"period": "",
7575
"globalTip": "您还没有设置用户名,请先设置用户名,该用户名将作为您在该平台上的唯一标识。",
7676
"submitting": "提交中...",
77+
"eventStreamBulletin1": "尊敬的开发者,由于受 ",
78+
"eventStreamBulletin2": "[ event-stream 包事件 ]",
79+
"eventStreamBulletin3": " 影响,您的插件需要手动删除 `yarn.lock` 文件并重新安装依赖,再推送代码发布新版本或预发布。",
7780
"remove": "移除"
7881
}

0 commit comments

Comments
 (0)