diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/NewStory/res/resource.rc | 58 | ||||
-rw-r--r-- | plugins/NewStory/src/history.cpp | 16 | ||||
-rw-r--r-- | plugins/NewStory/src/main.cpp | 31 | ||||
-rw-r--r-- | plugins/NewStory/src/options.cpp | 14 | ||||
-rw-r--r-- | plugins/NewStory/src/templates.cpp | 4 |
5 files changed, 61 insertions, 62 deletions
diff --git a/plugins/NewStory/res/resource.rc b/plugins/NewStory/res/resource.rc index c2aa2bab8b..3fa2affdeb 100644 --- a/plugins/NewStory/res/resource.rc +++ b/plugins/NewStory/res/resource.rc @@ -58,7 +58,7 @@ ICO_TPLGROUP ICON "folder.ico" IDD_SEARCH DIALOGEX 0, 0, 264, 132 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Search Newstory" +CAPTION "Search history" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,152,111,51,15 @@ -75,7 +75,7 @@ END IDD_MESSAGE DIALOGEX 0, 0, 224, 173 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "View Single Message" +CAPTION "View single message" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "Close",IDCANCEL,167,149,50,17 @@ -87,7 +87,7 @@ END IDD_HISTORY DIALOGEX 0, 0, 380, 319 STYLE DS_SETFONT | DS_NOIDLEMSG | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "NewStory - New History for Miranda NG" +CAPTION "NewStory - new history for Miranda NG" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_MESSAGE,"MButtonClass",WS_TABSTOP,37,99,16,14 @@ -164,26 +164,26 @@ END IDD_FILTERMODE DIALOGEX 0, 0, 219, 171 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_NOPARENTNOTIFY -CAPTION "Message Filter" +CAPTION "Message filter" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,107,150,50,14 PUSHBUTTON "Cancel",IDCANCEL,161,150,50,14 - LTEXT "By Direction",IDC_STATIC,7,7,100,8 + LTEXT "By direction",IDC_STATIC,7,7,100,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,15,100,1 - CONTROL "Incoming Events",IDC_CHK_IN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,21,95,10 - CONTROL "Outgoing Events",IDC_CHK_OUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,31,95,10 - LTEXT "By Type",IDC_STATIC,7,46,100,8 + CONTROL "Incoming events",IDC_CHK_IN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,21,95,10 + CONTROL "Outgoing events",IDC_CHK_OUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,31,95,10 + LTEXT "By type",IDC_STATIC,7,46,100,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,54,100,1 CONTROL "Messages",IDC_CHK_MESSAGES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,60,95,10 - CONTROL "File Transfers",IDC_CHK_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,70,95,10 - CONTROL "URL Events",IDC_CHK_URL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,80,95,10 - CONTROL "Status Changes",IDC_CHK_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,90,95,10 - CONTROL "Other Events",IDC_CHK_OTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,100,95,10 + CONTROL "File transfers",IDC_CHK_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,70,95,10 + CONTROL "URL events",IDC_CHK_URL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,80,95,10 + CONTROL "Status changes",IDC_CHK_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,90,95,10 + CONTROL "Other events",IDC_CHK_OTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,100,95,10 CONTROL "Other",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,7,115,100,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,123,100,1 CONTROL "Search-Filter",IDC_CHK_AUTOFILTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,129,95,10 - LTEXT "By Date",IDC_STATIC,112,7,100,8,WS_DISABLED + LTEXT "By date",IDC_STATIC,112,7,100,8,WS_DISABLED CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,112,15,99,1 CONTROL "DateTimePicker1",IDC_DATETIMEPICKER1,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_LONGDATEFORMAT | WS_DISABLED | WS_TABSTOP,117,29,95,15 LTEXT "Since",IDC_STATIC,112,21,100,8,WS_DISABLED @@ -315,30 +315,30 @@ IDR_POPUPS MENU BEGIN POPUP "Export" BEGIN - MENUITEM "Save As...", ID_EXPORT_SAVEAS - MENUITEM "Save Selected As...", ID_EXPORT_SAVESELECTEDAS + MENUITEM "Save as...", ID_EXPORT_SAVEAS + MENUITEM "Save selected as...", ID_EXPORT_SAVESELECTEDAS END POPUP "Filter" BEGIN - MENUITEM "Show All Events", ID_FILTER_SHOWALLEVENTS, GRAYED - MENUITEM "Show Incoming Events Only", ID_FILTER_SHOWINCOMINGEVENTSONLY, GRAYED - MENUITEM "Show Outgoing Events Only", ID_FILTER_SHOWOUTGOINGEVENTSONLY, GRAYED - MENUITEM "Use Custom Filter...", ID_FILTER_USECUSTOMFILTER, GRAYED + MENUITEM "Show all events", ID_FILTER_SHOWALLEVENTS, GRAYED + MENUITEM "Show incoming events only", ID_FILTER_SHOWINCOMINGEVENTSONLY, GRAYED + MENUITEM "Show outgoing events only", ID_FILTER_SHOWOUTGOINGEVENTSONLY, GRAYED + MENUITEM "Use custom filter...", ID_FILTER_USECUSTOMFILTER, GRAYED MENUITEM SEPARATOR - MENUITEM "Incoming Events", ID_FILTER_INCOMING, CHECKED - MENUITEM "Outgoing Events", ID_FILTER_OUTGOING, CHECKED + MENUITEM "Incoming events", ID_FILTER_INCOMING, CHECKED + MENUITEM "Outgoing events", ID_FILTER_OUTGOING, CHECKED MENUITEM SEPARATOR - MENUITEM "Show Messages", ID_FILTER_MESSAGES, CHECKED - MENUITEM "Show File Transfers", ID_FILTER_FILES, CHECKED + MENUITEM "Show messages", ID_FILTER_MESSAGES, CHECKED + MENUITEM "Show file transfers", ID_FILTER_FILES, CHECKED MENUITEM "Show URLs", ID_FILTER_URLS, CHECKED - MENUITEM "Show Sign In/Out Events", ID_FILTER_STATUS, CHECKED - MENUITEM "Show Other Events", ID_FILTER_OTHER, CHECKED + MENUITEM "Show sign in/out events", ID_FILTER_STATUS, CHECKED + MENUITEM "Show other events", ID_FILTER_OTHER, CHECKED MENUITEM SEPARATOR - MENUITEM "Auto Search", ID_FILTER_AUTO + MENUITEM "Auto search", ID_FILTER_AUTO END - POPUP "Log Options" + POPUP "Log options" BEGIN - MENUITEM "Show Time Tree", ID_LOGOPTIONS_SHOWTIMETREE + MENUITEM "Show time tree", ID_LOGOPTIONS_SHOWTIMETREE MENUITEM SEPARATOR MENUITEM "Options...", ID_LOGOPTIONS_OPTIONS MENUITEM "Templates...", ID_LOGOPTIONS_TEMPLATES @@ -351,7 +351,7 @@ BEGIN MENUITEM "Export", 65535 MENUITEM "Delete", ID_CONTEXT_DELETE, GRAYED MENUITEM SEPARATOR - MENUITEM "Select All", ID_CONTEXT_SELECTALL + MENUITEM "Select all", ID_CONTEXT_SELECTALL END END diff --git a/plugins/NewStory/src/history.cpp b/plugins/NewStory/src/history.cpp index b7e11fa943..9496d3e5c0 100644 --- a/plugins/NewStory/src/history.cpp +++ b/plugins/NewStory/src/history.cpp @@ -414,12 +414,12 @@ public: btnFilter(this, IDC_FILTER, g_plugin.getIcon(ICO_FILTER), LPGEN("Filter")), btnSearch(this, IDC_SEARCH, g_plugin.getIcon(ICO_SEARCH), LPGEN("Search...")), btnOptions(this, IDC_LOGOPTIONS, g_plugin.getIcon(ICO_OPTIONS), LPGEN("Options")), - btnSendMsg(this, IDC_MESSAGE, g_plugin.getIcon(ICO_SENDMSG), LPGEN("Send Message")), - btnCalendar(this, IDC_DATEPOPUP, g_plugin.getIcon(ICO_CALENDAR), LPGEN("Jump2Date")), - btnUserInfo(this, IDC_USERINFO, g_plugin.getIcon(ICO_USERINFO), LPGEN("User Info")), - btnUserMenu(this, IDC_USERMENU, g_plugin.getIcon(ICO_USERMENU), LPGEN("User Menu")), - btnFindNext(this, IDC_FINDNEXT, g_plugin.getIcon(ICO_FINDNEXT), LPGEN("Find Next")), - btnFindPrev(this, IDC_FINDPREV, g_plugin.getIcon(ICO_FINDPREV), LPGEN("Find Previous")) + btnSendMsg(this, IDC_MESSAGE, g_plugin.getIcon(ICO_SENDMSG), LPGEN("Send message")), + btnCalendar(this, IDC_DATEPOPUP, g_plugin.getIcon(ICO_CALENDAR), LPGEN("Jump to date")), + btnUserInfo(this, IDC_USERINFO, g_plugin.getIcon(ICO_USERINFO), LPGEN("User info")), + btnUserMenu(this, IDC_USERMENU, g_plugin.getIcon(ICO_USERMENU), LPGEN("User menu")), + btnFindNext(this, IDC_FINDNEXT, g_plugin.getIcon(ICO_FINDNEXT), LPGEN("Find next")), + btnFindPrev(this, IDC_FINDPREV, g_plugin.getIcon(ICO_FINDPREV), LPGEN("Find previous")) { m_timeTree.OnSelChanged = Callback(this, &CHistoryDlg::onSelChanged_TimeTree); @@ -554,9 +554,9 @@ public: } else { if (m_hContact == INVALID_CONTACT_ID) - SetWindowText(m_hwnd, TranslateT("Newstory Search Results")); + SetWindowText(m_hwnd, TranslateT("History search results")); else - SetWindowText(m_hwnd, TranslateT("System Newstory")); + SetWindowText(m_hwnd, TranslateT("System history")); } if (m_hContact != INVALID_CONTACT_ID) diff --git a/plugins/NewStory/src/main.cpp b/plugins/NewStory/src/main.cpp index d32f484bac..9f0d2ec58e 100644 --- a/plugins/NewStory/src/main.cpp +++ b/plugins/NewStory/src/main.cpp @@ -42,30 +42,30 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_UIHIST static IconItem icons[] = { - { LPGEN("Main Icon"), "main", ICO_NEWSTORY }, - { LPGEN("User Info"), "userinfo", ICO_USERINFO }, - { LPGEN("User Menu"), "usermenu", ICO_USERMENU }, + { LPGEN("Main icon"), "main", ICO_NEWSTORY }, + { LPGEN("User info"), "userinfo", ICO_USERINFO }, + { LPGEN("User menu"), "usermenu", ICO_USERMENU }, { LPGEN("Search"), "search", ICO_SEARCH }, { LPGEN("Options"), "options", ICO_OPTIONS }, { LPGEN("Filter"), "filter", ICO_FILTER }, { LPGEN("Export"), "export", ICO_EXPORT }, { LPGEN("Copy"), "copy", ICO_COPY }, - { LPGEN("Send Message"), "message", ICO_SENDMSG }, + { LPGEN("Send message"), "message", ICO_SENDMSG }, - { LPGEN("Incoming Message"), "msgin", ICO_MSGIN }, - { LPGEN("Outgoing Message"), "msgout", ICO_MSGOUT }, - { LPGEN("User Signed In"), "signin", ICO_SIGNIN }, + { LPGEN("Incoming message"), "msgin", ICO_MSGIN }, + { LPGEN("Outgoing message"), "msgout", ICO_MSGOUT }, + { LPGEN("User signed in"), "signin", ICO_SIGNIN }, { LPGEN("File"), "file", ICO_FILE }, { LPGEN("URL"), "url", ICO_URL }, - { LPGEN("Unknown Event"), "unknown", ICO_UNKNOWN }, + { LPGEN("Unknown event"), "unknown", ICO_UNKNOWN }, - { LPGEN("Find Previous"), "findprev", ICO_FINDPREV }, - { LPGEN("Find Next"), "findnext", ICO_FINDNEXT }, - { LPGEN("Jump to Date"), "calendar", ICO_CALENDAR }, + { LPGEN("Find previous"), "findprev", ICO_FINDPREV }, + { LPGEN("Find next"), "findnext", ICO_FINDNEXT }, + { LPGEN("Jump to date"), "calendar", ICO_CALENDAR }, - { LPGEN("Template Group"), "tplgroup", ICO_TPLGROUP }, + { LPGEN("Template group"), "tplgroup", ICO_TPLGROUP }, { LPGEN("Reset"), "reset", ICO_RESET }, - { LPGEN("Update Preview"), "preview", ICO_PREVIEW }, + { LPGEN("Update preview"), "preview", ICO_PREVIEW }, { LPGEN("Help"), "varhelp", ICO_VARHELP } }; @@ -78,16 +78,15 @@ static int evtModulesLoaded(WPARAM, LPARAM) LoadTemplates(); CMenuItem mi(&g_plugin); - mi.flags = CMIF_UNICODE; mi.pszService = MS_HISTORY_SHOWCONTACTHISTORY; - mi.name.w = L"User Newstory"; + mi.name.a = LPGEN("User history"); mi.position = 1999990000; mi.hIcon = g_plugin.getIcon(ICO_NEWSTORY); Menu_AddContactMenuItem(&mi); mi.pszService = "Newstory/System"; - mi.name.w = L"System Newstory"; + mi.name.a = LPGEN("System history"); mi.position = 1999990000; mi.hIcon = g_plugin.getIcon(ICO_NEWSTORY); Menu_AddMainMenuItem(&mi); diff --git a/plugins/NewStory/src/options.cpp b/plugins/NewStory/src/options.cpp index 85b5d93d69..566a3c4bec 100644 --- a/plugins/NewStory/src/options.cpp +++ b/plugins/NewStory/src/options.cpp @@ -43,9 +43,9 @@ public: m_tree(this, IDC_TEMPLATES), preview(this, IDC_PREVIEW), gpreview(this, IDC_GPREVIEW), - btnDiscard(this, IDC_DISCARD, g_plugin.getIcon(ICO_RESET), LPGEN("Cancel Edit")), - bthVarHelp(this, IDC_VARHELP, g_plugin.getIcon(ICO_VARHELP), LPGEN("Help on Variables")), - btnPreview(this, IDC_UPDATEPREVIEW, g_plugin.getIcon(ICO_PREVIEW), LPGEN("Update Preview")) + btnDiscard(this, IDC_DISCARD, g_plugin.getIcon(ICO_RESET), LPGEN("Cancel edit")), + bthVarHelp(this, IDC_VARHELP, g_plugin.getIcon(ICO_VARHELP), LPGEN("Help on variables")), + btnPreview(this, IDC_UPDATEPREVIEW, g_plugin.getIcon(ICO_PREVIEW), LPGEN("Update preview")) { btnDiscard.OnClick = Callback(this, &COptionsDlg::onClick_Discard); btnPreview.OnClick = Callback(this, &COptionsDlg::UpdatePreview); @@ -150,11 +150,11 @@ public: L"%o", TranslateT("month"), L"%d", TranslateT("day of month"), L"%y", TranslateT("year"), - L"%w", TranslateT("day of week (Sunday, Monday.. translateable)"), + L"%w", TranslateT("day of week (Sunday, Monday... translatable)"), L"%p", TranslateT("am/pm symbol"), - L"%O", TranslateT("name of month, translateable"), + L"%O", TranslateT("name of month, translatable"), L"%M", TranslateT("the message string itself")); - MessageBox(m_hwnd, wszVarHelp, TranslateT("Variables Help"), MB_OK); + MessageBox(m_hwnd, wszVarHelp, TranslateT("Variables help"), MB_OK); } void onSelChanged(CCtrlTreeView::TEventInfo*) @@ -208,7 +208,7 @@ int OptionsInitialize(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = {}; odp.position = 100000000; odp.szGroup.a = LPGEN("History"); - odp.szTitle.a = LPGEN("Newstory"); + odp.szTitle.a = LPGEN("NewStory"); odp.flags = ODPF_BOLDGROUPS; odp.szTab.a = LPGEN("Templates"); diff --git a/plugins/NewStory/src/templates.cpp b/plugins/NewStory/src/templates.cpp index e7cdfb8718..ac8ca68f26 100644 --- a/plugins/NewStory/src/templates.cpp +++ b/plugins/NewStory/src/templates.cpp @@ -220,7 +220,7 @@ void vfEvent(int, TemplateVars *vars, MCONTACT, HistoryArray::ItemData *item) _tcsftime(buf, _countof(buf), L"%Y", _localtime32((__time32_t *)&item->dbe.timestamp)); vars->SetVar('y', buf, true); - // %w: day of week (Sunday, Monday.. translateable) + // %w: day of week (Sunday, Monday... translatable) _tcsftime(buf, _countof(buf), L"%A", _localtime32((__time32_t *)&item->dbe.timestamp)); vars->SetVar('w', TranslateW(buf), false); @@ -228,7 +228,7 @@ void vfEvent(int, TemplateVars *vars, MCONTACT, HistoryArray::ItemData *item) _tcsftime(buf, _countof(buf), L"%p", _localtime32((__time32_t *)&item->dbe.timestamp)); vars->SetVar('p', buf, true); - // %O: Name of month, translateable + // %O: Name of month, translatable _tcsftime(buf, _countof(buf), L"%B", _localtime32((__time32_t *)&item->dbe.timestamp)); vars->SetVar('O', TranslateW(buf), false); } |