diff options
| author | dartraiden <wowemuh@gmail.com> | 2017-11-06 23:40:03 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2017-11-06 23:40:03 +0300 |
| commit | 86bf4d36769b6d5d7ce5799cacbc7f7d3aa7fb6c (patch) | |
| tree | 9814552e9cb280967c9e4c46c9fe626c9e3ef765 | |
| parent | 0c20eac9b081cd9c1c81dfbc3e48e069f859edc1 (diff) | |
BasicHistory: fix typo
| -rw-r--r-- | plugins/BasicHistory/src/Options.cpp | 2 |
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);
|