From e1747d22bf5b6010f06edd633f452679c31a3944 Mon Sep 17 00:00:00 2001 From: RMN Date: Mon, 15 Sep 2014 10:17:52 +0000 Subject: resources: comma in Conditional Clauses with "if": if the subordinate clause ("if clause") comes first, a comma should be used to separate it from the main clause, while no comma is needed if the "if clause" follows the main one. git-svn-id: http://svn.miranda-ng.org/main/trunk@10450 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AuthState/src/version.h | 2 +- plugins/Boltun/res/Boltun.rc | 2 +- plugins/CmdLine/src/mimcmd_data.h | 10 +++++----- plugins/HistoryStats/res/resource.rc | 2 +- plugins/HistoryStats/src/dlgoption_subglobal.cpp | 4 ++-- plugins/NotesAndReminders/src/main.cpp | 2 +- plugins/Scriver/src/msgs.cpp | 2 +- plugins/StopSpamMod/src/options.cpp | 4 ++-- plugins/StopSpamPlus/src/options.cpp | 2 +- plugins/TabSRMM/res/resource.rc | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) (limited to 'plugins') diff --git a/plugins/AuthState/src/version.h b/plugins/AuthState/src/version.h index cbf120add5..a8362c5766 100644 --- a/plugins/AuthState/src/version.h +++ b/plugins/AuthState/src/version.h @@ -7,7 +7,7 @@ #define __PLUGIN_NAME "Authorization state" #define __FILENAME "AuthState.dll" -#define __DESCRIPTION "If a contact didn't authorize you this plugin puts an icon in front of the contact's name." +#define __DESCRIPTION "If a contact didn't authorize you, this plugin puts an icon in front of the contact's name." #define __AUTHOR "Thief, idea by snwbrdr" #define __AUTHOREMAIL "thief@miranda.im" #define __AUTHORWEB "http://miranda-ng.org/p/AuthState/" diff --git a/plugins/Boltun/res/Boltun.rc b/plugins/Boltun/res/Boltun.rc index 16158b3375..2b67b20d9e 100644 --- a/plugins/Boltun/res/Boltun.rc +++ b/plugins/Boltun/res/Boltun.rc @@ -106,7 +106,7 @@ BEGIN PUSHBUTTON "...",IDC_BTNPATH,226,18,16,16 GROUPBOX "Base of remarks",IDC_TXTREPLICPATH,5,6,297,36 PUSHBUTTON "Reload",IDC_BTNRELOAD,246,18,52,16 - CONTROL "Stay silent, if have no good aswers",IDC_ENGINE_SILENT, + CONTROL "Stay silent if have no good aswers",IDC_ENGINE_SILENT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,62,283,10 CONTROL "Start answers with a lowercase letter",IDC_ENGINE_LOWERCASE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,94,282,10 diff --git a/plugins/CmdLine/src/mimcmd_data.h b/plugins/CmdLine/src/mimcmd_data.h index 3961b6df2e..b16180c2d9 100644 --- a/plugins/CmdLine/src/mimcmd_data.h +++ b/plugins/CmdLine/src/mimcmd_data.h @@ -99,13 +99,13 @@ typedef TSharedData *PSharedData; #define MIMCMD_HELP_HELP LPGEN("Provides help on other commands.\nUsage: help [].\nThe command will print help information for other commands. If run without any parameters it will print available commands.") #define MIMCMD_HELP_EXCHANGE LPGEN("Notifies Exchange plugin to check for email.\nUsage: exchange check.") #define MIMCMD_HELP_YAMN LPGEN("Notifies YAMN plugin to check for email.\nUsage: yamn check.") -#define MIMCMD_HELP_CALLSERVICE LPGEN("Calls a Miranda service.\nUsage: callservice (d|s) (d|s).\nThe command will call Miranda service using wParam and lParam as arguments; the first letter of the paramater must be either 'd' if the parameter is a decimal number or 's' if the parameter is a string. Be careful when you use this function as you can only pass numbers and strings as data.\nNOTE: If you pass invalid data to a service Miranda might crash.") +#define MIMCMD_HELP_CALLSERVICE LPGEN("Calls a Miranda service.\nUsage: callservice (d|s) (d|s).\nThe command will call Miranda service using wParam and lParam as arguments; the first letter of the paramater must be either 'd' if the parameter is a decimal number or 's' if the parameter is a string. Be careful when you use this function as you can only pass numbers and strings as data.\nNOTE: If you pass invalid data to a service, Miranda might crash.") #define MIMCMD_HELP_MESSAGE LPGEN("Sends a message to the specified contact(s).\nUsage: message [ [ [...]]] .\nThe command will send to the specified contact(s) - at least one contact must be specified - all parameters except the last one are considered recipients.\n has the following format: [:]. is the contact display name or unique ID and is an optional parameter representing the account of the contact (useful in case there is more than one contact with the same name).\nNOTE: The message string cannot exceed 512 characters. You can use \\n for new line (and \\\\n for \\n).") -#define MIMCMD_HELP_DATABASE LPGEN("Allows you to manage database settings.\nUsage:\n db set (b|i|d|s|w)\n db delete \n db get .\nThe command can set a database entry to the specified value (if the entry does not exist it will be created) as well as read or delete a specified database entry. is the name of the module where the key should be located, is the name of the key and is the value to be written. A character must be placed before in order to specify what kind of data to write: b - byte, i - integer (word), d - double word, s - string, w - wide string.") +#define MIMCMD_HELP_DATABASE LPGEN("Allows you to manage database settings.\nUsage:\n db set (b|i|d|s|w)\n db delete \n db get .\nThe command can set a database entry to the specified value (if the entry does not exist, it will be created) as well as read or delete a specified database entry. is the name of the module where the key should be located, is the name of the key and is the value to be written. A character must be placed before in order to specify what kind of data to write: b - byte, i - integer (word), d - double word, s - string, w - wide string.") #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_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_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/HistoryStats/res/resource.rc b/plugins/HistoryStats/res/resource.rc index 7299fee640..dcdbb364d3 100644 --- a/plugins/HistoryStats/res/resource.rc +++ b/plugins/HistoryStats/res/resource.rc @@ -274,7 +274,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "HistoryStats - Conflicting files" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Some files were temporarily stored in another location to avoid overwriting already existing files. If you always want to overwrite existing files there is an option for this.", + LTEXT "Some files were temporarily stored in another location to avoid overwriting already existing files. If you always want to overwrite existing files, there is an option for this.", IDC_STATIC,5,5,285,25 LTEXT "The following files could not be written because files with the same names already existed. Please decide whether to overwrite the existing or to discard the generated files.", IDC_STATIC,5,30,285,25 diff --git a/plugins/HistoryStats/src/dlgoption_subglobal.cpp b/plugins/HistoryStats/src/dlgoption_subglobal.cpp index 09bffa6ae6..b89a9e1e0f 100644 --- a/plugins/HistoryStats/src/dlgoption_subglobal.cpp +++ b/plugins/HistoryStats/src/dlgoption_subglobal.cpp @@ -229,9 +229,9 @@ void DlgOption::SubGlobal::onWMInitDialog() hTemp = m_Options.insertGroup(NULL, TranslateT("Graphics"), OptionsCtrl::OCF_ROOTGROUP | OptionsCtrl::OCF_NODISABLECHILDS); m_hGraphicsMode = m_Options.insertRadio(hTemp, NULL, TranslateT("Only use HTML to simulate graphics")); m_hGraphicsModePNG = m_Options.insertRadio(hTemp, m_hGraphicsMode, TranslateT("Generate PNG files to represent graphics"), OptionsCtrl::OCF_DISABLECHILDSONUNCHECK); - m_hPNGMode = m_Options.insertRadio(m_hGraphicsModePNG, NULL, TranslateT("Fall back to HTML output, if column options require HTML output")); + m_hPNGMode = m_Options.insertRadio(m_hGraphicsModePNG, NULL, TranslateT("Fall back to HTML output if column options require HTML output")); m_Options.insertRadio(m_hGraphicsModePNG, m_hPNGMode, TranslateT("Enforce PNG output, possibly ignoring some column options")); - m_Options.insertRadio(m_hGraphicsModePNG, m_hPNGMode, TranslateT("Prefer HTML output over PNG output, if available")); + m_Options.insertRadio(m_hGraphicsModePNG, m_hPNGMode, TranslateT("Prefer HTML output over PNG output if available")); hTemp = m_Options.insertGroup(NULL, TranslateT("Miscellaneous"), OptionsCtrl::OCF_ROOTGROUP); m_hThreadLowPriority = m_Options.insertCheck(hTemp, TranslateT("Generate statistics in background thread with low priority")); m_hPathToBrowser = m_Options.insertEdit(hTemp, TranslateT("Path to browser (leave blank for system default)")); diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp index dbe5ac7daa..730cb0ca59 100644 --- a/plugins/NotesAndReminders/src/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp @@ -307,7 +307,7 @@ extern "C" __declspec(dllexport) int Load(void) hRichedDll = LoadLibrary(_T("RICHED20.DLL")); if (!hRichedDll) { - if (MessageBox(0, TranslateT("Miranda could not load the Notes & Reminders plugin, riched20.dll is missing. If you are using WINE please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda."), _T(SECTIONNAME), MB_YESNO | MB_ICONINFORMATION) != IDYES) + if (MessageBox(0, TranslateT("Miranda could not load the Notes & Reminders plugin, riched20.dll is missing. If you are using WINE, please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda."), _T(SECTIONNAME), MB_YESNO | MB_ICONINFORMATION) != IDYES) return 1; return 0; } diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index c41ddf2b9f..c2728ed879 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -514,7 +514,7 @@ int OnLoadModule(void) if (LoadLibraryA("riched20.dll") == NULL) { if (IDYES != MessageBox(0, TranslateT - ("Miranda could not load the built-in message module, riched20.dll is missing. If you are using WINE please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda."), + ("Miranda could not load the built-in message module, riched20.dll is missing. If you are using WINE, please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda."), TranslateT("Information"), MB_YESNO | MB_ICONINFORMATION)) return 1; return 0; diff --git a/plugins/StopSpamMod/src/options.cpp b/plugins/StopSpamMod/src/options.cpp index 76f333e394..52a2fe7577 100755 --- a/plugins/StopSpamMod/src/options.cpp +++ b/plugins/StopSpamMod/src/options.cpp @@ -19,7 +19,7 @@ int CreateCListGroup(TCHAR* szGroupName); -char * pluginDescription = LPGEN("No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer plugin adds him to your contact list so that he can contact you."); +char * pluginDescription = LPGEN("No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer, plugin adds him to your contact list so that he can contact you."); TCHAR const * defQuestion = TranslateT("Spammers made me to install small anti-spam system you are now speaking with.\r\nPlease reply \"nospam\" without quotes and spaces if you want to contact me."); INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -272,7 +272,7 @@ INT_PTR CALLBACK AdvancedDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_MATH_DETAILS: - MessageBox(hwnd, TranslateT("If math expression is turned on you can use following expression in message text:\nXX+XX-X/X*X\neach X will be replaced by one random number and answer will be expression result\nMessage must contain only one expression without spaces"), TranslateT("Info"), MB_OK); + MessageBox(hwnd, TranslateT("If math expression is turned on, you can use following expression in message text:\nXX+XX-X/X*X\neach X will be replaced by one random number and answer will be expression result.\nMessage must contain only one expression without spaces."), TranslateT("Info"), MB_OK); break; case IDC_INVIS_DISABLE: diff --git a/plugins/StopSpamPlus/src/options.cpp b/plugins/StopSpamPlus/src/options.cpp index 7045c9fb28..75c7dfae38 100644 --- a/plugins/StopSpamPlus/src/options.cpp +++ b/plugins/StopSpamPlus/src/options.cpp @@ -1,6 +1,6 @@ #include "headers.h" -TCHAR * pluginDescription = TranslateT("No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer plugin adds him to your contact list so that he can contact you."); +TCHAR * pluginDescription = TranslateT("No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer, plugin adds him to your contact list so that he can contact you."); TCHAR const * infTalkProtPrefix = TranslateT("StopSpam automatic message:\r\n"); char const * answeredSetting = "Answered"; char const * questCountSetting = "QuestionCount"; diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc index 1cf577b162..eda1503260 100644 --- a/plugins/TabSRMM/res/resource.rc +++ b/plugins/TabSRMM/res/resource.rc @@ -639,7 +639,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN LTEXT "Message sending:",IDC_TXT_TITLE2,0,64,185,8 LTEXT "Window:",IDC_TXT_TITLE1,1,0,182,8 - CONTROL "Esc closes sessions (minimizes window, if disabled)",IDC_CLOSEONESC, + CONTROL "Esc closes sessions (minimizes window if disabled)",IDC_CLOSEONESC, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,174,10 CONTROL "Always pop up and activate new windows",IDC_ALWAYSPOPUP, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,174,10 -- cgit v1.2.3