mirror of
https://github.com/duckietm/Nitro-V3.git
synced 2026-06-20 07:26:19 +00:00
Merge origin/main into main
Resolved 2 messenger conflicts: - FriendsMessengerView.tsx: union — kept local typingUserIds/sendTypingStatus from useMessenger() plus upstream's useFriends().getFriend. - FriendsView.css: kept local group-chips + typing-indicator styles (upstream empty there). Vitest 545/545 green. (typecheck TS2307 is the un-linked renderer, env-only.)
This commit is contained in:
@@ -640,8 +640,6 @@
|
||||
'wheel.extra': 'Extra spins: %count%',
|
||||
'wheel.spin': 'SPIN',
|
||||
'wheel.buy': 'Buy spin',
|
||||
'wheel.settings': 'Settings',
|
||||
'wheel.settings.title': 'Wheel of Fortune Settings',
|
||||
'wheel.winners': 'Latest winners',
|
||||
'wheel.winners.empty': 'No winners yet',
|
||||
'wheel.win.title': 'You won!',
|
||||
@@ -716,7 +714,7 @@
|
||||
'memenu.settings.other.place.multiple.objects': "Place multiple objects",
|
||||
'memenu.settings.other.skip.purchase.confirmation': "Skip purchase confirmation",
|
||||
'memenu.settings.other.enable.chat.window': "Enable chat window",
|
||||
'memenu.settings.other.catalog.classic.style': "Catalog: classic style",
|
||||
'memenu.settings.other.catalog.classic.style': "New style",
|
||||
'usersettings.open.title': "User settings",
|
||||
'usersettings.open.subtitle': "Password & account",
|
||||
'usersettings.themes.custom': "Custom theme",
|
||||
|
||||
Reference in New Issue
Block a user