From 6afd5a9421cc17b373660dffcdffafa23fb9982f Mon Sep 17 00:00:00 2001 From: Dart Raiden Date: Mon, 23 Dec 2013 19:52:23 +0000 Subject: spelling corrections langpacks/russian: update git-svn-id: http://svn.miranda-ng.org/main/trunk@7359 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CmdLine/src/mimcmd_data.h | 2 +- plugins/Folders/src/dlg_handlers.cpp | 4 ++-- protocols/AimOscar/src/server.cpp | 2 +- protocols/MSN/src/msn_commands.cpp | 2 +- protocols/MSN/src/msn_p2p.cpp | 6 +++--- protocols/Twitter/res/twitter.rc | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/CmdLine/src/mimcmd_data.h b/plugins/CmdLine/src/mimcmd_data.h index 03500c69b4..9945c30421 100644 --- a/plugins/CmdLine/src/mimcmd_data.h +++ b/plugins/CmdLine/src/mimcmd_data.h @@ -105,7 +105,7 @@ typedef TSharedData *PSharedData; #define MIMCMD_HELP_PROXY LPGEN("Configures proxy settings either globally or per account.\nUsage: proxy (global|) [].\n is one of the following settings:\n status (disable | enable | toggle)\n server .") #define MIMCMD_HELP_CONTACTS LPGEN("Allows you to search/list contacts or open a message windows for specified contacts.\nUsage:\n contacts list [ [account:] [id:] [status:] [ [...]]].\nThe command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:'. To search for contacts that have a certain ID use the keyword 'id:'. To search for contacts that have a certain status use 'status:'.\n contacts open [ [account:] [id:] [status:] [ [...]]].\nThe command will open a message window for all contacts that match the search criteria. To search for a specific account use the keyword 'account:'. To search for contacts that have a certain ID use the keyword 'id:'. To search for contacts that have a certain status use 'status:'. If no keyword is specified the command will open a message window for all contacts that have unread messages.") #define MIMCMD_HELP_HISTORY LPGEN("Shows history or unread messages for a contact.\nUsage: history .\n is one of the following commands:\n unread - show unread messages for that contact.\n show - show history from event number to . If any number is negative it is interpreted as a relative index from the last event number +1 (so the last event for a contact is -1).") -#define MIMCMD_HELP_VERSION LPGEN("Shows version information for Miranda and CmdLine plugin. If VersionInfo plugin is installed it will use its report instead.\nUsage: version.\nThe command will print Miranda's and CmdLine's version numbers or, if VersionInfo plugin is installed, it will show VersionInfo's report.") +#define MIMCMD_HELP_VERSION LPGEN("Shows version information for Miranda and CmdLine plugin. If VersionInfo plugin is installed it will use its report instead.\nUsage: version.\nThe command will print Miranda and CmdLine's version numbers or, if VersionInfo plugin is installed, it will show VersionInfo's report.") #define MIMCMD_HELP_SETNICKNAME LPGEN("Changes the user's nickname on the given protocol to the new name.\nUsage: setnickname new_nickname.") #define MIMCMD_HELP_IGNORE LPGEN("Ignores or removes ignore flags for specific contacts.\nUsage:\n ignore (block | unblock) [ [ [...]]].\nThe command will set or remove ignore flags for the specified contacts") diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp index f90dcb5485..2b0ea2f003 100644 --- a/plugins/Folders/src/dlg_handlers.cpp +++ b/plugins/Folders/src/dlg_handlers.cpp @@ -133,7 +133,7 @@ static INT_PTR CALLBACK DlgProcVariables(HWND hWnd, UINT msg, WPARAM wParam, LPA TranslateT("Expands to your profile path - the value found in mirandaboot.ini,"), TranslateT("ProfileDir section (usually inside Miranda\'s folder)."), TranslateT("Expands to your current profile name without the extenstion."), - TranslateT("(e.g.default if your your profile is default.dat)."), + TranslateT("(e.g. default if your your profile is default.dat)."), TranslateT("Environment variables"), TranslateT("The plugin can also expand environment variables; the variables are specified like in any other"), TranslateT("program that can use environment variables, i.e. %%."), @@ -142,7 +142,7 @@ static INT_PTR CALLBACK DlgProcVariables(HWND hWnd, UINT msg, WPARAM wParam, LPA TranslateT("instead of expanding to Miranda\'s profile path."), TranslateT("Examples:"), TranslateT("If the value for the ProfileDir inside mirandaboot.ini, ProfileDir section is \'.\\profiles\\', current"), - TranslateT("profile is \'default.dat\' and Miranda\'s path is \'c:\\program files\\miranda ng\\' then:"), + TranslateT("profile is \'default.dat\' and Miranda path is \'c:\\program files\\miranda ng\\' then:"), TranslateT("will expand to \'c:\\program files\\miranda ng\'"), TranslateT("will expand to \'c:\\program files\\miranda ng\\profiles\'"), TranslateT("will expand to \'default\'"), diff --git a/protocols/AimOscar/src/server.cpp b/protocols/AimOscar/src/server.cpp index 0ab3d91872..d45fd61412 100644 --- a/protocols/AimOscar/src/server.cpp +++ b/protocols/AimOscar/src/server.cpp @@ -1455,7 +1455,7 @@ void CAimProto::snac_received_message(SNAC &snac,HANDLE hServerConn,unsigned sho else if (channel == 6) // Audio/Video call { aim_file_ad(hServerConn, seqno, sn, icbm_cookie, true, 0); - ShowPopup(LPGEN("Contact tried to open an audio/video conference (currently not supported)"), ERROR_POPUP); + ShowPopup(LPGEN("Contact tried to open an audio/video conference (not currently supported)"), ERROR_POPUP); } mir_free(sn); diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp index 4821dd4c67..7254276101 100644 --- a/protocols/MSN/src/msn_commands.cpp +++ b/protocols/MSN/src/msn_commands.cpp @@ -123,7 +123,7 @@ void CMsnProto::sttInviteMessage(ThreadData* info, char* msgBody, char* email, c if (!strcmp(AppGUID, "{02D3C01F-BF30-4825-A83A-DE7AF41648AA}")) { MSN_ShowPopup(info->getContactHandle(), - TranslateT("Contact tried to open an audio conference (currently not supported)"), + TranslateT("Contact tried to open an audio conference (not currently supported)"), MSN_ALLOW_MSGBOX); return; } diff --git a/protocols/MSN/src/msn_p2p.cpp b/protocols/MSN/src/msn_p2p.cpp index bfc5fc0d96..43857f7483 100644 --- a/protocols/MSN/src/msn_p2p.cpp +++ b/protocols/MSN/src/msn_p2p.cpp @@ -1336,12 +1336,12 @@ void CMsnProto::p2p_InitFileTransfer( case MSN_APPID_WEBCAM: if (!_stricmp(szEufGuid, "{4BD96FC0-AB17-4425-A14A-439185962DC8}")) { MSN_ShowPopup(ft->std.hContact, - TranslateT("Contact tried to send its webcam data (currently not supported)"), + TranslateT("Contact tried to send its webcam data (not currently supported)"), MSN_ALLOW_MSGBOX | MSN_SHOW_ERROR); } if (!_stricmp(szEufGuid, "{1C9AA97E-9C05-4583-A3BD-908A196F1E92}")) { MSN_ShowPopup(ft->std.hContact, - TranslateT("Contact tried to view our webcam data (currently not supported)"), + TranslateT("Contact tried to view our webcam data (not currently supported)"), MSN_ALLOW_MSGBOX | MSN_SHOW_ERROR); } p2p_sendStatus(ft, 603); @@ -1350,7 +1350,7 @@ void CMsnProto::p2p_InitFileTransfer( case MSN_APPID_MEDIA_SHARING: // MSN_ShowPopup(ft->std.hContact, -// TranslateT("Contact tried to share media with us (currently not supported)"), +// TranslateT("Contact tried to share media with us (not currently supported)"), // MSN_ALLOW_MSGBOX | MSN_SHOW_ERROR); p2p_sendStatus(ft, 603); p2p_unregisterSession(ft); diff --git a/protocols/Twitter/res/twitter.rc b/protocols/Twitter/res/twitter.rc index e6f813dee1..5d1168d03e 100644 --- a/protocols/Twitter/res/twitter.rc +++ b/protocols/Twitter/res/twitter.rc @@ -62,7 +62,7 @@ BEGIN EDITTEXT IDC_GROUP,54,49,131,12,ES_AUTOHSCROLL LTEXT "Default group:",IDC_STATIC,0,50,54,14 LTEXT "Username:",IDC_STATIC,0,9,51,13 - LTEXT "[Sign in to link your Twitter account]",IDC_USERNAME,55,9,122,15 + LTEXT "",IDC_USERNAME,55,9,122,15 END IDD_TWEET DIALOGEX 0, 0, 186, 64 @@ -81,7 +81,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "Misc. Options",IDC_MISC,17,14,269,82 + GROUPBOX "Miscellaneous options",IDC_MISC,17,14,269,82 CONTROL "Use group chat for Twitter feed",IDC_CHATFEED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,28,133,10 LTEXT "Base URL:",IDC_STATIC,25,43,41,8 COMBOBOX IDC_BASEURL,72,41,89,30,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -98,7 +98,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "Enable popup notifications for Tweets",IDC_SHOWPOPUPS, + CONTROL "Enable popup notifications for tweets",IDC_SHOWPOPUPS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,7,137,10 GROUPBOX "Colors",IDC_STATIC,6,32,164,59 CONTROL "Use Windows colors",IDC_COL_WINDOWS,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,46,79,10 -- cgit v1.2.3