diff options
author | Dart Raiden <wowemuh@gmail.com> | 2013-12-24 19:39:08 +0000 |
---|---|---|
committer | Dart Raiden <wowemuh@gmail.com> | 2013-12-24 19:39:08 +0000 |
commit | c73461a6b99080525ae0f800cb9b2f6e33f75162 (patch) | |
tree | 50941dd97881e171e5252967e8c9f926c68c0139 | |
parent | f312dbcec45174645423286d80c108f557da4415 (diff) |
In American English a comma should follow e.g.
git-svn-id: http://svn.miranda-ng.org/main/trunk@7374 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r-- | plugins/CmdLine/src/mimcmd_data.h | 2 | ||||
-rw-r--r-- | plugins/Folders/src/dlg_handlers.cpp | 4 | ||||
-rw-r--r-- | plugins/UserInfoEx/res/resource.rc | 2 | ||||
-rw-r--r-- | src/resource.rc | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/plugins/CmdLine/src/mimcmd_data.h b/plugins/CmdLine/src/mimcmd_data.h index 9945c30421..03500c69b4 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|<account>) <setting> [<params>].\n<Setting> is one of the following settings:\n status (disable | enable | toggle)\n server <proxy type> <server> <port>.")
#define MIMCMD_HELP_CONTACTS LPGEN("Allows you to search/list contacts or open a message windows for specified contacts.\nUsage:\n contacts list [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'.\n contacts open [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\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:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<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 <command> <contact>.\n<Command> is one of the following commands:\n unread - show unread messages for that contact.\n show <contact> <start> <finish> - show history from event number <start> to <finish>. 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 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'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 <protocol> new_nickname.")
#define MIMCMD_HELP_IGNORE LPGEN("Ignores or removes ignore flags for specific contacts.\nUsage:\n ignore (block | unblock) <contact> [<contact> [<contact> [...]]].\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 2b0ea2f003..d72c79fe19 100644 --- a/plugins/Folders/src/dlg_handlers.cpp +++ b/plugins/Folders/src/dlg_handlers.cpp @@ -129,11 +129,11 @@ static INT_PTR CALLBACK DlgProcVariables(HWND hWnd, UINT msg, WPARAM wParam, LPA TranslateT("be saved to the database, they will only be valid for this session."),
TranslateT("Variable string"),
TranslateT("What it expands to:"),
- TranslateT("Expands to your Miranda path (e.g: c:\\program files\\miranda ng)."),
+ TranslateT("Expands to your Miranda path (e.g.,: c:\\program files\\miranda ng)."),
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. %<env variable>%."),
diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc index 37f55da632..97a0ffa374 100644 --- a/plugins/UserInfoEx/res/resource.rc +++ b/plugins/UserInfoEx/res/resource.rc @@ -164,7 +164,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPU CAPTION "Add E-Mail"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- CONTROL "Enter your full e-mail address.\n(e.g.: john.doe@provider.com)",IDC_HEADERBAR,
+ CONTROL "Enter your full e-mail address.\n(e.g.,: john.doe@provider.com)",IDC_HEADERBAR,
"MHeaderbarCtrl",0x0,0,0,210,25
CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,25,209,69
CONTROL "Enter a representitive name for the e-mail address here.",IDC_STATIC,
diff --git a/src/resource.rc b/src/resource.rc index 92f2499696..22acbdc403 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -404,9 +404,9 @@ BEGIN EDITTEXT IDC_PROFILENAME,61,22,105,12,ES_AUTOHSCROLL
COMBOBOX IDC_PROFILEDRIVERS,61,75,105,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Profile",IDC_STATIC,20,23,38,9
- LTEXT "e.g. Workplace",IDC_STATIC,62,35,77,9
+ LTEXT "e.g., Workplace",IDC_STATIC,62,35,77,9
LTEXT "You can select a different profile driver from the default, it may offer more features or abilities, if in doubt use the default.",IDC_STATIC,4,46,207,24
- LTEXT "e.g. Miranda Database",IDC_STATIC,62,91,84,11
+ LTEXT "e.g., Miranda Database",IDC_STATIC,62,91,84,11
LTEXT "Driver",IDC_STATIC,20,77,37,9
LTEXT "Problem: Unable to find any database drivers, this means you cannot create a new profile, you need to get dbx_mmap.dll",IDC_NODBDRIVERS,4,104,203,22,NOT WS_VISIBLE
END
|