Change from mailbox to folder (#2156)

(cherry picked from commit 1bdaa417a25648bbe5e9c3637c413c246da3d7ef)

lib/features/base/base_mailbox_controller.dart

@@ -5,12 +5,14 @@ import 'package:core/presentation/views/bottom_popup/confirmation_dialog_action_
 import 'package:core/presentation/views/dialog/confirmation_dialog_builder.dart';
 import 'package:core/presentation/views/dialog/edit_text_dialog_builder.dart';
 import 'package:core/presentation/views/modal_sheets/edit_text_modal_sheet_builder.dart';
+import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/platform_info.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:model/extensions/presentation_mailbox_extension.dart';
 import 'package:model/mailbox/expand_mode.dart';
@@ -33,18 +35,16 @@ import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_catego
 import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree_builder.dart';
-import 'package:core/utils/app_logger.dart';
 import 'package:tmail_ui_user/features/mailbox_creator/domain/model/verification/duplicate_name_validator.dart';
 import 'package:tmail_ui_user/features/mailbox_creator/domain/model/verification/empty_name_validator.dart';
-import 'package:tmail_ui_user/features/mailbox_creator/presentation/extensions/validator_failure_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_creator/domain/state/verify_name_view_state.dart';
 import 'package:tmail_ui_user/features/mailbox_creator/domain/usecases/verify_name_interactor.dart';
+import 'package:tmail_ui_user/features/mailbox_creator/presentation/extensions/validator_failure_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 import 'package:tmail_ui_user/main/routes/app_routes.dart';
 import 'package:tmail_ui_user/main/routes/dialog_router.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
-import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 
 abstract class BaseMailboxController extends BaseController {
   final TreeBuilder _treeBuilder;
@@ -310,7 +310,7 @@ abstract class BaseMailboxController extends BaseController {
     if (responsiveUtils.isMobile(context)) {
       (EditTextModalSheetBuilder()
         ..key(const Key('rename_mailbox_dialog'))
-        ..title(AppLocalizations.of(context).rename_mailbox)
+        ..title(AppLocalizations.of(context).renameFolder)
         ..cancelText(AppLocalizations.of(context).cancel)
         ..boxConstraints(responsiveUtils.isLandscapeMobile(context)
             ? const BoxConstraints(maxWidth: 400)
@@ -343,7 +343,7 @@ abstract class BaseMailboxController extends BaseController {
         builder: (context) =>
           PointerInterceptor(child: (EditTextDialogBuilder()
             ..key(const Key('rename_mailbox_dialog'))
-            ..title(AppLocalizations.of(context).rename_mailbox)
+            ..title(AppLocalizations.of(context).renameFolder)
             ..cancelText(AppLocalizations.of(context).cancel)
             ..setErrorString((value) {
               return verifyMailboxNameAction(
@@ -412,7 +412,7 @@ abstract class BaseMailboxController extends BaseController {
   }) {
     if (responsiveUtils.isLandscapeMobile(context) || responsiveUtils.isPortraitMobile(context)) {
       (ConfirmationDialogActionSheetBuilder(context)
-        ..messageText(AppLocalizations.of(context).message_confirmation_dialog_delete_mailbox(presentationMailbox.getDisplayName(context)))
+        ..messageText(AppLocalizations.of(context).message_confirmation_dialog_delete_folder(presentationMailbox.getDisplayName(context)))
         ..onCancelAction(AppLocalizations.of(context).cancel, () => popBack())
         ..onConfirmAction(AppLocalizations.of(context).delete, () => onDeleteMailboxAction(presentationMailbox))
       ).show();
@@ -423,8 +423,8 @@ abstract class BaseMailboxController extends BaseController {
         builder: (context) => PointerInterceptor(
           child: (ConfirmDialogBuilder(imagePaths)
           ..key(const Key('confirm_dialog_delete_mailbox'))
-          ..title(AppLocalizations.of(context).delete_mailboxes)
-          ..content(AppLocalizations.of(context).message_confirmation_dialog_delete_mailbox(presentationMailbox.getDisplayName(context)))
+          ..title(AppLocalizations.of(context).deleteFolders)
+          ..content(AppLocalizations.of(context).message_confirmation_dialog_delete_folder(presentationMailbox.getDisplayName(context)))
           ..addIcon(SvgPicture.asset(imagePaths.icRemoveDialog, fit: BoxFit.fill))
           ..colorConfirmButton(AppColor.colorConfirmActionDialog)
           ..styleTextConfirmButton(const TextStyle(

lib/features/base/mixin/mailbox_action_handler_mixin.dart

@@ -68,7 +68,7 @@ mixin MailboxActionHandlerMixin {
             } else {
               appToast.showToastWarningMessage(
                 context,
-                AppLocalizations.of(context).noEmailInYourCurrentMailbox
+                AppLocalizations.of(context).noEmailInYourCurrentFolder
               );
             }
         }))
@@ -95,7 +95,7 @@ mixin MailboxActionHandlerMixin {
               } else {
                 appToast.showToastWarningMessage(
                   context,
-                  AppLocalizations.of(context).noEmailInYourCurrentMailbox
+                  AppLocalizations.of(context).noEmailInYourCurrentFolder
                 );
               }
           })
@@ -128,7 +128,7 @@ mixin MailboxActionHandlerMixin {
           } else {
             appToast.showToastWarningMessage(
               context,
-              AppLocalizations.of(context).noEmailInYourCurrentMailbox
+              AppLocalizations.of(context).noEmailInYourCurrentFolder
             );
           }
         }))
@@ -155,7 +155,7 @@ mixin MailboxActionHandlerMixin {
             } else {
               appToast.showToastWarningMessage(
                 context,
-                AppLocalizations.of(context).noEmailInYourCurrentMailbox
+                AppLocalizations.of(context).noEmailInYourCurrentFolder
               );
             }
           })

lib/features/composer/presentation/extensions/email_action_type_extension.dart

@@ -39,7 +39,7 @@ extension EmailActionTypeExtension on EmailActionType {
   String getToastMessageMoveToMailboxSuccess(BuildContext context, {String? destinationPath}) {
     switch(this) {
       case EmailActionType.moveToMailbox:
-        return AppLocalizations.of(context).moved_to_mailbox(destinationPath ?? '');
+        return AppLocalizations.of(context).movedToFolder(destinationPath ?? '');
       case EmailActionType.moveToTrash:
         return AppLocalizations.of(context).moved_to_trash;
       case EmailActionType.moveToSpam:

lib/features/destination_picker/presentation/destination_picker_controller.dart

@@ -10,8 +10,8 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/error/method/error_method_response.dart';
 import 'package:jmap_dart_client/jmap/core/id.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
+import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:model/model.dart';
 import 'package:tmail_ui_user/features/base/base_mailbox_controller.dart';
 import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.dart';
@@ -342,9 +342,9 @@ class DestinationPickerController extends BaseMailboxController {
   void _createNewMailboxFailure(CreateNewMailboxFailure failure) {
     if (currentOverlayContext != null && currentContext != null) {
       final exception = failure.exception;
-      var messageError = AppLocalizations.of(currentContext!).create_new_mailbox_failure;
+      var messageError = AppLocalizations.of(currentContext!).createNewFolderFailure;
       if (exception is ErrorMethodResponse) {
-        messageError = exception.description ?? AppLocalizations.of(currentContext!).create_new_mailbox_failure;
+        messageError = exception.description ?? AppLocalizations.of(currentContext!).createNewFolderFailure;
       }
       _appToast.showToastErrorMessage(currentOverlayContext!, messageError);
     }

lib/features/destination_picker/presentation/destination_picker_view.dart

@@ -7,8 +7,8 @@ import 'package:core/presentation/views/button/icon_button_web.dart';
 import 'package:core/presentation/views/list/tree_view.dart';
 import 'package:core/presentation/views/search/search_bar_view.dart';
 import 'package:core/presentation/views/text/text_field_builder.dart';
-import 'package:core/utils/platform_info.dart';
 import 'package:core/utils/direction_utils.dart';
+import 'package:core/utils/platform_info.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
@@ -172,7 +172,7 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
           overflow: CommonTextStyle.defaultTextOverFlow),
         focusNode: controller.nameInputFocusNode,
         decoration: (CreateMailboxNameInputDecorationBuilder()
-          ..setHintText(AppLocalizations.of(context).hint_input_create_new_mailbox)
+          ..setHintText(AppLocalizations.of(context).hintInputCreateNewFolder)
           ..setErrorText(controller.getErrorInputNameString(context)))
         .build(),
       ))
@@ -203,7 +203,7 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
               SearchBarView(
                 _imagePaths,
                 margin: const EdgeInsets.all(16),
-                hintTextSearch: AppLocalizations.of(context).hint_search_mailboxes,
+                hintTextSearch: AppLocalizations.of(context).hintSearchFolders,
                 onOpenSearchViewAction: controller.enableSearch
               ),
           _buildLoadingView(),
@@ -450,7 +450,7 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
               ),
               const SizedBox(width: 8),
               Expanded(child: Text(
-                AppLocalizations.of(context).allMailboxes,
+                AppLocalizations.of(context).allFolders,
                 maxLines: 1,
                 softWrap: CommonTextStyle.defaultSoftWrap,
                 overflow: CommonTextStyle.defaultTextOverFlow,
@@ -502,7 +502,7 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
     PresentationMailbox newPresentationMailbox;
     if (presentationMailbox.id == PresentationMailbox.unifiedMailbox.id) {
       newPresentationMailbox = presentationMailbox
-          .toPresentationMailboxWithMailboxPath(AppLocalizations.of(context).allMailboxes);
+          .toPresentationMailboxWithMailboxPath(AppLocalizations.of(context).allFolders);
     } else {
       final path = controller.findNodePath(presentationMailbox.id)
           ?? presentationMailbox.name?.name;
@@ -551,7 +551,7 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
                   width: 18,
                   height: 18,
                   fit: BoxFit.fill),
-                hintText: AppLocalizations.of(context).hint_search_mailboxes,
+                hintText: AppLocalizations.of(context).hintSearchFolders,
                 onClearTextSearchAction: controller.clearSearchText,
                 onTextChangeSearchAction: (query) => controller.searchMailbox(context, query),
                 onSearchTextAction: (query) => controller.searchMailbox(context, query),

lib/features/destination_picker/presentation/model/destination_screen_type.dart

@@ -11,7 +11,7 @@ enum DestinationScreenType {
       case DestinationScreenType.destinationPicker:
         return mailboxActionTitle;
       case DestinationScreenType.createNewMailbox:
-        return AppLocalizations.of(context).createNewMailbox;
+        return AppLocalizations.of(context).createNewFolder;
     }
   }
 }

lib/features/mailbox/domain/model/mailbox_subscribe_action_state.dart

@@ -9,9 +9,9 @@ enum MailboxSubscribeAction {
   String getToastMessageSuccess(BuildContext context) {
     switch(this) {
       case MailboxSubscribeAction.subscribe:
-        return AppLocalizations.of(context).toastMessageShowMailboxSuccess;
+        return AppLocalizations.of(context).toastMessageShowFolderSuccess;
       case MailboxSubscribeAction.unSubscribe:
-        return AppLocalizations.of(context).toastMsgHideMailboxSuccess;
+        return AppLocalizations.of(context).toastMsgHideFolderSuccess;
       case MailboxSubscribeAction.undo:
         return '';
     }

lib/features/mailbox/presentation/mailbox_controller.dart

@@ -539,9 +539,9 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
   void _createNewMailboxFailure(CreateNewMailboxFailure failure) {
     if (currentOverlayContext != null && currentContext != null) {
       final exception = failure.exception;
-      var messageError = AppLocalizations.of(currentContext!).create_new_mailbox_failure;
+      var messageError = AppLocalizations.of(currentContext!).createNewFolderFailure;
       if (exception is ErrorMethodResponse) {
-        messageError = exception.description ?? AppLocalizations.of(currentContext!).create_new_mailbox_failure;
+        messageError = exception.description ?? AppLocalizations.of(currentContext!).createNewFolderFailure;
       }
       _appToast.showToastErrorMessage(currentOverlayContext!, messageError);
     }
@@ -683,7 +683,7 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
     if (currentOverlayContext != null && currentContext != null) {
       _appToast.showToastSuccessMessage(
         currentOverlayContext!,
-        AppLocalizations.of(currentContext!).delete_mailboxes_successfully);
+        AppLocalizations.of(currentContext!).deleteFoldersSuccessfully);
     }
 
     if (listMailboxIdDeleted.contains(selectedMailbox?.id)) {
@@ -701,7 +701,7 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
         _responsiveUtils.isPortraitMobile(context)) {
       (ConfirmationDialogActionSheetBuilder(context)
         ..messageText(AppLocalizations.of(context)
-            .messageConfirmationDialogDeleteMultipleMailbox(selectedMailboxList.length))
+            .messageConfirmationDialogDeleteMultipleFolder(selectedMailboxList.length))
         ..onCancelAction(AppLocalizations.of(context).cancel, () =>
             popBack())
         ..onConfirmAction(AppLocalizations.of(context).delete, () =>
@@ -713,9 +713,9 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
           barrierColor: AppColor.colorDefaultCupertinoActionSheet,
           builder: (BuildContext context) => PointerInterceptor(child: (ConfirmDialogBuilder(_imagePaths)
             ..key(const Key('confirm_dialog_delete_multiple_mailbox'))
-            ..title(AppLocalizations.of(context).delete_mailboxes)
+            ..title(AppLocalizations.of(context).deleteFolders)
             ..content(AppLocalizations.of(context)
-                .messageConfirmationDialogDeleteMultipleMailbox(selectedMailboxList.length))
+                .messageConfirmationDialogDeleteMultipleFolder(selectedMailboxList.length))
             ..addIcon(SvgPicture.asset(_imagePaths.icRemoveDialog,
                 fit: BoxFit.fill))
             ..colorConfirmButton(AppColor.colorConfirmActionDialog)
@@ -767,7 +767,7 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
     if (currentOverlayContext != null && currentContext != null) {
       _appToast.showToastErrorMessage(
         currentOverlayContext!,
-        AppLocalizations.of(currentContext!).delete_mailboxes_failure,
+        AppLocalizations.of(currentContext!).deleteFoldersFailure,
         leadingSVGIcon: _imagePaths.icDeleteToast
       );
     }
@@ -813,8 +813,8 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
         && currentContext != null) {
       _appToast.showToastMessage(
           currentOverlayContext!,
-          AppLocalizations.of(currentContext!).moved_to_mailbox(
-              success.destinationMailboxDisplayName ?? AppLocalizations.of(currentContext!).allMailboxes),
+          AppLocalizations.of(currentContext!).movedToFolder(
+              success.destinationMailboxDisplayName ?? AppLocalizations.of(currentContext!).allFolders),
           actionName: AppLocalizations.of(currentContext!).undo,
           onActionClick: () {
             _undoMovingMailbox(MoveMailboxRequest(
@@ -1126,7 +1126,7 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
     if (currentOverlayContext != null && currentContext != null) {
       _appToast.showToastMessage(
         currentOverlayContext!,
-        AppLocalizations.of(currentContext!).toastMsgHideMailboxSuccess,
+        AppLocalizations.of(currentContext!).toastMsgHideFolderSuccess,
         actionName: AppLocalizations.of(currentContext!).undo,
         onActionClick: () => _undoUnsubscribeMailboxAction(
           mailboxIdSubscribed,

lib/features/mailbox/presentation/mailbox_view.dart

@@ -219,7 +219,7 @@ class MailboxView extends BaseMailboxView {
             children: [
               Expanded(
                 child: Text(
-                  AppLocalizations.of(context).mailBoxes,
+                  AppLocalizations.of(context).folders,
                   style: const TextStyle(
                     fontSize: 20,
                     color: Colors.black,
@@ -236,7 +236,7 @@ class MailboxView extends BaseMailboxView {
                     colorFilter: AppColor.colorTextButton.asFilter(),
                     fit: BoxFit.fill
                   ),
-                  tooltip: AppLocalizations.of(context).searchForMailboxes,
+                  tooltip: AppLocalizations.of(context).searchForFolders,
                   onTap: () => controller.openSearchViewAction(context)
                 ),
                 buildIconWeb(
@@ -248,7 +248,7 @@ class MailboxView extends BaseMailboxView {
                     imagePaths.icAddNewFolder,
                     colorFilter: AppColor.colorTextButton.asFilter(),
                     fit: BoxFit.fill),
-                  tooltip: AppLocalizations.of(context).new_mailbox,
+                  tooltip: AppLocalizations.of(context).newFolder,
                 onTap: () => controller.goToCreateNewMailboxView(context)),
               ]),
             ]),

lib/features/mailbox/presentation/mailbox_view_web.dart

@@ -170,7 +170,7 @@ class MailboxView extends BaseMailboxView {
                                   imagePaths.icAddNewFolder,
                                   colorFilter: AppColor.colorTextButton.asFilter(),
                                   fit: BoxFit.fill),
-                                tooltip: AppLocalizations.of(context).new_mailbox,
+                                tooltip: AppLocalizations.of(context).newFolder,
                                 onTap: () => controller.goToCreateNewMailboxView(context)),
                           ],
                           )),

lib/features/mailbox/presentation/model/mailbox_actions.dart

@@ -36,7 +36,7 @@ extension MailboxActionsExtension on MailboxActions {
         return AppLocalizations.of(context).moveTo;
       case MailboxActions.select:
       case MailboxActions.selectForRuleAction:
-        return AppLocalizations.of(context).selectMailbox;
+        return AppLocalizations.of(context).selectFolder;
       default:
         return '';
     }
@@ -55,15 +55,15 @@ extension MailboxActionsExtension on MailboxActions {
       case MailboxActions.markAsRead:
         return AppLocalizations.of(context).mark_as_read;
       case MailboxActions.move:
-        return AppLocalizations.of(context).moveMailbox;
+        return AppLocalizations.of(context).moveFolder;
       case MailboxActions.rename:
-        return AppLocalizations.of(context).rename_mailbox;
+        return AppLocalizations.of(context).renameFolder;
       case MailboxActions.delete:
-        return AppLocalizations.of(context).deleteMailbox;
+        return AppLocalizations.of(context).deleteFolder;
       case MailboxActions.disableMailbox:
-        return AppLocalizations.of(context).hideMailBoxes;
+        return AppLocalizations.of(context).hideFolder;
       case MailboxActions.enableMailbox:
-        return AppLocalizations.of(context).showMailbox;
+        return AppLocalizations.of(context).showFolder;
       case MailboxActions.emptyTrash:
         return AppLocalizations.of(context).emptyTrash;
       case MailboxActions.emptySpam:

lib/features/mailbox_creator/presentation/extensions/validator_failure_extension.dart

@@ -12,14 +12,14 @@ extension ValicatorFailureExtension on VerifyNameFailure {
       if (actions == MailboxActions.rename) {
         return AppLocalizations.of(context).this_field_cannot_be_blank;
       }
-      return AppLocalizations.of(context).name_of_mailbox_is_required;
+      return AppLocalizations.of(context).nameOfFolderIsRequired;
     } else if (exception is DuplicatedNameException) {
       if (actions == MailboxActions.rename) {
         return AppLocalizations.of(context).there_is_already_folder_with_the_same_name;
       }
       return AppLocalizations.of(context).this_folder_name_is_already_taken;
     } else if (exception is SpecialCharacterException) {
-      return AppLocalizations.of(context).mailbox_name_cannot_contain_special_characters;
+      return AppLocalizations.of(context).folderNameCannotContainSpecialCharacters;
     } else {
       return '';
     }

lib/features/mailbox_creator/presentation/mailbox_creator_view.dart

@@ -4,8 +4,8 @@ import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:core/presentation/utils/style_utils.dart';
 import 'package:core/presentation/views/text/text_field_builder.dart';
 import 'package:core/utils/app_logger.dart';
-import 'package:core/utils/platform_info.dart';
 import 'package:core/utils/direction_utils.dart';
+import 'package:core/utils/platform_info.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
@@ -91,7 +91,7 @@ class MailboxCreatorView extends GetWidget<MailboxCreatorController> {
   Widget _buildAppBar(BuildContext context) {
     return (AppBarMailboxCreatorBuilder(
       context,
-      title: AppLocalizations.of(context).new_mailbox,
+      title: AppLocalizations.of(context).newFolder,
       isValidated: true)
     ..addOnCancelActionClick(() => controller.closeMailboxCreator(context))
     ..addOnDoneActionClick(() => controller.createNewMailbox(context)))
@@ -114,7 +114,7 @@ class MailboxCreatorView extends GetWidget<MailboxCreatorController> {
           overflow: CommonTextStyle.defaultTextOverFlow),
         focusNode: controller.nameInputFocusNode,
         decoration: (CreateMailboxNameInputDecorationBuilder()
-          ..setHintText(AppLocalizations.of(context).hint_input_create_new_mailbox)
+          ..setHintText(AppLocalizations.of(context).hintInputCreateNewFolder)
           ..setErrorText(controller.getErrorInputNameString(context)))
         .build(),
       ))
@@ -154,7 +154,7 @@ class MailboxCreatorView extends GetWidget<MailboxCreatorController> {
                     fit: BoxFit.fill)),
                 const SizedBox(width: 12),
                 Expanded(child: Obx(() => Text(
-                  controller.selectedMailbox.value?.getDisplayName(context) ?? AppLocalizations.of(context).allMailboxes,
+                  controller.selectedMailbox.value?.getDisplayName(context) ?? AppLocalizations.of(context).allFolders,
                   maxLines: 1,
                   softWrap: CommonTextStyle.defaultSoftWrap,
                   overflow: CommonTextStyle.defaultTextOverFlow,

lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart

@@ -251,7 +251,7 @@ class AdvancedFilterController extends BaseController {
     dateFilterSelectedFormAdvancedSearch.value = searchEmailFilter.emailReceiveTimeType;
     _destinationMailboxSelected = searchEmailFilter.mailbox;
     if (searchEmailFilter.mailbox == null) {
-      mailBoxFilterInputController.text = AppLocalizations.of(context).allMailboxes;
+      mailBoxFilterInputController.text = AppLocalizations.of(context).allFolders;
     } else {
       mailBoxFilterInputController.text = StringConvert.writeNullToEmpty(searchEmailFilter.mailbox?.getDisplayName(context));
     }

lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart

@@ -12,6 +12,7 @@ import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart
 import 'package:jmap_dart_client/jmap/core/capability/mail_capability.dart';
 import 'package:jmap_dart_client/jmap/core/error/set_error.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
@@ -31,20 +32,20 @@ import 'package:tmail_ui_user/features/composer/domain/state/update_email_drafts
 import 'package:tmail_ui_user/features/composer/domain/usecases/save_email_as_drafts_interactor.dart';
 import 'package:tmail_ui_user/features/composer/domain/usecases/send_email_interactor.dart';
 import 'package:tmail_ui_user/features/composer/domain/usecases/update_email_drafts_interactor.dart';
-import 'package:tmail_ui_user/features/composer/presentation/model/compose_action_mode.dart';
-import 'package:tmail_ui_user/features/composer/presentation/model/save_to_draft_arguments.dart';
-import 'package:tmail_ui_user/features/email/domain/model/mark_read_action.dart';
-import 'package:tmail_ui_user/features/email/domain/state/delete_sending_email_state.dart';
-import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_read_state.dart';
-import 'package:tmail_ui_user/features/email/domain/state/store_sending_email_state.dart';
 import 'package:tmail_ui_user/features/composer/presentation/composer_bindings.dart';
 import 'package:tmail_ui_user/features/composer/presentation/extensions/email_action_type_extension.dart';
+import 'package:tmail_ui_user/features/composer/presentation/model/compose_action_mode.dart';
+import 'package:tmail_ui_user/features/composer/presentation/model/save_to_draft_arguments.dart';
 import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.dart';
+import 'package:tmail_ui_user/features/email/domain/model/mark_read_action.dart';
 import 'package:tmail_ui_user/features/email/domain/model/move_action.dart';
 import 'package:tmail_ui_user/features/email/domain/model/move_to_mailbox_request.dart';
 import 'package:tmail_ui_user/features/email/domain/state/delete_email_permanently_state.dart';
 import 'package:tmail_ui_user/features/email/domain/state/delete_multiple_emails_permanently_state.dart';
+import 'package:tmail_ui_user/features/email/domain/state/delete_sending_email_state.dart';
+import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_read_state.dart';
 import 'package:tmail_ui_user/features/email/domain/state/move_to_mailbox_state.dart';
+import 'package:tmail_ui_user/features/email/domain/state/store_sending_email_state.dart';
 import 'package:tmail_ui_user/features/email/domain/usecases/delete_email_permanently_interactor.dart';
 import 'package:tmail_ui_user/features/email/domain/usecases/delete_multiple_emails_permanently_interactor.dart';
 import 'package:tmail_ui_user/features/email/domain/usecases/mark_as_email_read_interactor.dart';
@@ -138,7 +139,6 @@ import 'package:tmail_ui_user/main/routes/navigation_router.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
 import 'package:tmail_ui_user/main/routes/route_utils.dart';
 import 'package:tmail_ui_user/main/utils/email_receive_manager.dart';
-import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:uuid/uuid.dart';
 import 'package:workmanager/workmanager.dart' as work_manager;
 
@@ -2018,7 +2018,7 @@ class MailboxDashBoardController extends ReloadableController {
           } else {
             _appToast.showToastWarningMessage(
               context,
-              AppLocalizations.of(context).noEmailInYourCurrentMailbox
+              AppLocalizations.of(context).noEmailInYourCurrentFolder
             );
           }
         }))
@@ -2045,7 +2045,7 @@ class MailboxDashBoardController extends ReloadableController {
             } else {
               _appToast.showToastWarningMessage(
                 context,
-                AppLocalizations.of(context).noEmailInYourCurrentMailbox
+                AppLocalizations.of(context).noEmailInYourCurrentFolder
               );
             }
           })

lib/features/mailbox_dashboard/presentation/model/search/advanced_search_filter.dart

@@ -25,7 +25,7 @@ enum AdvancedSearchFilterField {
       case AdvancedSearchFilterField.notKeyword:
         return AppLocalizations.of(context).doesNotHave;
       case AdvancedSearchFilterField.mailBox:
-        return AppLocalizations.of(context).mailbox;
+        return AppLocalizations.of(context).folder;
       case AdvancedSearchFilterField.date:
         return AppLocalizations.of(context).date;
       case AdvancedSearchFilterField.hasAttachment:
@@ -44,7 +44,7 @@ enum AdvancedSearchFilterField {
       case AdvancedSearchFilterField.notKeyword:
         return AppLocalizations.of(context).enterSomeSuggestions;
       case AdvancedSearchFilterField.mailBox:
-        return AppLocalizations.of(context).allMailboxes;
+        return AppLocalizations.of(context).allFolders;
       case AdvancedSearchFilterField.date:
         return AppLocalizations.of(context).allTime;
       case AdvancedSearchFilterField.hasAttachment:

lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_controller.dart

@@ -207,7 +207,7 @@ class MailboxVisibilityController extends BaseMailboxController {
     if (currentOverlayContext != null && currentContext != null) {
       _appToast.showToastMessage(
         currentOverlayContext!,
-        AppLocalizations.of(currentContext!).toastMsgHideMailboxSuccess,
+        AppLocalizations.of(currentContext!).toastMsgHideFolderSuccess,
         actionName: AppLocalizations.of(currentContext!).undo,
         onActionClick: () => _subscribeMailboxAction(
           SubscribeMailboxRequest(

lib/features/manage_account/presentation/mailbox_visibility/widgets/mailbox_visibility_header_widget.dart

@@ -17,13 +17,13 @@ class MailboxVisibilityHeaderWidget extends StatelessWidget {
       child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(AppLocalizations.of(context).mailboxVisibility,
+            Text(AppLocalizations.of(context).folderVisibility,
                 style: const TextStyle(
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                     color: Colors.black)),
             const SizedBox(height: 4),
-            Text(AppLocalizations.of(context).mailboxVisibilitySubtitle,
+            Text(AppLocalizations.of(context).folderVisibilitySubtitle,
                 style: const TextStyle(
                     fontSize: 16,
                     fontWeight: FontWeight.w500,

lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart

@@ -106,7 +106,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
           SettingFirstLevelTileBuilder(
             AccountMenuItem.mailboxVisibility.getName(context),
             AccountMenuItem.mailboxVisibility.getIcon(_imagePaths),
-            subtitle: AppLocalizations.of(context).mailboxVisibilitySubtitle,
+            subtitle: AppLocalizations.of(context).folderVisibilitySubtitle,
             () => controller.selectSettings(AccountMenuItem.mailboxVisibility)
           ),
           Divider(

lib/features/manage_account/presentation/model/account_menu_item.dart

@@ -44,7 +44,7 @@ enum AccountMenuItem {
       case AccountMenuItem.vacation:
         return AppLocalizations.of(context).vacation;
       case AccountMenuItem.mailboxVisibility:
-        return AppLocalizations.of(context).mailboxVisibility;
+        return AppLocalizations.of(context).folderVisibility;
       case AccountMenuItem.none:
         return AppLocalizations.of(context).profiles;
     }

lib/features/rules_filter_creator/presentation/rules_filter_creator_view.dart

@@ -197,7 +197,7 @@ class RuleFilterCreatorView extends GetWidget<RulesFilterCreatorController> {
                       Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 12),
                         child: Text(
-                          AppLocalizations.of(context).toMailbox,
+                          AppLocalizations.of(context).toFolder,
                           overflow: CommonTextStyle.defaultTextOverFlow,
                           softWrap: CommonTextStyle.defaultSoftWrap,
                           maxLines: 1,
@@ -349,7 +349,7 @@ class RuleFilterCreatorView extends GetWidget<RulesFilterCreatorController> {
                               alignment: Alignment.centerLeft,
                               padding: const EdgeInsets.symmetric(horizontal: 12),
                               child: Text(
-                                  AppLocalizations.of(context).toMailbox,
+                                  AppLocalizations.of(context).toFolder,
                                   overflow: CommonTextStyle.defaultTextOverFlow,
                                   softWrap: CommonTextStyle.defaultSoftWrap,
                                   maxLines: 1,
@@ -519,7 +519,7 @@ class RuleFilterCreatorView extends GetWidget<RulesFilterCreatorController> {
                               alignment: Alignment.centerLeft,
                               padding: const EdgeInsets.symmetric(vertical: 12),
                               child: Text(
-                                  AppLocalizations.of(context).toMailbox,
+                                  AppLocalizations.of(context).toFolder,
                                   overflow: CommonTextStyle.defaultTextOverFlow,
                                   softWrap: CommonTextStyle.defaultSoftWrap,
                                   maxLines: 1,

lib/features/search/email/presentation/search_email_view.dart

@@ -5,8 +5,8 @@ import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:core/presentation/utils/style_utils.dart';
 import 'package:core/presentation/views/button/icon_button_web.dart';
 import 'package:core/presentation/views/text/text_field_builder.dart';
-import 'package:core/utils/platform_info.dart';
 import 'package:core/utils/direction_utils.dart';
+import 'package:core/utils/platform_info.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
@@ -27,10 +27,10 @@ import 'package:tmail_ui_user/features/search/email/presentation/widgets/email_r
 import 'package:tmail_ui_user/features/search/email/presentation/widgets/email_receive_time_cupertino_action_sheet_action_builder.dart';
 import 'package:tmail_ui_user/features/thread/domain/state/search_email_state.dart';
 import 'package:tmail_ui_user/features/thread/domain/state/search_more_email_state.dart';
-import 'package:tmail_ui_user/features/thread/presentation/widgets/empty_emails_widget.dart';
-import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 import 'package:tmail_ui_user/features/thread/presentation/widgets/email_tile_builder.dart'
   if (dart.library.html) 'package:tmail_ui_user/features/thread/presentation/widgets/email_tile_web_builder.dart';
+import 'package:tmail_ui_user/features/thread/presentation/widgets/empty_emails_widget.dart';
+import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 
 class SearchEmailView extends GetWidget<SearchEmailController>
     with AppLoaderMixin {
@@ -539,7 +539,7 @@ class SearchEmailView extends GetWidget<SearchEmailController>
                 Text(
                   filterSelected
                     ? controller.simpleSearchFilter.value.getMailboxName(context)
-                    : AppLocalizations.of(context).mailbox,
+                    : AppLocalizations.of(context).folder,
                   maxLines: 1,
                   overflow: CommonTextStyle.defaultTextOverFlow,
                   softWrap: CommonTextStyle.defaultSoftWrap,

lib/features/search/mailbox/presentation/search_mailbox_controller.dart

@@ -8,6 +8,7 @@ import 'package:core/presentation/utils/keyboard_utils.dart';
 import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/platform_info.dart';
+import 'package:debounce_throttle/debounce_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
@@ -15,12 +16,12 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/error/method/error_method_response.dart';
 import 'package:jmap_dart_client/jmap/core/id.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:model/email/presentation_email.dart';
 import 'package:model/extensions/presentation_email_extension.dart';
 import 'package:model/mailbox/presentation_mailbox.dart';
 import 'package:tmail_ui_user/features/base/base_mailbox_controller.dart';
-import 'package:debounce_throttle/debounce_throttle.dart';
 import 'package:tmail_ui_user/features/base/mixin/mailbox_action_handler_mixin.dart';
 import 'package:tmail_ui_user/features/email/domain/model/move_action.dart';
 import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart';
@@ -66,7 +67,6 @@ import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 import 'package:tmail_ui_user/main/routes/app_routes.dart';
 import 'package:tmail_ui_user/main/routes/dialog_router.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
-import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:uuid/uuid.dart';
 
 class SearchMailboxController extends BaseMailboxController with MailboxActionHandlerMixin {
@@ -378,7 +378,7 @@ class SearchMailboxController extends BaseMailboxController with MailboxActionHa
     if (success.moveAction == MoveAction.moving && currentOverlayContext != null && currentContext != null) {
       _appToast.showToastMessage(
         currentOverlayContext!,
-        AppLocalizations.of(currentContext!).moved_to_mailbox(success.destinationMailboxDisplayName ?? AppLocalizations.of(currentContext!).allMailboxes),
+        AppLocalizations.of(currentContext!).movedToFolder(success.destinationMailboxDisplayName ?? AppLocalizations.of(currentContext!).allFolders),
         actionName: AppLocalizations.of(currentContext!).undo,
         onActionClick: () {
           _undoMovingMailbox(MoveMailboxRequest(
@@ -437,7 +437,7 @@ class SearchMailboxController extends BaseMailboxController with MailboxActionHa
     if (currentOverlayContext != null && currentContext != null) {
       _appToast.showToastSuccessMessage(
         currentOverlayContext!,
-        AppLocalizations.of(currentContext!).delete_mailboxes_successfully);
+        AppLocalizations.of(currentContext!).deleteFoldersSuccessfully);
     }
 
     if (listMailboxIdDeleted.contains(dashboardController.selectedMailbox.value?.id)) {
@@ -452,7 +452,7 @@ class SearchMailboxController extends BaseMailboxController with MailboxActionHa
     if (currentOverlayContext != null && currentContext != null) {
       _appToast.showToastErrorMessage(
         currentOverlayContext!,
-        AppLocalizations.of(currentContext!).delete_mailboxes_failure);
+        AppLocalizations.of(currentContext!).deleteFoldersFailure);
     }
   }
 
@@ -688,9 +688,9 @@ class SearchMailboxController extends BaseMailboxController with MailboxActionHa
   void _createNewMailboxFailure(CreateNewMailboxFailure failure) {
     if (currentOverlayContext != null && currentContext != null) {
       final exception = failure.exception;
-      var messageError = AppLocalizations.of(currentContext!).create_new_mailbox_failure;
+      var messageError = AppLocalizations.of(currentContext!).createNewFolderFailure;
       if (exception is ErrorMethodResponse) {
-        messageError = exception.description ?? AppLocalizations.of(currentContext!).create_new_mailbox_failure;
+        messageError = exception.description ?? AppLocalizations.of(currentContext!).createNewFolderFailure;
       }
       _appToast.showToastErrorMessage(currentOverlayContext!, messageError);
     }

lib/features/search/mailbox/presentation/search_mailbox_view.dart

@@ -2,8 +2,8 @@
 import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/views/button/icon_button_web.dart';
 import 'package:core/presentation/views/text/text_field_builder.dart';
-import 'package:core/utils/platform_info.dart';
 import 'package:core/utils/direction_utils.dart';
+import 'package:core/utils/platform_info.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:focused_menu_custom/modals.dart';
@@ -154,7 +154,7 @@ class SearchMailboxView extends GetWidget<SearchMailboxController>
       onTextSubmitted: (text) => controller.onTextSearchSubmitted(context, text),
       decoration: InputDecoration(
         contentPadding: EdgeInsets.zero,
-        hintText: AppLocalizations.of(context).searchForMailboxes,
+        hintText: AppLocalizations.of(context).searchForFolders,
         hintStyle: const TextStyle(
           color: AppColor.loginTextFieldHintColor,
           fontSize: 15,

lib/features/sending_queue/presentation/widgets/app_bar_sending_queue_widget.dart

@@ -42,7 +42,7 @@ class AppBarSendingQueueWidget extends StatelessWidget {
                 icon: _imagePaths.icMenuMailbox,
                 backgroundColor: Colors.transparent,
                 iconColor: AppBarSendingQueueWidgetStyle.iconColor,
-                tooltipMessage: AppLocalizations.of(context).openMailboxMenu,
+                tooltipMessage: AppLocalizations.of(context).openFolderMenu,
                 onTapActionCallback: onOpenMailboxMenu
               )
             else

lib/features/thread/presentation/widgets/app_bar/default_web_app_bar_thread_widget.dart

@@ -44,7 +44,7 @@ class DefaultWebAppBarThreadWidget extends StatelessWidget {
               backgroundColor: Colors.transparent,
               padding: DefaultWebAppBarThreadWidgetStyle.mailboxMenuPadding,
               maxWidth: DefaultWebAppBarThreadWidgetStyle.buttonMaxWidth,
-              tooltipMessage: AppLocalizations.of(context).openMailboxMenu,
+              tooltipMessage: AppLocalizations.of(context).openFolderMenu,
               onTapActionCallback: openMailboxAction,
             ),
             Expanded(

lib/l10n/intl_ar.arb

@@ -149,18 +149,6 @@
       "maxSize": {}
     }
   },
-  "delete_multiple_messages_dialog": "أنت على وشك حذف {count} عناصر بشكل دائم في صندوق البريد {mailboxName}. هل ترغب في المتابعة؟",
-  "@delete_multiple_messages_dialog": {
-    "type": "text",
-    "placeholders_order": [
-      "count",
-      "mailboxName"
-    ],
-    "placeholders": {
-      "count": {},
-      "mailboxName": {}
-    }
-  },
   "message_dialog_upload_attachments_exceeds_maximum_size": "لقد وصلت إلى الحد الأقصى لحجم الملف. يُرجى تحميل ملفات بإجمالي حجم أقل من {maxSize}",
   "@message_dialog_upload_attachments_exceeds_maximum_size": {
     "type": "text",
@@ -201,18 +189,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toastMessageMarkAsMailboxReadHasSomeEmailFailure": "لقد وضعت علامة على {count} الرسائل في \"{mailboxName}\" كمقروءة",
-  "@toastMessageMarkAsMailboxReadHasSomeEmailFailure": {
-    "type": "text",
-    "placeholders_order": [
-      "mailboxName",
-      "count"
-    ],
-    "placeholders": {
-      "mailboxName": {},
-      "count": {}
-    }
-  },
   "lastYears": "السنوات الاخيرة",
   "@lastYears": {
     "type": "text",
@@ -225,12 +201,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "deleteMailbox": "حذف صندوق البريد",
-  "@deleteMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "html": "Html",
   "@html": {
     "type": "text",
@@ -381,12 +351,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toMailbox": "إلى صندوق البريد:",
-  "@toMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "toastMessageAddRecipientsSuccessfully": "تمت إضافة رسائل البريد الإلكتروني من قائمة المستلمين.",
   "@toastMessageAddRecipientsSuccessfully": {
     "type": "text",
@@ -859,40 +823,12 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "message_confirmation_dialog_delete_mailbox": "سيتم حذف صندوق البريد \"{nameMailbox}\" وجميع المجلدات الفرعية والرسائل التي يحتويها، ولن يكون بإمكانك استعادتها. هل ترغب في المتابعة وحذفه؟",
-  "@message_confirmation_dialog_delete_mailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "nameMailbox"
-    ],
-    "placeholders": {
-      "nameMailbox": {}
-    }
-  },
-  "rename_mailbox": "إعادة تسمية صندوق البريد",
-  "@rename_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "this_field_cannot_be_blank": "هذا الحقل لا يمكن أن يكون فارغًا",
   "@this_field_cannot_be_blank": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "delete_mailboxes_failure": "فشل حذف صناديق البريد",
-  "@delete_mailboxes_failure": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "delete_mailboxes": "حذف صناديق البريد",
-  "@delete_mailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "new_message": "رسالة جديدة",
   "@new_message": {
     "type": "text",
@@ -1121,12 +1057,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "selectMailbox": "حدد صندوق البريد",
-  "@selectMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "messageDuplicateTagFilterMail": "لقد أدخلت ذلك بالفعل",
   "@messageDuplicateTagFilterMail": {
     "type": "text",
@@ -1421,16 +1351,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "moved_to_mailbox": "تم نقلها إلى {destinationMailboxPath}",
-  "@moved_to_mailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "destinationMailboxPath"
-    ],
-    "placeholders": {
-      "destinationMailboxPath": {}
-    }
-  },
   "undo": "تراجع",
   "@undo": {
     "type": "text",
@@ -1523,12 +1443,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hint_search_mailboxes": "البحث في صناديق البريد",
-  "@hint_search_mailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "starred": "المفضلة",
   "@starred": {
     "type": "text",
@@ -1569,46 +1483,12 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "new_mailbox": "صندوق بريد جديد",
-  "@new_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "name_of_mailbox_is_required": "اسم صندوق البريد مطلوب",
-  "@name_of_mailbox_is_required": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailbox_name_cannot_contain_special_characters": "اسم صندوق البريد لا يمكن أن يحتوي على أحرف خاصة",
-  "@mailbox_name_cannot_contain_special_characters": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "this_folder_name_is_already_taken": "اسم هذا المجلد مستخدم بالفعل",
   "@this_folder_name_is_already_taken": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "new_mailbox_is_created": "تم إنشاء صندوق البريد {nameMailbox}",
-  "@new_mailbox_is_created": {
-    "type": "text",
-    "placeholders_order": [
-      "nameMailbox"
-    ],
-    "placeholders": {
-      "nameMailbox": {}
-    }
-  },
-  "create_new_mailbox_failure": "فشل إنشاء صندوق البريد الجديد",
-  "@create_new_mailbox_failure": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "drafts_saved": "تم حفظ المسودة",
   "@drafts_saved": {
     "type": "text",
@@ -1627,24 +1507,12 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hint_input_create_new_mailbox": "يرجى إدخال اسم صندوق البريد",
-  "@hint_input_create_new_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "rename": "إعادة تسمية",
   "@rename": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "delete_mailboxes_successfully": "تم حذف صناديق البريد بنجاح",
-  "@delete_mailboxes_successfully": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "there_is_already_folder_with_the_same_name": "يوجد بالفعل مجلد بنفس الاسم",
   "@there_is_already_folder_with_the_same_name": {
     "type": "text",
@@ -1991,28 +1859,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "moveMailbox": "نقل صندوق البريد",
-  "@moveMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "toastMessageMarkAsMailboxReadSuccess": "لقد وضعت علامة على جميع الرسائل في \"{mailboxName}\" كمقروءة",
-  "@toastMessageMarkAsMailboxReadSuccess": {
-    "type": "text",
-    "placeholders_order": [
-      "mailboxName"
-    ],
-    "placeholders": {
-      "mailboxName": {}
-    }
-  },
-  "allMailboxes": "كل علب البريد",
-  "@allMailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "singleSignOn": "علامة واحدة على",
   "@singleSignOn": {
     "type": "text",
@@ -2055,12 +1901,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailbox": "صندوق بريد",
-  "@mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "languageAndRegion": "اللغة و المنطقة",
   "@languageAndRegion": {
     "type": "text",
@@ -2291,12 +2131,6 @@
       "time": {}
     }
   },
-  "toastMessageErrorNotSelectedFolderWhenCreateNewMailbox": "لم تحدد مجلد حفظ لحفظه",
-  "@toastMessageErrorNotSelectedFolderWhenCreateNewMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "moveConversation": "انقل محادثة {numberOfConversation}",
   "@moveConversation": {
     "type": "text",
@@ -2457,18 +2291,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toastMsgHideMailboxSuccess": "تم إخفاء صندوق البريد هذا من صندوق البريد الأساسي الخاص بك",
-  "@toastMsgHideMailboxSuccess": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "searchForMailboxes": "ابحث عن علب البريد",
-  "@searchForMailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "textQuotasOutOfStorage": "نفاد التخزين",
   "@textQuotasOutOfStorage": {
     "type": "text",
@@ -2481,24 +2303,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hideMailBoxes": "إخفاء صندوق البريد",
-  "@hideMailBoxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "showMailbox": "إظهار علبة البريد",
-  "@showMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "toastMessageShowMailboxSuccess": "صندوق البريد هذا معروض بالفعل في صندوق البريد الأساسي الخاص بك",
-  "@toastMessageShowMailboxSuccess": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "no": "لا",
   "@no": {
     "type": "text",
@@ -2565,12 +2369,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailboxVisibility": "رؤية صندوق البريد",
-  "@mailboxVisibility": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "textQuotasRunningOutOfStorageContent": "قريبًا لن تتمكن من إرسال بريد إلكتروني في Team Mail. الرجاء تنظيف مساحة التخزين الخاصة بك أو ترقية مساحة التخزين لديك للحصول على الميزات الكاملة في بريد الفريق.",
   "@textQuotasRunningOutOfStorageContent": {
     "type": "text",
@@ -2601,30 +2399,12 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "noEmailInYourCurrentMailbox": "معذرةً ، لا توجد رسائل بريد إلكتروني في صندوق بريدك الحالي",
-  "@noEmailInYourCurrentMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailBoxes": "علب البريد",
-  "@mailBoxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "thisImageCannotBeAdded": "لا يمكن إضافة هذه الصورة.",
   "@thisImageCannotBeAdded": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailboxVisibilitySubtitle": "إظهار / إخفاء علب البريد الخاصة بك ، بما في ذلك علب البريد الشخصية والفريق.",
-  "@mailboxVisibilitySubtitle": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "emptyListEmailForward": "الرجاء إدخال مستلم واحد على الأقل",
   "@emptyListEmailForward": {
     "type": "text",
@@ -2683,22 +2463,6 @@
       "subject": {}
     }
   },
-  "createNewMailbox": "إنشاء صندوق بريد جديد",
-  "@createNewMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "messageConfirmationDialogDeleteMultipleMailbox": "سيتم حذف صندوق بريد {numberOfMailbox} وجميع المجلدات الفرعية والرسائل التي يحتوي عليها ولن تتمكن من استعادتها. هل تريد الاستمرار في الحذف؟",
-  "@messageConfirmationDialogDeleteMultipleMailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "numberOfMailbox"
-    ],
-    "placeholders": {
-      "numberOfMailbox": {}
-    }
-  },
   "page404": "صفحة 404",
   "@page404": {
     "type": "text",

lib/l10n/intl_de.arb

@@ -109,16 +109,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "moved_to_mailbox": "Verschoben nach {destinationMailboxPath}",
-  "@moved_to_mailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "destinationMailboxPath"
-    ],
-    "placeholders": {
-      "destinationMailboxPath": {}
-    }
-  },
   "login_text_login_to_continue": "Bitte melden Sie sich an, um fortzufahren",
   "@login_text_login_to_continue": {
     "type": "text",
@@ -273,12 +263,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "move_to_mailbox": "Ins Postfach verschieben",
-  "@move_to_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "move_to_spam": "In Spam verschieben",
   "@move_to_spam": {
     "type": "text",

lib/l10n/intl_eo.arb

@@ -315,42 +315,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "new_mailbox": "Nova retpoŝtkesto",
-  "@new_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailbox_location": "Loko de retpoŝtkesto",
-  "@mailbox_location": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "default_mailbox": "Implicita retpoŝtkesto",
-  "@default_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "drafts_saved": "Malneto konserviĝis",
-  "@drafts_saved": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "delete_mailboxes": "Forigi retpoŝtkestojn",
-  "@delete_mailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "rename_mailbox": "Ŝanĝi nomon de retpoŝtkesto",
-  "@rename_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "compose_email": "Verki retmesaĝon",
   "@compose_email": {
     "type": "text",
@@ -489,18 +453,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "moveMailbox": "Movi retpoŝtkeston",
-  "@moveMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "deleteMailbox": "Forigi retpoŝtkeston",
-  "@deleteMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "send_anyway": "Sendi malgraŭ tio",
   "@send_anyway": {
     "type": "text",
@@ -627,12 +579,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "allMailboxes": "Ĉiuj retpoŝtkestoj",
-  "@allMailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "delete_message_forever": "Forviŝi mesaĝon nemalfareble",
   "@delete_message_forever": {
     "type": "text",
@@ -663,12 +609,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hint_input_create_new_mailbox": "Tajpu nomon de retpoŝtkesto",
-  "@hint_input_create_new_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "marked_as_not_spam": "Markita kiel ne trudmesaĝon",
   "@marked_as_not_spam": {
     "type": "text",

lib/l10n/intl_fr.arb

@@ -226,12 +226,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "move_to_mailbox": "Déplacer vers la boîte aux lettres",
-  "@move_to_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "mark_as_star": "Important",
   "@mark_as_star": {
     "type": "text",
@@ -356,16 +350,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "moved_to_mailbox": "Déplacé vers {destinationMailboxPath}",
-  "@moved_to_mailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "destinationMailboxPath"
-    ],
-    "placeholders": {
-      "destinationMailboxPath": {}
-    }
-  },
   "undo_action": "ANNULER",
   "@undo_action": {
     "type": "text",
@@ -510,12 +494,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hint_search_mailboxes": "Chercher dans les boîtes de réception",
-  "@hint_search_mailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "with_attachments": "Avec pièces jointes",
   "@with_attachments": {
     "type": "text",
@@ -540,36 +518,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "new_mailbox": "Nouvelle boîte de réception",
-  "@new_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailbox_location": "Emplacement de la boîte de réception",
-  "@mailbox_location": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "default_mailbox": "Boîte de réception par défaut",
-  "@default_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "name_of_mailbox_is_required": "Le nom de la boîte de réception est requis",
-  "@name_of_mailbox_is_required": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailbox_name_cannot_contain_special_characters": "Le nom de la boîte de réception ne peut pas comporter de caractères spéciaux",
-  "@mailbox_name_cannot_contain_special_characters": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "this_folder_name_is_already_taken": "Ce nom de dossier est déjà pris",
   "@this_folder_name_is_already_taken": {
     "type": "text",
@@ -610,16 +558,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "new_mailbox_is_created": "{nameMailbox} est créé",
-  "@new_mailbox_is_created": {
-    "type": "text",
-    "placeholders_order": [
-      "nameMailbox"
-    ],
-    "placeholders": {
-      "nameMailbox": {}
-    }
-  },
   "drafts_saved": "Brouillon enregistré",
   "@drafts_saved": {
     "type": "text",
@@ -632,24 +570,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hint_input_create_new_mailbox": "Entrez le nom de la boîte de réception",
-  "@hint_input_create_new_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "delete_mailboxes": "Supprimer des boîtes de réception",
-  "@delete_mailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "rename_mailbox": "Renommer la boîte de réception",
-  "@rename_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "this_field_cannot_be_blank": "Ce champ ne peut pas être vide",
   "@this_field_cannot_be_blank": {
     "type": "text",
@@ -872,12 +792,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "create_new_mailbox_failure": "Échec de création de boîte de réception",
-  "@create_new_mailbox_failure": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "message_has_been_sent_failure": "Impossible d'envoyer le message",
   "@message_has_been_sent_failure": {
     "type": "text",
@@ -950,22 +864,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "delete_mailboxes_successfully": "Les boîtes de messagerie ont bien été supprimées",
-  "@delete_mailboxes_successfully": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "message_confirmation_dialog_delete_mailbox": "La boîte de messagerie « {nameMailbox}  », et tous les sous-dossiers et les messages qu'elle contient seront supprimés et ne seront plus récupérables. Voulez-vous continuer la suppression ?",
-  "@message_confirmation_dialog_delete_mailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "nameMailbox"
-    ],
-    "placeholders": {
-      "nameMailbox": {}
-    }
-  },
   "there_is_already_folder_with_the_same_name": "Il y a déjà un dossier avec le même nom",
   "@there_is_already_folder_with_the_same_name": {
     "type": "text",
@@ -1000,12 +898,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "delete_mailboxes_failure": "Impossible de supprimer les boîtes de messagerie",
-  "@delete_mailboxes_failure": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "not_starred": "Non favori",
   "@not_starred": {
     "type": "text",
@@ -1258,28 +1150,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "moveMailbox": "Déplacer la boîte aux lettres",
-  "@moveMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "deleteMailbox": "Supprimer la boîte aux lettres",
-  "@deleteMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "toastMessageMarkAsMailboxReadSuccess": "Vous avez marqué tous les messages dans \"{mailboxName}\" comme lus",
-  "@toastMessageMarkAsMailboxReadSuccess": {
-    "type": "text",
-    "placeholders_order": [
-      "mailboxName"
-    ],
-    "placeholders": {
-      "mailboxName": {}
-    }
-  },
   "ssoNotAvailable": "L'authentification unique (SSO) n'est pas disponible",
   "@ssoNotAvailable": {
     "type": "text",
@@ -1328,12 +1198,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailbox": "Boites aux lettres",
-  "@mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "nameOrEmailAddress": "Nom ou adresse e-mail",
   "@nameOrEmailAddress": {
     "type": "text",
@@ -1370,12 +1234,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "selectMailbox": "Sélectionnez la boîte aux lettres",
-  "@selectMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "messageDuplicateTagFilterMail": "vous avez déjà entré cela",
   "@messageDuplicateTagFilterMail": {
     "type": "text",
@@ -1448,18 +1306,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toastMessageMarkAsMailboxReadHasSomeEmailFailure": "Vous avez marqué {count} messages dans \"{mailboxName}\" comme lus",
-  "@toastMessageMarkAsMailboxReadHasSomeEmailFailure": {
-    "type": "text",
-    "placeholders_order": [
-      "mailboxName",
-      "count"
-    ],
-    "placeholders": {
-      "mailboxName": {},
-      "count": {}
-    }
-  },
   "subject": "Sujet",
   "@subject": {
     "type": "text",
@@ -1616,12 +1462,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "allMailboxes": "Toutes les boîtes aux lettres",
-  "@allMailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "saveAndClose": "Enregistrer et fermer",
   "@saveAndClose": {
     "type": "text",
@@ -2034,30 +1874,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailBoxes": "Boîtes aux lettres",
-  "@mailBoxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "searchForMailboxes": "Rechercher des boîtes aux lettres",
-  "@searchForMailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "showMailbox": "Afficher la boîte aux lettres",
-  "@showMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "toastMessageShowMailboxSuccess": "Cette boîte aux lettres est déjà affichée dans votre boîte aux lettres principale",
-  "@toastMessageShowMailboxSuccess": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "actionTitleRulesFilter": "Effectuez l'action suivante :",
   "@actionTitleRulesFilter": {
     "type": "text",
@@ -2230,22 +2046,6 @@
       "subject": {}
     }
   },
-  "messageConfirmationDialogDeleteMultipleMailbox": "La boîte aux lettres {numberOfMailbox} et tous les sous-dossiers et messages qu'elle contient seront supprimés et ne pourront pas être récupérés. Voulez-vous continuer la suppression ?",
-  "@messageConfirmationDialogDeleteMultipleMailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "numberOfMailbox"
-    ],
-    "placeholders": {
-      "numberOfMailbox": {}
-    }
-  },
-  "toastMessageErrorNotSelectedFolderWhenCreateNewMailbox": "Vous n'avez pas sélectionné de dossier parent pour enregistrer pour enregistrer cette boîte aux lettres",
-  "@toastMessageErrorNotSelectedFolderWhenCreateNewMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "addRecipientButton": "Ajouter un destinataire",
   "@addRecipientButton": {
     "type": "text",
@@ -2526,12 +2326,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "noEmailInYourCurrentMailbox": "Nous sommes désolés, il n'y a pas d'e-mails dans votre boîte aux lettres actuelle",
-  "@noEmailInYourCurrentMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "reduceSomeFiltersAndTryAgain": "Retirez quelques filtres et réessayez",
   "@reduceSomeFiltersAndTryAgain": {
     "type": "text",
@@ -2574,48 +2368,12 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hideMailBoxes": "Masquer la boîte aux lettres",
-  "@hideMailBoxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "toastMsgHideMailboxSuccess": "Cette boîte aux lettres a été masquée",
-  "@toastMsgHideMailboxSuccess": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "teamMailBoxes": "Boîtes aux lettres d'équipe",
-  "@teamMailBoxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailboxVisibilitySubtitle": "Afficher/masquer vos boîtes aux lettres, y compris vos boîtes aux lettres personnelles et d'équipe.",
-  "@mailboxVisibilitySubtitle": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailboxVisibility": "Visibilité des boîtes aux lettres",
-  "@mailboxVisibility": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "notExactlyEquals": "Pas exactement égal",
   "@notExactlyEquals": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toMailbox": "Vers la boîte aux lettres :",
-  "@toMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "vacation": "Vacances",
   "@vacation": {
     "type": "text",
@@ -2868,12 +2626,6 @@
       "numberOfConversation": {}
     }
   },
-  "createNewMailbox": "Créer une nouvelle boîte aux lettres",
-  "@createNewMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "languageArabic": "Arabe",
   "@languageArabic": {
     "type": "text",

lib/l10n/intl_it.arb

@@ -119,12 +119,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "move_to_mailbox": "Sposta nella casella di posta",
-  "@move_to_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "mark_as_star": "Preferito",
   "@mark_as_star": {
     "type": "text",
@@ -181,16 +175,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "moved_to_mailbox": "Spostato in {destinationMailboxPath}",
-  "@moved_to_mailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "destinationMailboxPath"
-    ],
-    "placeholders": {
-      "destinationMailboxPath": {}
-    }
-  },
   "undo_action": "DISFARE",
   "@undo_action": {
     "type": "text",
@@ -509,12 +493,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hint_search_mailboxes": "Cerca nelle caselle di posta",
-  "@hint_search_mailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "with_attachments": "Con allegati",
   "@with_attachments": {
     "type": "text",
@@ -573,58 +551,12 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "new_mailbox": "Nuova casella di posta",
-  "@new_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailbox_location": "Posizione della casella di posta",
-  "@mailbox_location": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "default_mailbox": "Casella di posta predefinita",
-  "@default_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "name_of_mailbox_is_required": "Il nome della casella di posta è obbligatorio",
-  "@name_of_mailbox_is_required": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailbox_name_cannot_contain_special_characters": "Il nome della casella do posta non può contenere caratteri speciali",
-  "@mailbox_name_cannot_contain_special_characters": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "this_folder_name_is_already_taken": "Questo nome di cartella è già usato",
   "@this_folder_name_is_already_taken": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "new_mailbox_is_created": "{nameMailbox} è stato creato",
-  "@new_mailbox_is_created": {
-    "type": "text",
-    "placeholders_order": [
-      "nameMailbox"
-    ],
-    "placeholders": {
-      "nameMailbox": {}
-    }
-  },
-  "create_new_mailbox_failure": "Impossibile creare una nuova casella di posta",
-  "@create_new_mailbox_failure": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "drafts_saved": "Bozza salvata",
   "@drafts_saved": {
     "type": "text",
@@ -637,52 +569,12 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hint_input_create_new_mailbox": "Scegli il nome della casella di posta",
-  "@hint_input_create_new_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "rename": "Rinomina",
   "@rename": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "delete_mailboxes_successfully": "Le caselle di posta eliminate con successo",
-  "@delete_mailboxes_successfully": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "delete_mailboxes_failure": "Impossibile eliminare le caselle di posta",
-  "@delete_mailboxes_failure": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "delete_mailboxes": "Elimina le caselle di posta",
-  "@delete_mailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "message_confirmation_dialog_delete_mailbox": "La casella di posta «{nameMailbox}» e tutte le sottocartelle e i messaggi contenuti verranno eliminati e non sarà possibile ripristinarli. Vuoi continuare a eliminare?",
-  "@message_confirmation_dialog_delete_mailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "nameMailbox"
-    ],
-    "placeholders": {
-      "nameMailbox": {}
-    }
-  },
-  "rename_mailbox": "Rinomina la casella di posta",
-  "@rename_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "this_field_cannot_be_blank": "Questo campo non può essere vuoto",
   "@this_field_cannot_be_blank": {
     "type": "text",
@@ -1239,12 +1131,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "moveMailbox": "Sposta la casella di posta",
-  "@moveMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "loginInputCredentialMessage": "Inserisci le tue credenziali per accedere",
   "@loginInputCredentialMessage": {
     "type": "text",
@@ -1431,46 +1317,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "deleteMailbox": "Elimina la casella di posta",
-  "@deleteMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "toastMessageMarkAsMailboxReadSuccess": "Hai contrassegnato tutti i messaggi in \"{mailboxName}\" come letti",
-  "@toastMessageMarkAsMailboxReadSuccess": {
-    "type": "text",
-    "placeholders_order": [
-      "mailboxName"
-    ],
-    "placeholders": {
-      "mailboxName": {}
-    }
-  },
-  "allMailboxes": "Tutte le cassette di posta",
-  "@allMailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "singleSignOn": "Accesso singolo",
-  "@singleSignOn": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "toastMessageMarkAsMailboxReadHasSomeEmailFailure": "Hai contrassegnato {count} messaggi in \"{mailboxName}\" come letti",
-  "@toastMessageMarkAsMailboxReadHasSomeEmailFailure": {
-    "type": "text",
-    "placeholders_order": [
-      "mailboxName",
-      "count"
-    ],
-    "placeholders": {
-      "mailboxName": {},
-      "count": {}
-    }
-  },
   "ssoNotAvailable": "Accesso singolo (SSO) non è disponibile",
   "@ssoNotAvailable": {
     "type": "text",
@@ -1519,12 +1365,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailbox": "Cassetta postale",
-  "@mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "nameOrEmailAddress": "Nome o indirizzo e-mail",
   "@nameOrEmailAddress": {
     "type": "text",
@@ -1567,12 +1407,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "selectMailbox": "Seleziona la casella di posta",
-  "@selectMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "messageDuplicateTagFilterMail": "l'hai già inserito",
   "@messageDuplicateTagFilterMail": {
     "type": "text",
@@ -1879,12 +1713,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toMailbox": "Alla casella di posta:",
-  "@toMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "moveMessage": "Sposta il messaggio",
   "@moveMessage": {
     "type": "text",
@@ -2499,28 +2327,6 @@
       "numberOfConversation": {}
     }
   },
-  "messageConfirmationDialogDeleteMultipleMailbox": "{numberOfMailbox} caselli di posta e tutte le sottocartelle e i messaggi in essa contenuti verranno eliminati e non sarà possibile ripristinarli. Vuoi continuare a cancellare?",
-  "@messageConfirmationDialogDeleteMultipleMailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "numberOfMailbox"
-    ],
-    "placeholders": {
-      "numberOfMailbox": {}
-    }
-  },
-  "toastMessageErrorNotSelectedFolderWhenCreateNewMailbox": "Non hai selezionato una cartella di salvataggio",
-  "@toastMessageErrorNotSelectedFolderWhenCreateNewMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "createNewMailbox": "Crea nuova casella di posta",
-  "@createNewMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "hintInputAutocompleteContact": "Inserisci il nome o l'indirizzo email",
   "@hintInputAutocompleteContact": {
     "type": "text",
@@ -2747,12 +2553,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "noEmailInYourCurrentMailbox": "Siamo spiacenti, non ci sono email nella tua casella di posta attuale",
-  "@noEmailInYourCurrentMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "noEmailMatchYourCurrentFilter": "Siamo spiacenti, non ci sono email che corrispondono al tuo filtro attuale.",
   "@noEmailMatchYourCurrentFilter": {
     "type": "text",

lib/l10n/intl_messages.arb

@@ -1,5 +1,5 @@
 {
-  "@@last_modified": "2023-10-19T11:55:20.606226",
+  "@@last_modified": "2023-10-23T14:53:09.230043",
   "initializing_data": "Initializing data...",
   "@initializing_data": {
     "type": "text",
@@ -400,8 +400,8 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "moved_to_mailbox": "Moved to {destinationMailboxPath}",
-  "@moved_to_mailbox": {
+  "movedToFolder": "Moved to {destinationMailboxPath}",
+  "@movedToFolder": {
     "type": "text",
     "placeholders_order": [
       "destinationMailboxPath"
@@ -542,8 +542,8 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hint_search_mailboxes": "Search mailboxes",
-  "@hint_search_mailboxes": {
+  "hintSearchFolders": "Search folders",
+  "@hintSearchFolders": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -600,20 +600,20 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "new_mailbox": "New mailbox",
-  "@new_mailbox": {
+  "newFolder": "New folder",
+  "@newFolder": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "name_of_mailbox_is_required": "Name of mailbox is required",
-  "@name_of_mailbox_is_required": {
+  "nameOfFolderIsRequired": "Name of folder is required",
+  "@nameOfFolderIsRequired": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailbox_name_cannot_contain_special_characters": "Mailbox name cannot contain special characters",
-  "@mailbox_name_cannot_contain_special_characters": {
+  "folderNameCannotContainSpecialCharacters": "Folder name cannot contain special characters",
+  "@folderNameCannotContainSpecialCharacters": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -624,8 +624,8 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "new_mailbox_is_created": "{nameMailbox} is created",
-  "@new_mailbox_is_created": {
+  "new_folder_is_created": "{nameMailbox} is created",
+  "@new_folder_is_created": {
     "type": "text",
     "placeholders_order": [
       "nameMailbox"
@@ -634,8 +634,8 @@
       "nameMailbox": {}
     }
   },
-  "create_new_mailbox_failure": "Create new mailbox failure",
-  "@create_new_mailbox_failure": {
+  "createNewFolderFailure": "Create new folder failure",
+  "@createNewFolderFailure": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -658,8 +658,8 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hint_input_create_new_mailbox": "Enter name of mailbox",
-  "@hint_input_create_new_mailbox": {
+  "hintInputCreateNewFolder": "Enter name of folder",
+  "@hintInputCreateNewFolder": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -670,26 +670,26 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "delete_mailboxes_successfully": "Delete mailboxes successfully",
-  "@delete_mailboxes_successfully": {
+  "deleteFoldersSuccessfully": "Delete folders successfully",
+  "@deleteFoldersSuccessfully": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "delete_mailboxes_failure": "Delete mailboxes failure",
-  "@delete_mailboxes_failure": {
+  "deleteFoldersFailure": "Delete folders failure",
+  "@deleteFoldersFailure": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "delete_mailboxes": "Delete mailboxes",
-  "@delete_mailboxes": {
+  "deleteFolders": "Delete folders",
+  "@deleteFolders": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "message_confirmation_dialog_delete_mailbox": "\"{nameMailbox}\" mailbox and all of the sub-folders and messages it contains will be deleted and won't be able to recover. Do you want to continue to delete?",
-  "@message_confirmation_dialog_delete_mailbox": {
+  "message_confirmation_dialog_delete_folder": "\"{nameMailbox}\" folder and all of the sub-folders and messages it contains will be deleted and won't be able to recover. Do you want to continue to delete?",
+  "@message_confirmation_dialog_delete_folder": {
     "type": "text",
     "placeholders_order": [
       "nameMailbox"
@@ -698,8 +698,8 @@
       "nameMailbox": {}
     }
   },
-  "rename_mailbox": "Rename mailbox",
-  "@rename_mailbox": {
+  "renameFolder": "Rename folder",
+  "@renameFolder": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -1376,14 +1376,14 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "moveMailbox": "Move mailbox",
-  "@moveMailbox": {
+  "moveFolder": "Move folder",
+  "@moveFolder": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "deleteMailbox": "Delete mailbox",
-  "@deleteMailbox": {
+  "deleteFolder": "Delete folder",
+  "@deleteFolder": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -1410,8 +1410,8 @@
       "count": {}
     }
   },
-  "allMailboxes": "All mailboxes",
-  "@allMailboxes": {
+  "allFolders": "All folders",
+  "@allFolders": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -1470,8 +1470,8 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailbox": "Mailbox",
-  "@mailbox": {
+  "folder": "Folder",
+  "@folder": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -1512,8 +1512,8 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "selectMailbox": "Select Mailbox",
-  "@selectMailbox": {
+  "selectFolder": "Select Folder",
+  "@selectFolder": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -1854,8 +1854,8 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toMailbox": "To mailbox:",
-  "@toMailbox": {
+  "toFolder": "To folder:",
+  "@toFolder": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -2402,8 +2402,8 @@
       "numberOfConversation": {}
     }
   },
-  "messageConfirmationDialogDeleteMultipleMailbox": "{numberOfMailbox} mailbox and all of the sub-folders and messages it contains will be deleted and won't be able to recover. Do you want to continue to delete?",
-  "@messageConfirmationDialogDeleteMultipleMailbox": {
+  "messageConfirmationDialogDeleteMultipleFolder": "{numberOfMailbox} folder and all of the sub-folders and messages it contains will be deleted and won't be able to recover. Do you want to continue to delete?",
+  "@messageConfirmationDialogDeleteMultipleFolder": {
     "type": "text",
     "placeholders_order": [
       "numberOfMailbox"
@@ -2418,8 +2418,8 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "createNewMailbox": "Create new mailbox",
-  "@createNewMailbox": {
+  "createNewFolder": "Create new folder",
+  "@createNewFolder": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -2586,8 +2586,8 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "noEmailInYourCurrentMailbox": "We're sorry, there are no emails in your current mailbox",
-  "@noEmailInYourCurrentMailbox": {
+  "noEmailInYourCurrentFolder": "We're sorry, there are no emails in your current folder",
+  "@noEmailInYourCurrentFolder": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -2640,20 +2640,14 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailBoxes": "Mailboxes",
-  "@mailBoxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "teamMailBoxes": "Team-mailboxes",
   "@teamMailBoxes": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hideMailBoxes": "Hide mailbox",
-  "@hideMailBoxes": {
+  "hideFolder": "Hide folder",
+  "@hideFolder": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -2664,38 +2658,38 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toastMsgHideMailboxSuccess": "This mailbox has been hidden from your primary mailbox",
-  "@toastMsgHideMailboxSuccess": {
+  "toastMsgHideFolderSuccess": "This folder has been hidden from your primary folder",
+  "@toastMsgHideFolderSuccess": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "searchForMailboxes": "Search for mailboxes",
-  "@searchForMailboxes": {
+  "searchForFolders": "Search for folders",
+  "@searchForFolders": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "showMailbox": "Show mailbox",
-  "@showMailbox": {
+  "showFolder": "Show folder",
+  "@showFolder": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toastMessageShowMailboxSuccess": "This mailbox is already displayed in your primary mailbox",
-  "@toastMessageShowMailboxSuccess": {
+  "toastMessageShowFolderSuccess": "This folder is already displayed in your primary folder",
+  "@toastMessageShowFolderSuccess": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailboxVisibility": "Mailbox visibility",
-  "@mailboxVisibility": {
+  "folderVisibility": "Folder visibility",
+  "@folderVisibility": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailboxVisibilitySubtitle": "Show/ hide your mailboxes, including your personal and team mailboxes.",
-  "@mailboxVisibilitySubtitle": {
+  "folderVisibilitySubtitle": "Show/ hide your folders, including your personal folders and team mailboxes.",
+  "@folderVisibilitySubtitle": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -2754,7 +2748,7 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "bannerMessageSendingQueueView": "Messages in Sending queue mailbox will be sent or scheduled when online.",
+  "bannerMessageSendingQueueView": "Messages in Sending queue folder will be sent or scheduled when online.",
   "@bannerMessageSendingQueueView": {
     "type": "text",
     "placeholders_order": [],
@@ -2790,7 +2784,7 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "messageDialogWhenStoreSendingEmailTail": " mailbox.",
+  "messageDialogWhenStoreSendingEmailTail": " folder.",
   "@messageDialogWhenStoreSendingEmailTail": {
     "type": "text",
     "placeholders_order": [],
@@ -2806,8 +2800,8 @@
       "recipients": {}
     }
   },
-  "openMailboxMenu": "Open mailbox menu",
-  "@openMailboxMenu": {
+  "openFolderMenu": "Open Folder menu",
+  "@openFolderMenu": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
@@ -2824,7 +2818,7 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "messageDialogDeleteSendingEmail": "Deleting an offline email will erase its content permanently. You won't be able to undo this action or recover the email from the Trash mailbox.",
+  "messageDialogDeleteSendingEmail": "Deleting an offline email will erase its content permanently. You won't be able to undo this action or recover the email from the Trash folder.",
   "@messageDialogDeleteSendingEmail": {
     "type": "text",
     "placeholders_order": [],
@@ -3144,7 +3138,7 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "folderCreatedMessage": "To begin using this mailbox, you should add some rules to organize all of your mail in your own way.",
+  "folderCreatedMessage": "To begin using this folder, you should add some rules to organize all of your mail in your own way.",
   "@folderCreatedMessage": {
     "type": "text",
     "placeholders_order": [],

lib/l10n/intl_ru.arb

@@ -226,12 +226,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "move_to_mailbox": "Переместить в почтовый ящик",
-  "@move_to_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "mark_as_star": "Избранное",
   "@mark_as_star": {
     "type": "text",
@@ -356,16 +350,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "moved_to_mailbox": "Перемещено в {destinationMailboxPath}",
-  "@moved_to_mailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "destinationMailboxPath"
-    ],
-    "placeholders": {
-      "destinationMailboxPath": {}
-    }
-  },
   "undo_action": "ОТМЕНИТЬ",
   "@undo_action": {
     "type": "text",
@@ -516,12 +500,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hint_search_mailboxes": "Поиск по почтовым ящикам",
-  "@hint_search_mailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "starred": "Избранное",
   "@starred": {
     "type": "text",
@@ -574,58 +552,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "new_mailbox": "Новый почтовый ящик",
-  "@new_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailbox_location": "Расположение почтового ящика",
-  "@mailbox_location": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "default_mailbox": "Почтовый ящик по умолчанию",
-  "@default_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "name_of_mailbox_is_required": "Введите название почтового ящика",
-  "@name_of_mailbox_is_required": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailbox_name_cannot_contain_special_characters": "Название почтового ящика не может содержать специальные символы",
-  "@mailbox_name_cannot_contain_special_characters": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "this_folder_name_is_already_taken": "Это название папки уже используется",
-  "@this_folder_name_is_already_taken": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "new_mailbox_is_created": "{nameMailbox} создан",
-  "@new_mailbox_is_created": {
-    "type": "text",
-    "placeholders_order": [
-      "nameMailbox"
-    ],
-    "placeholders": {
-      "nameMailbox": {}
-    }
-  },
-  "create_new_mailbox_failure": "Не удалось создать новый почтовый ящик",
-  "@create_new_mailbox_failure": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "drafts_saved": "Черновик сохранен",
   "@drafts_saved": {
     "type": "text",
@@ -638,52 +564,12 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hint_input_create_new_mailbox": "Введите название почтового ящика",
-  "@hint_input_create_new_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "rename": "Переименовать",
   "@rename": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "rename_mailbox": "Переименовать почтовый ящик",
-  "@rename_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "delete_mailboxes_successfully": "Почтовые ящики успешно удалены",
-  "@delete_mailboxes_successfully": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "delete_mailboxes_failure": "Не удалось удалить почтовые ящики",
-  "@delete_mailboxes_failure": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "delete_mailboxes": "Удалить почтовые ящики",
-  "@delete_mailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "message_confirmation_dialog_delete_mailbox": "Почтовый ящик \"{nameMailbox}\" и все содержащиеся в нем подпапки и сообщения будут удалены без возможности восстановления. Вы хотите продолжить удаление?",
-  "@message_confirmation_dialog_delete_mailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "nameMailbox"
-    ],
-    "placeholders": {
-      "nameMailbox": {}
-    }
-  },
   "this_field_cannot_be_blank": "Заполните это поле",
   "@this_field_cannot_be_blank": {
     "type": "text",
@@ -1426,46 +1312,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "moveMailbox": "Переместить почтовый ящик",
-  "@moveMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "deleteMailbox": "Удалить почтовый ящик",
-  "@deleteMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "toastMessageMarkAsMailboxReadSuccess": "Вы отметили все сообщения в \"{mailboxName}\" как прочитанные",
-  "@toastMessageMarkAsMailboxReadSuccess": {
-    "type": "text",
-    "placeholders_order": [
-      "mailboxName"
-    ],
-    "placeholders": {
-      "mailboxName": {}
-    }
-  },
-  "allMailboxes": "Все ящики",
-  "@allMailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "toastMessageMarkAsMailboxReadHasSomeEmailFailure": "Вы отметили {count} сообщения(-ий) в \"{mailboxName}\" как прочитанные",
-  "@toastMessageMarkAsMailboxReadHasSomeEmailFailure": {
-    "type": "text",
-    "placeholders_order": [
-      "mailboxName",
-      "count"
-    ],
-    "placeholders": {
-      "mailboxName": {},
-      "count": {}
-    }
-  },
   "singleSignOn": "Единый вход",
   "@singleSignOn": {
     "type": "text",
@@ -1514,12 +1360,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailbox": "Ящик",
-  "@mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "nameOrEmailAddress": "Имя или адрес электронной почты",
   "@nameOrEmailAddress": {
     "type": "text",
@@ -1610,12 +1450,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "selectMailbox": "Выбрать почтовый ящик",
-  "@selectMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "languageAndRegion": "Язык и регион",
   "@languageAndRegion": {
     "type": "text",
@@ -1856,12 +1690,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toMailbox": "В почтовый ящик:",
-  "@toMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "ruleFilterAddressFromField": "От",
   "@ruleFilterAddressFromField": {
     "type": "text",
@@ -2390,16 +2218,6 @@
       "time": {}
     }
   },
-  "messageConfirmationDialogDeleteMultipleMailbox": "{numberOfMailbox} почтовых ящиков и все содержащиеся в них подпапки и сообщения будут удалены без возможности восстановления. Вы хотите продолжить?",
-  "@messageConfirmationDialogDeleteMultipleMailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "numberOfMailbox"
-    ],
-    "placeholders": {
-      "numberOfMailbox": {}
-    }
-  },
   "unknownError": "Произошла неизвестная ошибка, пожалуйста, попробуйте еще раз",
   "@unknownError": {
     "type": "text",
@@ -2510,18 +2328,6 @@
       "numberOfConversation": {}
     }
   },
-  "toastMessageErrorNotSelectedFolderWhenCreateNewMailbox": "Вы не выбрали папку для сохранения",
-  "@toastMessageErrorNotSelectedFolderWhenCreateNewMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "createNewMailbox": "Создать новый почтовый ящик",
-  "@createNewMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "older": "К старым",
   "@older": {
     "type": "text",
@@ -2716,54 +2522,18 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailBoxes": "Почтовые ящики",
-  "@mailBoxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "teamMailBoxes": "Общие почтовые ящики",
   "@teamMailBoxes": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hideMailBoxes": "Скрыть почтовый ящик",
-  "@hideMailBoxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "thisImageCannotBeAdded": "Невозможно добавить это изображение.",
   "@thisImageCannotBeAdded": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toastMsgHideMailboxSuccess": "Почтовый ящик скрыт из основного почтового ящика",
-  "@toastMsgHideMailboxSuccess": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "searchForMailboxes": "Поиск почтовых ящиков",
-  "@searchForMailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "showMailbox": "Показать почтовый ящик",
-  "@showMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailboxVisibilitySubtitle": "Показать/скрыть почтовые ящики, включая личные и общие почтовые ящики.",
-  "@mailboxVisibilitySubtitle": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "setDefaultIdentity": "Сделать идентификатором по умолчанию",
   "@setDefaultIdentity": {
     "type": "text",
@@ -2798,12 +2568,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toastMessageShowMailboxSuccess": "Этот почтовый ящик уже отображается в основном почтовом ящике",
-  "@toastMessageShowMailboxSuccess": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "Bad credentials": "Неверные данные",
   "@Bad credentials": {
     "type": "text",
@@ -2880,12 +2644,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "noEmailInYourCurrentMailbox": "К сожалению, в текущем почтовом ящике нет писем",
-  "@noEmailInYourCurrentMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "noEmailMatchYourCurrentFilter": "К сожалению, мы не нашли писем, соответствующих текущему фильтру.",
   "@noEmailMatchYourCurrentFilter": {
     "type": "text",
@@ -2898,12 +2656,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailboxVisibility": "Отображение почтового ящика",
-  "@mailboxVisibility": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "languageArabic": "Арабский",
   "@languageArabic": {
     "type": "text",
@@ -2976,12 +2728,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "openMailboxMenu": "Открыть меню почтового ящика",
-  "@openMailboxMenu": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "deleteOfflineEmail": "Удалить оффлайн-письмо",
   "@deleteOfflineEmail": {
     "type": "text",

lib/l10n/intl_vi.arb

@@ -226,12 +226,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "move_to_mailbox": "Move to mailbox",
-  "@move_to_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "mark_as_star": "Star",
   "@mark_as_star": {
     "type": "text",
@@ -356,16 +350,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "moved_to_mailbox": "Đã di chuyển tới {destinationMailboxPath}",
-  "@moved_to_mailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "destinationMailboxPath"
-    ],
-    "placeholders": {
-      "destinationMailboxPath": {}
-    }
-  },
   "undo_action": "UNDO",
   "@undo_action": {
     "type": "text",
@@ -498,12 +482,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hint_search_mailboxes": "Tìm kiếm thư mục",
-  "@hint_search_mailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "with_attachments": "Các tệp đính kèm",
   "@with_attachments": {
     "type": "text",
@@ -586,12 +564,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "moveMailbox": "Di chuyển thư mục",
-  "@moveMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "delete_failed": "Xoá thất bại",
   "@delete_failed": {
     "type": "text",
@@ -604,30 +576,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "deleteMailbox": "Xoá thư mục",
-  "@deleteMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "toastMessageMarkAsMailboxReadHasSomeEmailFailure": "Bạn đã đánh dấu {count} tin nhắn trong thư mục \"{mailboxName}\" là đã đọc",
-  "@toastMessageMarkAsMailboxReadHasSomeEmailFailure": {
-    "type": "text",
-    "placeholders_order": [
-      "mailboxName",
-      "count"
-    ],
-    "placeholders": {
-      "mailboxName": {},
-      "count": {}
-    }
-  },
-  "delete_mailboxes_failure": "Xoá thư mục thất bại",
-  "@delete_mailboxes_failure": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "search_emails": "Tìm kiếm emails",
   "@search_emails": {
     "type": "text",
@@ -694,18 +642,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "default_mailbox": "Thư mục mặc định",
-  "@default_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "name_of_mailbox_is_required": "Thiếu tên thư mục",
-  "@name_of_mailbox_is_required": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "app_name": "Team Mail",
   "@app_name": {
     "type": "text",
@@ -742,26 +678,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "new_mailbox_is_created": "{nameMailbox} đã được tạo",
-  "@new_mailbox_is_created": {
-    "type": "text",
-    "placeholders_order": [
-      "nameMailbox"
-    ],
-    "placeholders": {
-      "nameMailbox": {}
-    }
-  },
-  "message_confirmation_dialog_delete_mailbox": "Thư mục \"{nameMailbox}\", các thư mục con và các tin nhắn của nó bị được xoá bỏ và không thể khôi phục. Bạn có tiếp tục thực hiện?",
-  "@message_confirmation_dialog_delete_mailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "nameMailbox"
-    ],
-    "placeholders": {
-      "nameMailbox": {}
-    }
-  },
   "delete_multiple_messages_dialog": "Bạn đang xoá vĩnh viễn {count} tin nhắn trong {mailboxName}. Bạn có tiếp tục không?",
   "@delete_multiple_messages_dialog": {
     "type": "text",
@@ -808,16 +724,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toastMessageMarkAsMailboxReadSuccess": "Bạn đã đánh dấu tất cả tin nhắn trong thư mục \"{mailboxName}\" là đã đọc",
-  "@toastMessageMarkAsMailboxReadSuccess": {
-    "type": "text",
-    "placeholders_order": [
-      "mailboxName"
-    ],
-    "placeholders": {
-      "mailboxName": {}
-    }
-  },
   "singleSignOn": "Đăng nhập một lần (SSO)",
   "@singleSignOn": {
     "type": "text",
@@ -872,12 +778,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailbox": "Thư mục",
-  "@mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "nameOrEmailAddress": "Tên hoặc địa chỉ email",
   "@nameOrEmailAddress": {
     "type": "text",
@@ -920,12 +820,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "selectMailbox": "Chọn thư mục",
-  "@selectMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "messageDuplicateTagFilterMail": "bạn vừa nhập",
   "@messageDuplicateTagFilterMail": {
     "type": "text",
@@ -1114,36 +1008,12 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "new_mailbox": "Thư mục mới",
-  "@new_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailbox_location": "Chọn thư mục",
-  "@mailbox_location": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailbox_name_cannot_contain_special_characters": "Tên thư mục không chứa ký tự đặc biệt",
-  "@mailbox_name_cannot_contain_special_characters": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "this_folder_name_is_already_taken": "Tên thư mục đã tồn tại",
   "@this_folder_name_is_already_taken": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "create_new_mailbox_failure": "Tạo thư mục thất bại",
-  "@create_new_mailbox_failure": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "drafts_saved": "Đã lưu bản nháp",
   "@drafts_saved": {
     "type": "text",
@@ -1156,30 +1026,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hint_input_create_new_mailbox": "Tên thư mục",
-  "@hint_input_create_new_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "delete_mailboxes_successfully": "Xoá thư mục thành công",
-  "@delete_mailboxes_successfully": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "delete_mailboxes": "Xoá thư mục",
-  "@delete_mailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "rename_mailbox": "Đổi tên thư mục",
-  "@rename_mailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "this_field_cannot_be_blank": "Trường dữ liệu trống",
   "@this_field_cannot_be_blank": {
     "type": "text",
@@ -1592,12 +1438,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "allMailboxes": "Tất cả thư mục",
-  "@allMailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "recent": "Gần đây",
   "@recent": {
     "type": "text",
@@ -1922,12 +1762,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toMailbox": "Tới thư mục:",
-  "@toMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "moveMessage": "Di chuyển tin nhắn",
   "@moveMessage": {
     "type": "text",
@@ -2438,12 +2272,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "noEmailInYourCurrentMailbox": "Chúng tôi xin lỗi, không có email nào trong hộp thư hiện tại của bạn",
-  "@noEmailInYourCurrentMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "required": "yêu cầu",
   "@required": {
     "type": "text",
@@ -2474,24 +2302,12 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "mailBoxes": "Hộp thư",
-  "@mailBoxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "thisImageCannotBeAdded": "Không thể thêm hình ảnh này.",
   "@thisImageCannotBeAdded": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
   },
-  "showMailbox": "Hiển thị hộp thư",
-  "@showMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "undo": "Hoàn tác",
   "@undo": {
     "type": "text",
@@ -2528,12 +2344,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "toastMessageErrorNotSelectedFolderWhenCreateNewMailbox": "Bạn chưa chọn thư mục để lưu trữ",
-  "@toastMessageErrorNotSelectedFolderWhenCreateNewMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "newer": "Mới hơn",
   "@newer": {
     "type": "text",
@@ -2692,12 +2502,6 @@
       "time": {}
     }
   },
-  "createNewMailbox": "Tạo hộp thư mới",
-  "@createNewMailbox": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "reply_to": "Trả lời",
   "@reply_to": {
     "type": "text",
@@ -2774,16 +2578,6 @@
       "subject": {}
     }
   },
-  "messageConfirmationDialogDeleteMultipleMailbox": "{numberOfMailbox} hộp thư và tất cả các thư mục con và các email bên trong sẽ bị xóa và không thể khôi phục được. Bạn có muốn tiếp tục xóa không?",
-  "@messageConfirmationDialogDeleteMultipleMailbox": {
-    "type": "text",
-    "placeholders_order": [
-      "numberOfMailbox"
-    ],
-    "placeholders": {
-      "numberOfMailbox": {}
-    }
-  },
   "toastMessageCannotFoundIdentityWhenSendReceipt": "Không tìm thấy id danh tính",
   "@toastMessageCannotFoundIdentityWhenSendReceipt": {
     "type": "text",
@@ -2826,42 +2620,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "hideMailBoxes": "Ẩn hộp thư",
-  "@hideMailBoxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "toastMsgHideMailboxSuccess": "Hộp thư này đã bị ẩn khỏi hộp thư chính của bạn",
-  "@toastMsgHideMailboxSuccess": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "searchForMailboxes": "Tìm kiếm hộp thư",
-  "@searchForMailboxes": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailboxVisibility": "Chế độ hiển thị hộp thư",
-  "@mailboxVisibility": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "mailboxVisibilitySubtitle": "Hiển thị/ẩn hộp thư của bạn, bao gồm hộp thư cá nhân và hộp thư nhóm của bạn.",
-  "@mailboxVisibilitySubtitle": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
-  "toastMessageShowMailboxSuccess": "Hộp thư này đã được hiển thị trong hộp thư chính của bạn",
-  "@toastMessageShowMailboxSuccess": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "titleHeaderAttachment": "{count} Tệp đính kèm ({totalSize}):",
   "@titleHeaderAttachment": {
     "type": "text",
@@ -3342,12 +3100,6 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "openMailboxMenu": "Mở trình đơn hộp thư",
-  "@openMailboxMenu": {
-    "type": "text",
-    "placeholders_order": [],
-    "placeholders": {}
-  },
   "messageEventActionBannerAttendeeCounter": " đã đề xuất thay đổi sự kiện",
   "@messageEventActionBannerAttendeeCounter": {
     "type": "text",

lib/main/localizations/app_localizations.dart

@@ -414,10 +414,10 @@ class AppLocalizations {
     );
   }
 
-  String moved_to_mailbox(String destinationMailboxPath) {
+  String movedToFolder(String destinationMailboxPath) {
     return Intl.message(
         'Moved to $destinationMailboxPath',
-        name: 'moved_to_mailbox',
+        name: 'movedToFolder',
         args: [destinationMailboxPath]
     );
   }
@@ -552,10 +552,10 @@ class AppLocalizations {
         name: 'sign_out');
   }
 
-  String get hint_search_mailboxes {
+  String get hintSearchFolders {
     return Intl.message(
-        'Search mailboxes',
-        name: 'hint_search_mailboxes');
+        'Search folders',
+        name: 'hintSearchFolders');
   }
 
   String get with_attachments {
@@ -613,24 +613,24 @@ class AppLocalizations {
     );
   }
 
-  String get new_mailbox {
+  String get newFolder {
     return Intl.message(
-      'New mailbox',
-      name: 'new_mailbox',
+      'New folder',
+      name: 'newFolder',
     );
   }
 
-  String get name_of_mailbox_is_required {
+  String get nameOfFolderIsRequired {
     return Intl.message(
-      'Name of mailbox is required',
-      name: 'name_of_mailbox_is_required',
+      'Name of folder is required',
+      name: 'nameOfFolderIsRequired',
     );
   }
 
-  String get mailbox_name_cannot_contain_special_characters {
+  String get folderNameCannotContainSpecialCharacters {
     return Intl.message(
-      'Mailbox name cannot contain special characters',
-      name: 'mailbox_name_cannot_contain_special_characters',
+      'Folder name cannot contain special characters',
+      name: 'folderNameCannotContainSpecialCharacters',
     );
   }
 
@@ -641,18 +641,18 @@ class AppLocalizations {
     );
   }
 
-  String new_mailbox_is_created(String nameMailbox) {
+  String new_folder_is_created(String nameMailbox) {
     return Intl.message(
         '$nameMailbox is created',
-        name: 'new_mailbox_is_created',
+        name: 'new_folder_is_created',
         args: [nameMailbox]
     );
   }
 
-  String get create_new_mailbox_failure {
+  String get createNewFolderFailure {
     return Intl.message(
-        'Create new mailbox failure',
-        name: 'create_new_mailbox_failure'
+        'Create new folder failure',
+        name: 'createNewFolderFailure'
     );
   }
 
@@ -677,10 +677,10 @@ class AppLocalizations {
     );
   }
 
-  String get hint_input_create_new_mailbox {
+  String get hintInputCreateNewFolder {
     return Intl.message(
-        'Enter name of mailbox',
-        name: 'hint_input_create_new_mailbox'
+        'Enter name of folder',
+        name: 'hintInputCreateNewFolder'
     );
   }
 
@@ -690,36 +690,36 @@ class AppLocalizations {
         name: 'rename');
   }
 
-  String get delete_mailboxes_successfully {
+  String get deleteFoldersSuccessfully {
     return Intl.message(
-        'Delete mailboxes successfully',
-        name: 'delete_mailboxes_successfully');
+        'Delete folders successfully',
+        name: 'deleteFoldersSuccessfully');
   }
 
-  String get delete_mailboxes_failure {
+  String get deleteFoldersFailure {
     return Intl.message(
-        'Delete mailboxes failure',
-        name: 'delete_mailboxes_failure');
+        'Delete folders failure',
+        name: 'deleteFoldersFailure');
   }
 
-  String get delete_mailboxes {
+  String get deleteFolders {
     return Intl.message(
-        'Delete mailboxes',
-        name: 'delete_mailboxes');
+        'Delete folders',
+        name: 'deleteFolders');
   }
 
-  String message_confirmation_dialog_delete_mailbox(String nameMailbox) {
+  String message_confirmation_dialog_delete_folder(String nameMailbox) {
     return Intl.message(
-        '"$nameMailbox" mailbox and all of the sub-folders and messages it contains will be deleted and won\'t be able to recover. Do you want to continue to delete?',
-        name: 'message_confirmation_dialog_delete_mailbox',
+        '"$nameMailbox" folder and all of the sub-folders and messages it contains will be deleted and won\'t be able to recover. Do you want to continue to delete?',
+        name: 'message_confirmation_dialog_delete_folder',
         args: [nameMailbox]
     );
   }
 
-  String get rename_mailbox {
+  String get renameFolder {
     return Intl.message(
-        'Rename mailbox',
-        name: 'rename_mailbox');
+        'Rename folder',
+        name: 'renameFolder');
   }
 
   String get this_field_cannot_be_blank {
@@ -1402,17 +1402,17 @@ class AppLocalizations {
         name: 'canNotGetToken');
   }
 
-  String get moveMailbox {
+  String get moveFolder {
     return Intl.message(
-      'Move mailbox',
-      name: 'moveMailbox',
+      'Move folder',
+      name: 'moveFolder',
     );
   }
 
-  String get deleteMailbox {
+  String get deleteFolder {
     return Intl.message(
-        'Delete mailbox',
-        name: 'deleteMailbox');
+        'Delete folder',
+        name: 'deleteFolder');
   }
 
   String toastMessageMarkAsMailboxReadSuccess(String mailboxName) {
@@ -1429,10 +1429,10 @@ class AppLocalizations {
         args: [mailboxName, count]);
   }
 
-  String get allMailboxes {
+  String get allFolders {
     return Intl.message(
-        'All mailboxes',
-        name: 'allMailboxes');
+        'All folders',
+        name: 'allFolders');
   }
 
   String get singleSignOn {
@@ -1492,10 +1492,10 @@ class AppLocalizations {
     );
   }
 
-  String get mailbox {
+  String get folder {
     return Intl.message(
-      'Mailbox',
-      name: 'mailbox',
+      'Folder',
+      name: 'folder',
     );
   }
 
@@ -1541,10 +1541,10 @@ class AppLocalizations {
     );
   }
 
-  String get selectMailbox {
+  String get selectFolder {
     return Intl.message(
-      'Select Mailbox',
-      name: 'selectMailbox',
+      'Select Folder',
+      name: 'selectFolder',
     );
   }
 
@@ -1895,10 +1895,10 @@ class AppLocalizations {
         name: 'actionTitleRulesFilter');
   }
 
-  String get toMailbox {
+  String get toFolder {
     return Intl.message(
-        'To mailbox:',
-        name: 'toMailbox');
+        'To folder:',
+        name: 'toFolder');
   }
 
   String get moveMessage {
@@ -2470,10 +2470,10 @@ class AppLocalizations {
     );
   }
 
-  String messageConfirmationDialogDeleteMultipleMailbox(int numberOfMailbox) {
+  String messageConfirmationDialogDeleteMultipleFolder(int numberOfMailbox) {
     return Intl.message(
-        '$numberOfMailbox mailbox and all of the sub-folders and messages it contains will be deleted and won\'t be able to recover. Do you want to continue to delete?',
-        name: 'messageConfirmationDialogDeleteMultipleMailbox',
+        '$numberOfMailbox folder and all of the sub-folders and messages it contains will be deleted and won\'t be able to recover. Do you want to continue to delete?',
+        name: 'messageConfirmationDialogDeleteMultipleFolder',
         args: [numberOfMailbox]
     );
   }
@@ -2484,10 +2484,10 @@ class AppLocalizations {
         name: 'toastMessageErrorNotSelectedFolderWhenCreateNewMailbox');
   }
 
-  String get createNewMailbox {
+  String get createNewFolder {
     return Intl.message(
-        'Create new mailbox',
-        name: 'createNewMailbox');
+        'Create new folder',
+        name: 'createNewFolder');
   }
 
   String get newer {
@@ -2655,10 +2655,10 @@ class AppLocalizations {
       name: 'required');
   }
 
-  String get noEmailInYourCurrentMailbox {
+  String get noEmailInYourCurrentFolder {
     return Intl.message(
-      'We\'re sorry, there are no emails in your current mailbox',
-      name: 'noEmailInYourCurrentMailbox');
+      'We\'re sorry, there are no emails in your current folder',
+      name: 'noEmailInYourCurrentFolder');
   }
 
   String get noEmailMatchYourCurrentFilter {
@@ -2715,22 +2715,16 @@ class AppLocalizations {
     );
   }
 
-  String get mailBoxes {
-    return Intl.message(
-      'Mailboxes',
-      name: 'mailBoxes');
-  }
-
   String get teamMailBoxes {
     return Intl.message(
       'Team-mailboxes',
       name: 'teamMailBoxes');
   }
 
-  String get hideMailBoxes {
+  String get hideFolder {
     return Intl.message(
-      'Hide mailbox',
-      name: 'hideMailBoxes');
+      'Hide folder',
+      name: 'hideFolder');
   }
 
   String get thisImageCannotBeAdded {
@@ -2740,42 +2734,42 @@ class AppLocalizations {
     );
   }
 
-  String get toastMsgHideMailboxSuccess {
+  String get toastMsgHideFolderSuccess {
     return Intl.message(
-      'This mailbox has been hidden from your primary mailbox',
-      name: 'toastMsgHideMailboxSuccess');
+      'This folder has been hidden from your primary folder',
+      name: 'toastMsgHideFolderSuccess');
   }
 
-  String get searchForMailboxes {
+  String get searchForFolders {
     return Intl.message(
-      'Search for mailboxes',
-      name: 'searchForMailboxes'
+      'Search for folders',
+      name: 'searchForFolders'
     );
   }
 
-  String get showMailbox {
+  String get showFolder {
     return Intl.message(
-      'Show mailbox',
-      name: 'showMailbox'
+      'Show folder',
+      name: 'showFolder'
     );
   }
 
-  String get toastMessageShowMailboxSuccess {
+  String get toastMessageShowFolderSuccess {
     return Intl.message(
-      'This mailbox is already displayed in your primary mailbox',
-      name: 'toastMessageShowMailboxSuccess');
+      'This folder is already displayed in your primary folder',
+      name: 'toastMessageShowFolderSuccess');
   }
-  String get mailboxVisibility {
+  String get folderVisibility {
     return Intl.message(
-      'Mailbox visibility',
-      name: 'mailboxVisibility',
+      'Folder visibility',
+      name: 'folderVisibility',
     );
   }
 
-  String get mailboxVisibilitySubtitle {
+  String get folderVisibilitySubtitle {
     return Intl.message(
-      'Show/ hide your mailboxes, including your personal and team mailboxes.',
-      name: 'mailboxVisibilitySubtitle',
+      'Show/ hide your folders, including your personal folders and team mailboxes.',
+      name: 'folderVisibilitySubtitle',
     );
   }
 
@@ -2837,7 +2831,7 @@ class AppLocalizations {
 
   String get bannerMessageSendingQueueView {
     return Intl.message(
-      'Messages in Sending queue mailbox will be sent or scheduled when online.',
+      'Messages in Sending queue folder will be sent or scheduled when online.',
       name: 'bannerMessageSendingQueueView'
     );
   }
@@ -2879,7 +2873,7 @@ class AppLocalizations {
 
   String get messageDialogWhenStoreSendingEmailTail {
     return Intl.message(
-      ' mailbox.',
+      ' folder.',
       name: 'messageDialogWhenStoreSendingEmailTail'
     );
   }
@@ -2891,10 +2885,10 @@ class AppLocalizations {
       args: [recipients]);
   }
 
-  String get openMailboxMenu {
+  String get openFolderMenu {
     return Intl.message(
-      'Open mailbox menu',
-      name: 'openMailboxMenu'
+      'Open Folder menu',
+      name: 'openFolderMenu'
     );
   }
 
@@ -2914,7 +2908,7 @@ class AppLocalizations {
 
   String get messageDialogDeleteSendingEmail {
     return Intl.message(
-      'Deleting an offline email will erase its content permanently. You won\'t be able to undo this action or recover the email from the Trash mailbox.',
+      'Deleting an offline email will erase its content permanently. You won\'t be able to undo this action or recover the email from the Trash folder.',
       name: 'messageDialogDeleteSendingEmail'
     );
   }
@@ -3244,7 +3238,7 @@ class AppLocalizations {
 
   String get folderCreatedMessage {
     return Intl.message(
-      'To begin using this mailbox, you should add some rules to organize all of your mail in your own way.',
+      'To begin using this folder, you should add some rules to organize all of your mail in your own way.',
       name: 'folderCreatedMessage');
   }