mirror of
https://github.com/duckietm/Nitro-V3.git
synced 2026-06-19 15:06:20 +00:00
Merge remote-tracking branch 'fork/main'
# Conflicts: # public/configuration/UITexts_en.json5.example # public/configuration/UITexts_it.json5.example # src/components/MainView.tsx # src/css/friends/FriendsView.css
This commit is contained in:
@@ -797,4 +797,8 @@
|
||||
'mentions.alias.description.everyone': "Everyone in the hotel",
|
||||
'mentions.alias.description.friends': "Your online friends",
|
||||
'mentions.alias.description.room': "Everyone in this room",
|
||||
// Messenger (offline delivery + typing)
|
||||
// ------------------------------------------------------------------------
|
||||
'messenger.offline.delivered': 'Sent while you were offline',
|
||||
'messenger.typing': '%FRIEND_NAME% is typing...',
|
||||
}
|
||||
|
||||
@@ -797,4 +797,8 @@
|
||||
'mentions.alias.description.everyone': "Tutti nell'hotel",
|
||||
'mentions.alias.description.friends': "I tuoi amici online",
|
||||
'mentions.alias.description.room': "Tutti in questa stanza",
|
||||
// Messenger (offline delivery + typing)
|
||||
// ------------------------------------------------------------------------
|
||||
'messenger.offline.delivered': 'Inviato mentre eri offline',
|
||||
'messenger.typing': '%FRIEND_NAME% sta scrivendo...',
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user