diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-04-03 22:04:11 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-04-03 22:06:37 -0400 |
| commit | 3eeb53ff63a5e776327a9fd067d0c74b9dc727f4 (patch) | |
| tree | 9b4ee01e1aaf1ab7b4a24ab897ccf14e1aa19a40 /locales/en-US.yml | |
| parent | refactor bubble-timeline.ts to match global-timeline.ts and local-timeline.ts (diff) | |
| parent | New Crowdin updates (#15740) (diff) | |
| download | sharkey-3eeb53ff63a5e776327a9fd067d0c74b9dc727f4.tar.gz sharkey-3eeb53ff63a5e776327a9fd067d0c74b9dc727f4.tar.bz2 sharkey-3eeb53ff63a5e776327a9fd067d0c74b9dc727f4.zip | |
Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts:
# package.json
# packages/backend/src/core/AccountMoveService.ts
# packages/frontend/src/components/MkDateSeparatedList.vue
# packages/misskey-js/etc/misskey-js.api.md
# pnpm-lock.yaml
Diffstat (limited to 'locales/en-US.yml')
| -rw-r--r-- | locales/en-US.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/locales/en-US.yml b/locales/en-US.yml index b667891938..cc0c219a60 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -424,6 +424,7 @@ antennaExcludeBots: "Exclude bot accounts" antennaKeywordsDescription: "Separate with spaces for an AND condition or with line breaks for an OR condition." notifyAntenna: "Notify about new notes" withFileAntenna: "Only notes with files" +hideNotesInSensitiveChannel: "Hide notes from sensitive channels" enableServiceworker: "Enable Push-Notifications for your Browser" antennaUsersDescription: "List one username per line" caseSensitive: "Case sensitive" @@ -1339,6 +1340,7 @@ compress: "Compress" right: "Right" bottom: "Bottom" top: "Top" +embed: "Embed" _chat: noMessagesYet: "No messages yet" newMessage: "New message" @@ -1413,6 +1415,7 @@ _settings: showNavbarSubButtons: "Show sub-buttons on the navigation bar" ifOn: "When turned on" ifOff: "When turned off" + enableSyncThemesBetweenDevices: "Synchronize installed themes across devices" _chat: showSenderName: "Show sender's name" sendOnEnter: "Press Enter to send" @@ -2122,7 +2125,6 @@ _theme: header: "Header" navBg: "Sidebar background" navFg: "Sidebar text" - navHoverFg: "Sidebar text (Hover)" navActive: "Sidebar text (Active)" navIndicator: "Sidebar indicator" link: "Link" @@ -2145,11 +2147,8 @@ _theme: buttonHoverBg: "Button background (Hover)" inputBorder: "Input field border" driveFolderBg: "Drive folder background" - wallpaperOverlay: "Wallpaper overlay" badge: "Badge" messageBg: "Chat background" - accentDarken: "Accent (Darkened)" - accentLighten: "Accent (Lightened)" fgHighlighted: "Highlighted Text" _sfx: note: "New note" |