summaryrefslogtreecommitdiff
path: root/plugins/BasicHistory
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/BasicHistory')
-rw-r--r--plugins/BasicHistory/src/Options.cpp2
1 files changed, 1 insertions, 1 deletions
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);