Merge remote-tracking branch 'origin/main' into feature/scheduled-send
# Conflicts: # app/[locale]/page.tsx # components/email/email-composer.tsx # components/email/email-viewer.tsx
This commit is contained in:
@@ -8,6 +8,8 @@
|
||||
"jmap_endpoint_label": "JMAP Server",
|
||||
"jmap_endpoint_placeholder": "https://mail.example.com",
|
||||
"jmap_endpoint_cors_hint": "The server must allow CORS requests from this domain.",
|
||||
"jmap_server_label": "Server",
|
||||
"jmap_server_auto_picked": "Server selected from your email domain.",
|
||||
"sign_in": "Sign in",
|
||||
"signing_in": "Signing in...",
|
||||
"loading": "Loading...",
|
||||
@@ -425,6 +427,7 @@
|
||||
"declined_counter_title": "Counter Proposal Declined",
|
||||
"cancelled_title": "Event Cancelled",
|
||||
"organizer": "Organized by {name}",
|
||||
"organizer_label": "Organized by",
|
||||
"attendees": "{count, plural, one {# attendee} other {# attendees}}",
|
||||
"accept": "Accept",
|
||||
"maybe": "Maybe",
|
||||
@@ -732,6 +735,9 @@
|
||||
"discard_changes": "Discard unsaved changes?",
|
||||
"discard": "Discard",
|
||||
"keep_editing": "Keep editing",
|
||||
"search_placeholder": "Search settings",
|
||||
"search_clear": "Clear search",
|
||||
"search_no_results": "No matching settings",
|
||||
"tabs": {
|
||||
"appearance": "Appearance",
|
||||
"language": "Language & Region",
|
||||
@@ -1398,7 +1404,7 @@
|
||||
"description": "Sync your settings across browsers and devices"
|
||||
},
|
||||
"sender_favicons": {
|
||||
"label": "Sender Favicons (Experimental)",
|
||||
"label": "Sender Favicons",
|
||||
"description": "Show website icons as profile pictures for business senders"
|
||||
},
|
||||
"show_avatars_in_junk": {
|
||||
|
||||
Reference in New Issue
Block a user