yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2026-01-07 20:58:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict for en translation

Browse Source
This commit is contained in:
Convly 2023-02-27 16:10:52 +01:00
parent 98c0b9f500
commit e366e030c5
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/admin/admin/src/translations/en.json
View File

@ -862,14 +862,10 @@
"notification.success.tokencreated": "API Token successfully created",
"notification.success.tokenedited": "API Token successfully edited",
"notification.version.update.message": "A new version of Strapi is available!",
"notification.warning.404": "404 — Not found",
"notification.warning.title": "Warning:",
<<<<<<< HEAD
"notification.warning.404": "404 - Not found",
"notification.ee.warning.over-.message": "Add seats to {licenseLimitStatus, select, OVER_LIMIT {invite} AT_LIMIT {re-enable}} Users. If you already did it but it's not reflected in Strapi yet, make sure to restart your app.",
"notification.ee.warning.at-seat-limit.title": "{licenseLimitStatus, select, OVER_LIMIT {Over} AT_LIMIT {At}} seat limit ({currentUserCount}/{permittedSeats})",
=======
>>>>>>> main
"or": "OR",
"request.error.model.unknown": "This model doesn't exist",
"selectButtonTitle": "Select",