Merge remote-tracking branch 'origin/main' into feat/all-mail-cross-account-views
# Conflicts: # stores/settings-store.ts
This commit is contained in:
@@ -922,6 +922,7 @@
|
||||
"description": "Show an \"All Mail\" entry above your folders that merges messages from across this account's folders into one list.",
|
||||
"folders_label": "Folders in All Mail",
|
||||
"folders_description": "Choose which folders are merged into the All Mail view.",
|
||||
"account_hint": "Applies to {account}.",
|
||||
"no_folders": "No folders available."
|
||||
},
|
||||
"colorful_sidebar_icons": {
|
||||
@@ -1242,6 +1243,10 @@
|
||||
"off": "Выкл.",
|
||||
"seconds": "{seconds} сек.",
|
||||
"unsupported": "Текущая учетная запись не заявляет поддержку отложенной отправки. Настройка сохранится для других учетных записей."
|
||||
},
|
||||
"return_to_list_after_action": {
|
||||
"label": "Return to list after delete or mark unread",
|
||||
"description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
|
||||
}
|
||||
},
|
||||
"composer": {
|
||||
|
||||
Reference in New Issue
Block a user