diff --git a/applications/main/archive/scenes/archive_scene_browser.c b/applications/main/archive/scenes/archive_scene_browser.c index 0d90c33ea..1041e2e62 100644 --- a/applications/main/archive/scenes/archive_scene_browser.c +++ b/applications/main/archive/scenes/archive_scene_browser.c @@ -177,15 +177,15 @@ bool archive_scene_browser_on_event(void* context, SceneManagerEvent event) { CLIPBOARD_MODE_COPY); consumed = true; break; - case ArchiveBrowserEventFileMenuPast_Cut: - case ArchiveBrowserEventFileMenuPast_Copy: + case ArchiveBrowserEventFileMenuPaste_Cut: + case ArchiveBrowserEventFileMenuPaste_Copy: archive_show_file_menu(browser, false); FuriString* path_src = archive->fav_move_str; FuriString* path_dst = furi_string_alloc(); FuriString* base = furi_string_alloc(); - const bool copy = (event.event == ArchiveBrowserEventFileMenuPast_Copy); + const bool copy = (event.event == ArchiveBrowserEventFileMenuPaste_Copy); path_extract_basename(furi_string_get_cstr(path_src), base); path_concat(furi_string_get_cstr(browser->path), furi_string_get_cstr(base), path_dst); diff --git a/applications/main/archive/views/archive_browser_view.c b/applications/main/archive/views/archive_browser_view.c index d3806fc45..e298583ec 100644 --- a/applications/main/archive/views/archive_browser_view.c +++ b/applications/main/archive/views/archive_browser_view.c @@ -60,13 +60,13 @@ static void contex_menu_filemanager_init(ArchiveBrowserViewModel* model) { } else if(model->clipboard_mode == CLIPBOARD_MODE_CUT) { archive_menu_add_item( menu_array_push_raw(model->context_menu), - "Past", - ArchiveBrowserEventFileMenuPast_Cut); + "Paste", + ArchiveBrowserEventFileMenuPaste_Cut); } else if(model->clipboard_mode == CLIPBOARD_MODE_COPY) { archive_menu_add_item( menu_array_push_raw(model->context_menu), - "Past", - ArchiveBrowserEventFileMenuPast_Copy); + "Paste", + ArchiveBrowserEventFileMenuPaste_Copy); } archive_menu_add_item( @@ -79,13 +79,13 @@ static void contex_menu_filemanager_init(ArchiveBrowserViewModel* model) { if(model->clipboard_mode == CLIPBOARD_MODE_CUT) { archive_menu_add_item( menu_array_push_raw(model->context_menu), - "Past", - ArchiveBrowserEventFileMenuPast_Cut); + "Paste", + ArchiveBrowserEventFileMenuPaste_Cut); } else if(model->clipboard_mode == CLIPBOARD_MODE_COPY) { archive_menu_add_item( menu_array_push_raw(model->context_menu), - "Past", - ArchiveBrowserEventFileMenuPast_Copy); + "Paste", + ArchiveBrowserEventFileMenuPaste_Copy); } archive_menu_add_item( menu_array_push_raw(model->context_menu), "NewDir", ArchiveBrowserEventFileMenuNewDir); @@ -109,7 +109,7 @@ static void render_item_menu(Canvas* canvas, ArchiveBrowserViewModel* model) { // Folder //FURI_LOG_D(TAG, "Directory type"); - // { Copy/Cut, Past } NewDir, Rename, Delete + // { Copy/Cut, Paste } NewDir, Rename, Delete model->menu_file_manage = true; model->menu_can_switch = false; @@ -119,7 +119,7 @@ static void render_item_menu(Canvas* canvas, ArchiveBrowserViewModel* model) { //FURI_LOG_D(TAG, "Unknown type"); model->menu_can_switch = true; if(model->menu_file_manage) { - // { Copy/Cut, Past } NewDir, Rename, Delete + // { Copy/Cut, Paste } NewDir, Rename, Delete contex_menu_filemanager_init(model); } else { // Info, [Show], @@ -187,7 +187,7 @@ static void render_item_menu(Canvas* canvas, ArchiveBrowserViewModel* model) { model->menu_can_switch = true; if(model->menu_file_manage) { - // { Copy/Cut, Past } NewDir, Rename, Delete + // { Copy/Cut, Paste } NewDir, Rename, Delete contex_menu_filemanager_init(model); } else { // Run, Pin, Info, [Show] diff --git a/applications/main/archive/views/archive_browser_view.h b/applications/main/archive/views/archive_browser_view.h index ba4b5c484..5541ba9fe 100644 --- a/applications/main/archive/views/archive_browser_view.h +++ b/applications/main/archive/views/archive_browser_view.h @@ -50,8 +50,8 @@ typedef enum { ArchiveBrowserEventFileMenuNewDir, ArchiveBrowserEventFileMenuCut, ArchiveBrowserEventFileMenuCopy, - ArchiveBrowserEventFileMenuPast_Cut, - ArchiveBrowserEventFileMenuPast_Copy, + ArchiveBrowserEventFileMenuPaste_Cut, + ArchiveBrowserEventFileMenuPaste_Copy, ArchiveBrowserEventFileMenuDelete, ArchiveBrowserEventFileMenuInfo, ArchiveBrowserEventFileMenuShow,