From 86bf4d36769b6d5d7ce5799cacbc7f7d3aa7fb6c Mon Sep 17 00:00:00 2001 From: dartraiden Date: Mon, 6 Nov 2017 23:40:03 +0300 Subject: BasicHistory: fix typo --- plugins/BasicHistory/src/Options.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index a5817a06dc..61b0da8e06 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -1616,7 +1616,7 @@ INT_PTR CALLBACK Options::DlgProcOptsTask(HWND hwndDlg, UINT msg, WPARAM wParam, ComboBox_AddString(comboType, TranslateT("Delete")); ComboBox_AddString(comboType, TranslateT("Export and Delete")); ComboBox_AddString(comboType, TranslateT("Import")); - ComboBox_AddString(comboType, TranslateT("Import and Marge")); + ComboBox_AddString(comboType, TranslateT("Import and Merge")); ComboBox_SetCurSel(comboType, to->type); Edit_LimitText(GetDlgItem(hwndDlg, IDC_EVENT_TIME), 6); -- cgit v1.2.3