From b6cb9d8d0d77cd09b288b9882b0bc1ff44aafa24 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Mon, 4 Dec 2017 23:54:49 +0300 Subject: BasicHistory: decapitalization (except TopToolBar button) --- plugins/BasicHistory/res/BasicHistory.rc | 28 +++++++------- plugins/BasicHistory/src/BasicHistory.cpp | 12 +++--- plugins/BasicHistory/src/EventList.cpp | 2 +- plugins/BasicHistory/src/ExportManager.cpp | 2 +- plugins/BasicHistory/src/HistoryWindow.cpp | 56 ++++++++++++++-------------- plugins/BasicHistory/src/Options.cpp | 48 ++++++++++++------------ plugins/BasicHistory/src/PlainHtmlExport.cpp | 4 +- plugins/BasicHistory/src/RichHtmlExport.cpp | 4 +- plugins/BasicHistory/src/Searcher.cpp | 4 +- plugins/BasicHistory/src/TxtExport.cpp | 2 +- 10 files changed, 81 insertions(+), 81 deletions(-) diff --git a/plugins/BasicHistory/res/BasicHistory.rc b/plugins/BasicHistory/res/BasicHistory.rc index bf900229e7..c32965b95b 100644 --- a/plugins/BasicHistory/res/BasicHistory.rc +++ b/plugins/BasicHistory/res/BasicHistory.rc @@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_HISTORY DIALOGEX 0, 0, 496, 366 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_CONTROLPARENT -CAPTION "Message History" +CAPTION "Message history" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_LIST,WC_LISTVIEW, WS_TABSTOP | WS_BORDER | LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SHOWSELALWAYS | LVS_SINGLESEL | LVS_SHAREIMAGELISTS ,102,27,387,73 @@ -55,10 +55,10 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,23,270,10 CONTROL "Show groups in contact list",IDC_SHOWCONTACTGROUPS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,34,270,10 - CONTROL "Do not show Find control border",IDC_FINDNOBORDER, + CONTROL "Do not show find control border",IDC_FINDNOBORDER, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,45,270,10 COMBOBOX IDC_DEFFILTER,172,56,122,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Default Event Filter",IDC_STATIC,12,59,145,8 + LTEXT "Default event filter",IDC_STATIC,12,59,145,8 GROUPBOX "Custom filters",IDC_STATIC,12,78,282,86 LISTBOX IDC_LIST_FILTERS,20,92,133,30, WS_TABSTOP | LBS_NOINTEGRALHEIGHT | WS_BORDER | WS_VSCROLL LISTBOX IDC_LIST_EVENTS,20,124,133,30, WS_TABSTOP | LBS_NOINTEGRALHEIGHT | WS_BORDER | WS_VSCROLL @@ -117,7 +117,7 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,65,270,10 CONTROL "Show event icons",IDC_SHOWEVENTS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,79,270,10 - CONTROL "Enable Smileys",IDC_SHOWSMILEYS, + CONTROL "Enable smileys",IDC_SHOWSMILEYS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,93,270,10 END @@ -131,17 +131,17 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,23,270,10 CONTROL "Search forward in message window",IDC_FORMES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,37,270,10 - CONTROL "Match Case",IDC_MATCHCASE, + CONTROL "Match case",IDC_MATCHCASE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,51,270,10 - CONTROL "Match Whole Word",IDC_MATCHWHOLE, + CONTROL "Match whole word",IDC_MATCHWHOLE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,65,270,10 - CONTROL "Only Incoming Messages",IDC_ONLYIN, + CONTROL "Only incoming messages",IDC_ONLYIN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,79,270,10 - CONTROL "Only Outgoing Messages",IDC_ONLYOUT, + CONTROL "Only outgoing messages",IDC_ONLYOUT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,93,270,10 - CONTROL "Only Selected Group",IDC_ONLYGROUP, + CONTROL "Only selected group",IDC_ONLYGROUP, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,107,270,10 - CONTROL "All Contacts",IDC_ALLCONTACTS, + CONTROL "All contacts",IDC_ALLCONTACTS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,121,270,10 END @@ -150,20 +150,20 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Export To Txt",IDC_STATIC,4,5,298,37 + GROUPBOX "Export to txt",IDC_STATIC,4,5,298,37 COMBOBOX IDC_TXTENC,142,20,152,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP LTEXT "File encoding*",IDC_STATIC,12,23,115,8 - GROUPBOX "Export To Plain Html",IDC_STATIC,4,47,298,50 + GROUPBOX "Export to plain HTML",IDC_STATIC,4,47,298,50 COMBOBOX IDC_HTML1ENC,142,62,152,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP LTEXT "File encoding*",IDC_STATIC,12,65,115,8 CONTROL "Show date in timestamps",IDC_HTML1DATE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,80,270,10 - GROUPBOX "Export To Rich Html",IDC_STATIC,4,102,298,80 + GROUPBOX "Export to rich HTML",IDC_STATIC,4,102,298,80 COMBOBOX IDC_HTML2ENC,142,117,152,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP LTEXT "File encoding*",IDC_STATIC,12,120,115,8 CONTROL "Show date in timestamps",IDC_HTML2DATE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,135,270,10 - CONTROL "Enable Smileys",IDC_HTML2SHOWSMILEYS, + CONTROL "Enable smileys",IDC_HTML2SHOWSMILEYS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,149,270,10 CONTROL "External CSS file",IDC_HTML2EXTCSS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,163,115,10 diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index b017c33188..ee6d36e9a7 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -101,7 +101,7 @@ void InitMenuItems() SET_UID(mi, 0x28848d7a, 0x6995, 0x4799, 0x82, 0xd7, 0x18, 0x40, 0x3d, 0xe3, 0x71, 0xc4); mi.position = 1000090000; mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY); - mi.name.a = LPGEN("View &History"); + mi.name.a = LPGEN("View &history"); mi.pszService = MS_HISTORY_SHOWCONTACTHISTORY; hContactMenu = Menu_AddContactMenuItem(&mi); @@ -112,7 +112,7 @@ void InitMenuItems() SET_UID(mi, 0x63929694, 0x2d3d, 0x4c5d, 0xa5, 0x2b, 0x64, 0x59, 0x72, 0x23, 0xe, 0x66); mi.position = 1000090001; mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE); - mi.name.a = LPGEN("Delete All User History"); + mi.name.a = LPGEN("Delete all user history"); mi.pszService = MS_HISTORY_DELETEALLCONTACTHISTORY; hDeleteContactMenu = Menu_AddContactMenuItem(&mi); @@ -160,10 +160,10 @@ IconItem iconList[] = { LPGEN("Incoming message"), "BasicHistory_in", IDI_INM }, { LPGEN("Outgoing message"), "BasicHistory_out", IDI_OUTM }, { LPGEN("Status change"), "BasicHistory_status", IDI_STATUS }, - { LPGEN("Show Contacts"), "BasicHistory_show", IDI_SHOW }, - { LPGEN("Hide Contacts"), "BasicHistory_hide", IDI_HIDE }, - { LPGEN("Find Next"), "BasicHistory_findnext", IDI_FINDNEXT }, - { LPGEN("Find Previous"), "BasicHistory_findprev", IDI_FINDPREV }, + { LPGEN("Show contacts"), "BasicHistory_show", IDI_SHOW }, + { LPGEN("Hide contacts"), "BasicHistory_hide", IDI_HIDE }, + { LPGEN("Find next"), "BasicHistory_findnext", IDI_FINDNEXT }, + { LPGEN("Find previous"), "BasicHistory_findprev", IDI_FINDPREV }, { LPGEN("Plus in export"), "BasicHistory_plusex", IDI_PLUSEX }, { LPGEN("Minus in export"), "BasicHistory_minusex", IDI_MINUSEX }, }; diff --git a/plugins/BasicHistory/src/EventList.cpp b/plugins/BasicHistory/src/EventList.cpp index 460fcddac0..829d636c96 100644 --- a/plugins/BasicHistory/src/EventList.cpp +++ b/plugins/BasicHistory/src/EventList.cpp @@ -447,7 +447,7 @@ std::wstring HistoryEventList::GetContactId() static void GetMessageDescription(DBEVENTINFO *dbei, wchar_t* buf, int cbBuf) { wchar_t *msg = DbEvent_GetTextW(dbei, CP_ACP); - wcsncpy_s(buf, cbBuf, msg ? msg : TranslateT("Invalid Message"), _TRUNCATE); + wcsncpy_s(buf, cbBuf, msg ? msg : TranslateT("Invalid message"), _TRUNCATE); buf[cbBuf - 1] = 0; mir_free(msg); } diff --git a/plugins/BasicHistory/src/ExportManager.cpp b/plugins/BasicHistory/src/ExportManager.cpp index 111a813ed7..5eda574647 100644 --- a/plugins/BasicHistory/src/ExportManager.cpp +++ b/plugins/BasicHistory/src/ExportManager.cpp @@ -41,7 +41,7 @@ std::wstring GetFile(const wchar_t* ext, HWND hwnd, bool open) wcscpy_s(extUpper, ext); extUpper[0] = std::toupper(ext[0], loc); - mir_snwprintf(filter, TranslateT("%s Files (*.%s)"), extUpper, ext); + mir_snwprintf(filter, TranslateT("%s files (*.%s)"), extUpper, ext); size_t len = mir_wstrlen(filter) + 1; mir_snwprintf(filter + len, _countof(filter) - len, L"*.%s", ext); len += mir_wstrlen(filter + len); diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp index f24c7792c3..4f035f5255 100644 --- a/plugins/BasicHistory/src/HistoryWindow.cpp +++ b/plugins/BasicHistory/src/HistoryWindow.cpp @@ -389,7 +389,7 @@ INT_PTR HistoryWindow::DeleteAllUserHistory(WPARAM hContact, LPARAM) } wchar_t *message = TranslateT("This operation will PERMANENTLY REMOVE all history for this contact.\nAre you sure you want to do this?"); - if (MessageBox(hWnd, message, TranslateT("Are You sure?"), MB_OKCANCEL | MB_ICONERROR) != IDOK) + if (MessageBox(hWnd, message, TranslateT("Are you sure?"), MB_OKCANCEL | MB_ICONERROR) != IDOK) return FALSE; db_set_safety_mode(FALSE); @@ -402,7 +402,7 @@ INT_PTR HistoryWindow::DeleteAllUserHistory(WPARAM hContact, LPARAM) if (HistoryEventList::IsImportedHistory(hContact)) { message = TranslateT("Do you want to delete all imported messages for this contact?\nNote that next scheduler task import this messages again."); - if (MessageBox(hWnd, message, TranslateT("Are You sure?"), MB_YESNO | MB_ICONERROR) == IDYES) + if (MessageBox(hWnd, message, TranslateT("Are you sure?"), MB_YESNO | MB_ICONERROR) == IDYES) HistoryEventList::DeleteImporter(hContact); } @@ -551,14 +551,14 @@ INT_PTR CALLBACK HistoryWindow::DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wP if (HIWORD(wParam) == BN_CLICKED) { if (Button_GetCheck(GetDlgItem(hwndDlg, IDC_SHOWHIDE)) & BST_CHECKED) { SendDlgItemMessage(hwndDlg, IDC_SHOWHIDE, BM_SETIMAGE, IMAGE_ICON, (LPARAM)historyWindow->minusIco); - SendDlgItemMessage(hwndDlg, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Hide Contacts"), BATF_UNICODE); + SendDlgItemMessage(hwndDlg, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Hide contacts"), BATF_UNICODE); historyWindow->isContactList = true; ShowWindow(GetDlgItem(hwndDlg, IDC_LIST_CONTACTS), SW_SHOW); ShowWindow(historyWindow->splitterYhWnd, SW_SHOW); } else { SendDlgItemMessage(hwndDlg, IDC_SHOWHIDE, BM_SETIMAGE, IMAGE_ICON, (LPARAM)historyWindow->plusIco); - SendDlgItemMessage(hwndDlg, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Show Contacts"), BATF_UNICODE); + SendDlgItemMessage(hwndDlg, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Show contacts"), BATF_UNICODE); historyWindow->isContactList = false; ShowWindow(GetDlgItem(hwndDlg, IDC_LIST_CONTACTS), SW_HIDE); ShowWindow(historyWindow->splitterYhWnd, SW_HIDE); @@ -656,10 +656,10 @@ INT_PTR CALLBACK HistoryWindow::DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wP AppendMenu(hPopupMenu, MF_STRING, IDM_COPY, TranslateT("Copy")); AppendMenu(hPopupMenu, MF_STRING, IDM_DELETE, TranslateT("Delete")); AppendMenu(hPopupMenu, MFT_SEPARATOR, 0, nullptr); - AppendMenu(hPopupMenu, MF_STRING, IDM_MESSAGE, TranslateT("Send Message")); - AppendMenu(hPopupMenu, MF_STRING, IDM_QUOTE, TranslateT("Reply &Quoted")); - AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEGROUP, TranslateT("Delete Group")); - AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEUSER, TranslateT("Delete All User History")); + AppendMenu(hPopupMenu, MF_STRING, IDM_MESSAGE, TranslateT("Send message")); + AppendMenu(hPopupMenu, MF_STRING, IDM_QUOTE, TranslateT("Reply "ed")); + AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEGROUP, TranslateT("Delete group")); + AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEUSER, TranslateT("Delete all user history")); } int selected = TrackPopupMenu(hPopupMenu, TPM_RETURNCMD, clicked.x, clicked.y, 0, hwndDlg, nullptr); @@ -833,10 +833,10 @@ INT_PTR CALLBACK HistoryWindow::DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wP HMENU hPopupMenu = CreatePopupMenu(); if (hPopupMenu != nullptr) { AppendMenu(hPopupMenu, MF_STRING, IDM_COPY, TranslateT("Copy")); - AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEGROUP, TranslateT("Delete Group")); + AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEGROUP, TranslateT("Delete group")); AppendMenu(hPopupMenu, MFT_SEPARATOR, 0, nullptr); - AppendMenu(hPopupMenu, MF_STRING, IDM_MESSAGE, TranslateT("Send Message")); - AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEUSER, TranslateT("Delete All User History")); + AppendMenu(hPopupMenu, MF_STRING, IDM_MESSAGE, TranslateT("Send message")); + AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEUSER, TranslateT("Delete all user history")); int selected = TrackPopupMenu(hPopupMenu, TPM_RETURNCMD, clicked.x, clicked.y, 0, hwndDlg, nullptr); switch (selected) { @@ -973,13 +973,13 @@ void HistoryWindow::Initialise() SendDlgItemMessage(m_hWnd, IDC_SHOWHIDE, BUTTONSETASFLATBTN, TRUE, 0); if (m_hContact == NULL || Options::instance->showContacts) { SendDlgItemMessage(m_hWnd, IDC_SHOWHIDE, BM_SETIMAGE, IMAGE_ICON, (LPARAM)minusIco); - SendDlgItemMessage(m_hWnd, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Hide Contacts"), BATF_UNICODE); + SendDlgItemMessage(m_hWnd, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Hide contacts"), BATF_UNICODE); Button_SetCheck(GetDlgItem(m_hWnd, IDC_SHOWHIDE), BST_CHECKED); isContactList = true; } else { SendDlgItemMessage(m_hWnd, IDC_SHOWHIDE, BM_SETIMAGE, IMAGE_ICON, (LPARAM)plusIco); - SendDlgItemMessage(m_hWnd, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Show Contacts"), BATF_UNICODE); + SendDlgItemMessage(m_hWnd, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Show contacts"), BATF_UNICODE); Button_SetCheck(GetDlgItem(m_hWnd, IDC_SHOWHIDE), BST_UNCHECKED); ShowWindow(GetDlgItem(m_hWnd, IDC_LIST_CONTACTS), SW_HIDE); ShowWindow(splitterYhWnd, SW_HIDE); @@ -1061,7 +1061,7 @@ void HistoryWindow::Initialise() TBBUTTON tbButtons[] = { - { 0, IDM_FIND, TBSTATE_ENABLED, BTNS_DROPDOWN, {0}, 0, (INT_PTR)TranslateT("Find Next") }, + { 0, IDM_FIND, TBSTATE_ENABLED, BTNS_DROPDOWN, {0}, 0, (INT_PTR)TranslateT("Find next") }, { 3, IDM_DELETE, TBSTATE_ENABLED, BTNS_DROPDOWN, {0}, 0, (INT_PTR)TranslateT("Delete")}, { 2, IDM_CONFIG, TBSTATE_ENABLED, BTNS_DROPDOWN, {0}, 0, (INT_PTR)TranslateT("Options")}, }; @@ -1657,15 +1657,15 @@ void HistoryWindow::FindToolbarClicked(LPNMTOOLBAR lpnmTB) MapWindowPoints(lpnmTB->hdr.hwndFrom, HWND_DESKTOP, (LPPOINT)&rc, 2); HMENU hPopupMenu = CreatePopupMenu(); if (hPopupMenu != nullptr) { - AppendMenu(hPopupMenu, MF_STRING, IDM_FINDNEXT, TranslateT("Find Next")); - AppendMenu(hPopupMenu, MF_STRING, IDM_FINDPREV, TranslateT("Find Previous")); + AppendMenu(hPopupMenu, MF_STRING, IDM_FINDNEXT, TranslateT("Find next")); + AppendMenu(hPopupMenu, MF_STRING, IDM_FINDPREV, TranslateT("Find previous")); AppendMenu(hPopupMenu, MFT_SEPARATOR, 0, nullptr); - AppendMenu(hPopupMenu, searcher.IsMatchCase() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_MATCHCASE, TranslateT("Match Case")); - AppendMenu(hPopupMenu, searcher.IsMatchWholeWords() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_MATCHWHOLE, TranslateT("Match Whole Word")); - AppendMenu(hPopupMenu, searcher.IsOnlyIn() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYIN, TranslateT("Only Incoming Messages")); - AppendMenu(hPopupMenu, searcher.IsOnlyOut() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYOUT, TranslateT("Only Outgoing Messages")); - AppendMenu(hPopupMenu, searcher.IsOnlyGroup() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYGROUP, TranslateT("Only Selected Group")); - AppendMenu(hPopupMenu, searcher.IsAllUsers() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ALLUSERS, TranslateT("All Contacts")); + AppendMenu(hPopupMenu, searcher.IsMatchCase() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_MATCHCASE, TranslateT("Match case")); + AppendMenu(hPopupMenu, searcher.IsMatchWholeWords() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_MATCHWHOLE, TranslateT("Match whole word")); + AppendMenu(hPopupMenu, searcher.IsOnlyIn() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYIN, TranslateT("Only incoming messages")); + AppendMenu(hPopupMenu, searcher.IsOnlyOut() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYOUT, TranslateT("Only outgoing messages")); + AppendMenu(hPopupMenu, searcher.IsOnlyGroup() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYGROUP, TranslateT("Only selected group")); + AppendMenu(hPopupMenu, searcher.IsAllUsers() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ALLUSERS, TranslateT("All contacts")); AppendMenu(hPopupMenu, MFT_SEPARATOR, 0, nullptr); HMENU hFilterMenu = CreatePopupMenu(); int filter = GetFilterNr(); @@ -1745,8 +1745,8 @@ void HistoryWindow::ConfigToolbarClicked(LPNMTOOLBAR lpnmTB) AppendMenu(hPopupMenu, MFT_SEPARATOR, 0, nullptr); HMENU hExportMenu = CreatePopupMenu(); - AppendMenu(hExportMenu, MF_STRING, IDM_EXPORTRHTML, TranslateT("Rich Html")); - AppendMenu(hExportMenu, MF_STRING, IDM_EXPORTPHTML, TranslateT("Plain Html")); + AppendMenu(hExportMenu, MF_STRING, IDM_EXPORTRHTML, TranslateT("Rich HTML")); + AppendMenu(hExportMenu, MF_STRING, IDM_EXPORTPHTML, TranslateT("Plain HTML")); AppendMenu(hExportMenu, MF_STRING, IDM_EXPORTTXT, TranslateT("Txt")); AppendMenu(hExportMenu, MF_STRING, IDM_EXPORTBINARY, TranslateT("Binary")); AppendMenu(hExportMenu, MF_STRING, IDM_EXPORTDAT, TranslateT("Dat (mContacts)")); @@ -1873,8 +1873,8 @@ void HistoryWindow::DeleteToolbarClicked(LPNMTOOLBAR lpnmTB) HMENU hPopupMenu = CreatePopupMenu(); if (hPopupMenu != nullptr) { AppendMenu(hPopupMenu, MF_STRING, IDM_DELETE, TranslateT("Delete")); - AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEGROUP, TranslateT("Delete Group")); - AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEUSER, TranslateT("Delete All User History")); + AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEGROUP, TranslateT("Delete group")); + AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEUSER, TranslateT("Delete all user history")); SetMenuDefaultItem(hPopupMenu, IDM_DELETE, FALSE); int iResult = TrackPopupMenu(hPopupMenu, TPM_RETURNCMD, rc.left, rc.bottom, 0, m_hWnd, nullptr); @@ -1931,7 +1931,7 @@ void HistoryWindow::Delete(int what) wchar_t message[256]; mir_snwprintf(message, TranslateT("Number of history items to delete: %d.\nAre you sure you want to do this?"), toDelete); - if (MessageBox(m_hWnd, message, TranslateT("Are You sure?"), MB_OKCANCEL | MB_ICONERROR) != IDOK) + if (MessageBox(m_hWnd, message, TranslateT("Are you sure?"), MB_OKCANCEL | MB_ICONERROR) != IDOK) return; bool areImpMessages = false; @@ -1946,7 +1946,7 @@ void HistoryWindow::Delete(int what) if (areImpMessages) { wchar_t *ptszMsg = TranslateT("Do you want to delete all imported messages for this contact?\nNote that next scheduler task import this messages again."); - if (MessageBox(m_hWnd, ptszMsg, TranslateT("Are You sure?"), MB_YESNO | MB_ICONERROR) == IDYES) { + if (MessageBox(m_hWnd, ptszMsg, TranslateT("Are you sure?"), MB_YESNO | MB_ICONERROR) == IDYES) { HistoryEventList::DeleteImporter(m_hContact); rebuild = true; } diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index cb54dcad5d..abb6c6dcf2 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -208,23 +208,23 @@ static ColorOptionsList g_ColorOptionsList[] = { static HotkeyOptionsList g_HotkeyOptionsList[] = { { "basichistory_hot_showall", LPGENW("Open global history"), LPGENW("History"), MS_HISTORY_SHOWCONTACTHISTORY, HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, 'H') | HKF_MIRANDA_LOCAL, 0 }, { "basichistory_hot_find", LPGENW("Find"), LPGENW("History"), nullptr, HOTKEYCODE(HOTKEYF_CONTROL, 'F'), HISTORY_HK_FIND }, - { "basichistory_hot_findnext", LPGENW("Find Next"), LPGENW("History"), nullptr, VK_F3, HISTORY_HK_FINDNEXT }, - { "basichistory_hot_findprev", LPGENW("Find Previous"), LPGENW("History"), nullptr, VK_F2, HISTORY_HK_FINDPREV }, - { "basichistory_hot_matchcase", LPGENW("Switch Match Case"), LPGENW("History"), nullptr, 0, HISTORY_HK_MATCHCASE }, - { "basichistory_hot_matchwhole", LPGENW("Switch Match Whole Word"), LPGENW("History"), nullptr, 0, HISTORY_HK_MATCHWHOLE }, - { "basichistory_hot_showcontacts", LPGENW("Show/Hide Contacts"), LPGENW("History"), nullptr, 0, HISTORY_HK_SHOWCONTACTS }, - { "basichistory_hot_onlyin", LPGENW("Switch Only Incoming Messages"), LPGENW("History"), nullptr, 0, HISTORY_HK_ONLYIN }, - { "basichistory_hot_onlyout", LPGENW("Switch Only Outgoing Messages"), LPGENW("History"), nullptr, 0, HISTORY_HK_ONLYOUT }, - { "basichistory_hot_onlygroup", LPGENW("Switch Only Selected Group"), LPGENW("History"), nullptr, 0, HISTORY_HK_ONLYGROUP }, - { "basichistory_hot_allcontacts", LPGENW("Switch All Contacts"), LPGENW("History"), nullptr, 0, HISTORY_HK_ALLCONTACTS }, + { "basichistory_hot_findnext", LPGENW("Find next"), LPGENW("History"), nullptr, VK_F3, HISTORY_HK_FINDNEXT }, + { "basichistory_hot_findprev", LPGENW("Find previous"), LPGENW("History"), nullptr, VK_F2, HISTORY_HK_FINDPREV }, + { "basichistory_hot_matchcase", LPGENW("Switch match case"), LPGENW("History"), nullptr, 0, HISTORY_HK_MATCHCASE }, + { "basichistory_hot_matchwhole", LPGENW("Switch match whole word"), LPGENW("History"), nullptr, 0, HISTORY_HK_MATCHWHOLE }, + { "basichistory_hot_showcontacts", LPGENW("Show/hide contacts"), LPGENW("History"), nullptr, 0, HISTORY_HK_SHOWCONTACTS }, + { "basichistory_hot_onlyin", LPGENW("Switch only incoming messages"), LPGENW("History"), nullptr, 0, HISTORY_HK_ONLYIN }, + { "basichistory_hot_onlyout", LPGENW("Switch only outgoing messages"), LPGENW("History"), nullptr, 0, HISTORY_HK_ONLYOUT }, + { "basichistory_hot_onlygroup", LPGENW("Switch only selected group"), LPGENW("History"), nullptr, 0, HISTORY_HK_ONLYGROUP }, + { "basichistory_hot_allcontacts", LPGENW("Switch all contacts"), LPGENW("History"), nullptr, 0, HISTORY_HK_ALLCONTACTS }, { "basichistory_hot_delete", LPGENW("Delete"), LPGENW("History"), nullptr, VK_DELETE, HISTORY_HK_DELETE }, - { "basichistory_hot_exrhtml", LPGENW("Export To Rich Html"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXRHTML }, - { "basichistory_hot_exphtml", LPGENW("Export To Plain Html"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXPHTML }, - { "basichistory_hot_extxt", LPGENW("Export To Txt"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXTXT }, - { "basichistory_hot_exbin", LPGENW("Export To Binary"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXBIN }, - { "basichistory_hot_impbin", LPGENW("Import From Binary"), LPGENW("History"), nullptr, 0, HISTORY_HK_IMPBIN }, - { "basichistory_hot_exdat", LPGENW("Export To Dat (mContacts)"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXDAT }, - { "basichistory_hot_impdat", LPGENW("Import From Dat (mContacts)"), LPGENW("History"), nullptr, 0, HISTORY_HK_IMPDAT }, + { "basichistory_hot_exrhtml", LPGENW("Export to rich HTML"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXRHTML }, + { "basichistory_hot_exphtml", LPGENW("Export to plain HTML"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXPHTML }, + { "basichistory_hot_extxt", LPGENW("Export to txt"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXTXT }, + { "basichistory_hot_exbin", LPGENW("Export to binary"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXBIN }, + { "basichistory_hot_impbin", LPGENW("Import from binary"), LPGENW("History"), nullptr, 0, HISTORY_HK_IMPBIN }, + { "basichistory_hot_exdat", LPGENW("Export to dat (mContacts)"), LPGENW("History"), nullptr, 0, HISTORY_HK_EXDAT }, + { "basichistory_hot_impdat", LPGENW("Import from dat (mContacts)"), LPGENW("History"), nullptr, 0, HISTORY_HK_IMPDAT }, }; const int g_fontsSize = _countof(g_FontOptionsList); @@ -800,11 +800,11 @@ bool OpenFileDlg(HWND hwndDlg, HWND hwndEdit, const wchar_t* defName, const wcha wchar_t extUpper[32]; wcscpy_s(extUpper, ext); extUpper[0] = std::toupper(ext[0], loc); - mir_snwprintf(filter, TranslateT("%s Files (*.%s)"), extUpper, ext); + mir_snwprintf(filter, TranslateT("%s files (*.%s)"), extUpper, ext); size_t len = mir_wstrlen(filter) + 1; mir_snwprintf(filter + len, _countof(filter) - len, L"*.%s", ext); len += mir_wstrlen(filter + len) + 1; - wcscpy_s(filter + len, 1024 - len, TranslateT("All Files (*.*)")); + wcscpy_s(filter + len, 1024 - len, TranslateT("All files (*.*)")); len += mir_wstrlen(filter + len) + 1; wcscpy_s(filter + len, 1024 - len, L"*.*"); len += mir_wstrlen(filter + len) + 1; @@ -1614,9 +1614,9 @@ INT_PTR CALLBACK Options::DlgProcOptsTask(HWND hwndDlg, UINT msg, WPARAM wParam, ComboBox_AddString(comboType, TranslateT("Export")); ComboBox_AddString(comboType, TranslateT("Delete")); - ComboBox_AddString(comboType, TranslateT("Export and Delete")); + ComboBox_AddString(comboType, TranslateT("Export and delete")); ComboBox_AddString(comboType, TranslateT("Import")); - ComboBox_AddString(comboType, TranslateT("Import and Merge")); + ComboBox_AddString(comboType, TranslateT("Import and merge")); ComboBox_SetCurSel(comboType, to->type); Edit_LimitText(GetDlgItem(hwndDlg, IDC_EVENT_TIME), 6); @@ -1640,8 +1640,8 @@ INT_PTR CALLBACK Options::DlgProcOptsTask(HWND hwndDlg, UINT msg, WPARAM wParam, } ComboBox_SetCurSel(filter, selFilter); - ComboBox_AddString(trigerType, TranslateT("At Start")); - ComboBox_AddString(trigerType, TranslateT("At Finish")); + ComboBox_AddString(trigerType, TranslateT("At start")); + ComboBox_AddString(trigerType, TranslateT("At finish")); ComboBox_AddString(trigerType, TranslateT("Daily")); ComboBox_AddString(trigerType, TranslateT("Weekly")); ComboBox_AddString(trigerType, TranslateT("Monthly")); @@ -1649,8 +1649,8 @@ INT_PTR CALLBACK Options::DlgProcOptsTask(HWND hwndDlg, UINT msg, WPARAM wParam, ComboBox_AddString(trigerType, TranslateT("Delta time (hours)")); ComboBox_SetCurSel(trigerType, to->trigerType); - ComboBox_AddString(exportType, TranslateT("Rich Html")); - ComboBox_AddString(exportType, TranslateT("Plain Html")); + ComboBox_AddString(exportType, TranslateT("Rich HTML")); + ComboBox_AddString(exportType, TranslateT("Plain HTML")); ComboBox_AddString(exportType, TranslateT("Txt")); ComboBox_AddString(exportType, TranslateT("Binary")); ComboBox_AddString(exportType, TranslateT("Dat (mContacts)")); diff --git a/plugins/BasicHistory/src/PlainHtmlExport.cpp b/plugins/BasicHistory/src/PlainHtmlExport.cpp index b3eb92f664..c5d593f64b 100644 --- a/plugins/BasicHistory/src/PlainHtmlExport.cpp +++ b/plugins/BasicHistory/src/PlainHtmlExport.cpp @@ -32,7 +32,7 @@ void PlainHtmlExport::WriteHeader(const std::wstring&, const std::wstring &filte { EXP_FILE << L"\n"; EXP_FILE << L"\n\n"; - EXP_FILE << L"" << TranslateT("History Log") << L" [" << MakeTextHtmled(myName) << L"] - [" << MakeTextHtmled(name1) << L"]\n"; + EXP_FILE << L"" << TranslateT("History log") << L" [" << MakeTextHtmled(myName) << L"] - [" << MakeTextHtmled(name1) << L"]\n"; EXP_FILE << L"\n\n

" << TranslateT("History Log") << L"

\n

"; + EXP_FILE << L"-->\n\n

" << TranslateT("History log") << L"

\n

"; EXP_FILE << MakeTextHtmled(myName); if (proto1.length() || myId.length()) EXP_FILE << L" (" << MakeTextHtmled(proto1) << L": " << MakeTextHtmled(myId) << L") - "; diff --git a/plugins/BasicHistory/src/RichHtmlExport.cpp b/plugins/BasicHistory/src/RichHtmlExport.cpp index 68ab4257b9..5cb2bd9d73 100644 --- a/plugins/BasicHistory/src/RichHtmlExport.cpp +++ b/plugins/BasicHistory/src/RichHtmlExport.cpp @@ -315,7 +315,7 @@ void RichHtmlExport::WriteHeader(const std::wstring &fileName, const std::wstrin EXP_FILE << L"\n"; EXP_FILE << L"\n\n"; - EXP_FILE << L"" << TranslateT("History Log") << L" [" << MakeTextHtmled(myName) << L"] - [" << MakeTextHtmled(name1) << L"]\n"; + EXP_FILE << L"" << TranslateT("History log") << L" [" << MakeTextHtmled(myName) << L"] - [" << MakeTextHtmled(name1) << L"]\n"; EXP_FILE << L"\n"; EXP_FILE << L"\n"; EXP_FILE << L"\n"; @@ -338,7 +338,7 @@ void RichHtmlExport::WriteHeader(const std::wstring &fileName, const std::wstrin EXP_FILE << L"// -->\n"; EXP_FILE << L"\n"; - EXP_FILE << L"

" << TranslateT("History Log") << L"

\n

"; + EXP_FILE << L"

" << TranslateT("History log") << L"

\n

"; EXP_FILE << MakeTextHtmled(myName); if (proto1.length() || myId.length()) EXP_FILE << L" (" << MakeTextHtmled(proto1) << L": " << MakeTextHtmled(myId) << L") - "; diff --git a/plugins/BasicHistory/src/Searcher.cpp b/plugins/BasicHistory/src/Searcher.cpp index 092d927adb..68af6103f6 100644 --- a/plugins/BasicHistory/src/Searcher.cpp +++ b/plugins/BasicHistory/src/Searcher.cpp @@ -40,11 +40,11 @@ void Searcher::ChangeFindDirection(bool isBack) tbInfo.cbSize = sizeof(TBBUTTONINFO); tbInfo.dwMask = TBIF_TEXT | TBIF_IMAGE; if (isBack) { - tbInfo.pszText = TranslateT("Find Previous"); + tbInfo.pszText = TranslateT("Find previous"); tbInfo.iImage = 1; } else { - tbInfo.pszText = TranslateT("Find Next"); + tbInfo.pszText = TranslateT("Find next"); tbInfo.iImage = 0; } SendMessage(context->toolbarWindow, TB_SETBUTTONINFO, (WPARAM)IDM_FIND, (LPARAM)&tbInfo); diff --git a/plugins/BasicHistory/src/TxtExport.cpp b/plugins/BasicHistory/src/TxtExport.cpp index 45874d7276..58d135e387 100644 --- a/plugins/BasicHistory/src/TxtExport.cpp +++ b/plugins/BasicHistory/src/TxtExport.cpp @@ -27,7 +27,7 @@ TxtExport::~TxtExport() void TxtExport::WriteHeader(const std::wstring&, const std::wstring &filterName, const std::wstring &myName, const std::wstring &myId, const std::wstring &name1, const std::wstring &proto1, const std::wstring &id1, const std::string&, const std::wstring&) { wchar_t* start = TranslateT("###"); - EXP_FILE << start << "\n" << start << L" " << TranslateT("History Log") << L"\n"; + EXP_FILE << start << "\n" << start << L" " << TranslateT("History log") << L"\n"; EXP_FILE << start << L" " << myName; if (proto1.length() || myId.length()) EXP_FILE << L" (" << proto1 << L": " << myId << L") - "; -- cgit v1.2.3