Merge branch 'main' into feature/scheduled-send
# Conflicts: # app/(main)/[locale]/page.tsx # components/layout/sidebar.tsx # stores/email-store.ts # stores/settings-store.ts
This commit is contained in:
@@ -1239,6 +1239,18 @@
|
||||
"last_sync": {
|
||||
"label": "Last Sync",
|
||||
"value": "{time}"
|
||||
},
|
||||
"accounts": {
|
||||
"title": "Logged-in accounts",
|
||||
"description": "Drag to reorder how accounts appear in the account dropdown",
|
||||
"active": "Currently active account",
|
||||
"default_badge": "Default account",
|
||||
"set_default": "Set as default",
|
||||
"switch_to": "Switch to this account",
|
||||
"move_up": "Move up",
|
||||
"move_down": "Move down",
|
||||
"drag_handle": "Drag to reorder",
|
||||
"add": "Add account"
|
||||
}
|
||||
},
|
||||
"security": {
|
||||
@@ -1993,6 +2005,8 @@
|
||||
"delete_confirm": "Are you sure you want to delete this contact?",
|
||||
"local_mode": "Contacts are stored locally (server does not support JMAP Contacts)",
|
||||
"back_to_contacts": "Back to contacts",
|
||||
"back_to_email": "Back to email",
|
||||
"open_categories": "Open categories",
|
||||
"tabs": {
|
||||
"all": "All",
|
||||
"groups": "Groups"
|
||||
@@ -2516,6 +2530,7 @@
|
||||
},
|
||||
"nav_prev": "Previous",
|
||||
"nav_next": "Next",
|
||||
"nav_open_menu": "Open menu",
|
||||
"import": {
|
||||
"title": "Import Calendar",
|
||||
"tab_file": "File",
|
||||
@@ -2760,6 +2775,8 @@
|
||||
"file": "File",
|
||||
"parent_directory": "Parent directory",
|
||||
"breadcrumb_root": "Home",
|
||||
"other_accounts": "Other accounts",
|
||||
"no_accounts": "No connected accounts.",
|
||||
"drop_files_here": "Drop files or folders here to upload",
|
||||
"uploading": "Uploading...",
|
||||
"upload_success": "{count, plural, one {1 file uploaded} other {# files uploaded}}",
|
||||
@@ -2811,6 +2828,7 @@
|
||||
"undo_success": "Action undone",
|
||||
"undo_error": "Failed to undo",
|
||||
"toolbar": "File actions",
|
||||
"open_folder_tree": "Open folder tree",
|
||||
"file_list": "Files and folders",
|
||||
"context_menu": "Actions",
|
||||
"settings_title": "File Settings",
|
||||
|
||||
Reference in New Issue
Block a user