Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-18 23:07:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(core): journal sidebar conflict block (#5574)

Browse Source
This commit is contained in:
Cats Juice
2024-01-18 14:05:15 +00:00
parent 7aaec3ad51
commit f4b26a16f8
3 changed files with 177 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/frontend/i18n/src/resources/en.json
View File

@@ -1047,5 +1047,6 @@
"com.affine.journal.created-today": "Created today",
"com.affine.journal.updated-today": "Updated today",
"com.affine.journal.daily-count-created-empty-tips": "You haven't created anything yet",
"com.affine.journal.daily-count-updated-empty-tips": "You haven't updated anything yet"
"com.affine.journal.daily-count-updated-empty-tips": "You haven't updated anything yet",
"com.affine.journal.conflict-show-more": "{{count}} more articles"
}