summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/Variables/src/help.cpp23
-rw-r--r--plugins/Variables/src/variables.h4
2 files changed, 3 insertions, 24 deletions
diff --git a/plugins/Variables/src/help.cpp b/plugins/Variables/src/help.cpp
index 07f0ca8683..d19484235b 100644
--- a/plugins/Variables/src/help.cpp
+++ b/plugins/Variables/src/help.cpp
@@ -778,28 +778,7 @@ static INT_PTR CALLBACK helpInfoDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
{
switch(msg) {
case WM_INITDIALOG:
- SetDlgItemText(hwndDlg, IDC_HELPDESC, \
-LPGENT("--- Special characters ---\r\n\r\n\
-The following characters have a special meaning in a formatting string:\r\n\r\n\
-?<function>(<arguments>)\r\n\
-This will parse the function given the arguments, the result will be parsed again. Example: Today is ?cdate(yyyy/MM/dd).\r\n\r\n\
-!<function>(<arguments>)\r\n\
-This will parse the function given the arguments, the result will not be parsed again. Example: Message waiting: !message(,first,rcvd,unread).\r\n\r\n\
-%<field>%\r\n\
-This will parse the given field. Example: I installed Miranda at: %mirandapath%.\r\n\r\n\
-`<string>`\r\n\
-This will not parse the given string, any function, field or special character in the string will shown in the result without being translated. Example: Use `%mirandapath%` to show the installation path.\r\n\r\n\
-#<comment>\r\n\
-This will add a comment in the formatting string. Everything from the # character to the end of the line will be removed. Example: %dbprofile% #this is a useless comment.\r\n\r\n\r\n\
---- Contacts ---\r\n\r\n\
-Whenever a functions requires a contact as an argument, you can specify it in two ways:\r\n\r\n\
-(1) Using a unique ID (UIN for ICQ, email for MSN) or, a protocol ID followed by a unique ID in the form <PROTOID:UNIQUEID>, for example <MSN:miranda@hotmail.com> or <ICQ:123456789>.\r\n\r\n\
-(2) Using the contact function:\r\n\
-?contact(x,y)\r\n\
-A contact will be searched which will have value x for its property y, y can be one of the following:\r\n\
-first, last, nick, email, ID or display\r\n\r\n\
-For example: ?contact(miranda@hotmail.com,email) or ?contact(Miranda,nick). The contact function will return either a unique contact according to the arguments or nothing if none or multiple contacts exists with the given property.\
-"));
+ SetDlgItemText(hwndDlg, IDC_HELPDESC, VAR_HELP_TEXT);
TranslateDialogDefault(hwndDlg);
break;
diff --git a/plugins/Variables/src/variables.h b/plugins/Variables/src/variables.h
index 68acb88ad8..2eb66836ff 100644
--- a/plugins/Variables/src/variables.h
+++ b/plugins/Variables/src/variables.h
@@ -103,11 +103,11 @@ This will not parse the given string, any function, field or special character i
This will add a comment in the formatting string. Everything from the # character to the end of the line will be removed. Example: %dbprofile% #this is a useless comment.\r\n\r\n\r\n\
--- Contacts ---\r\n\r\n\
Whenever a functions requires a contact as an argument, you can specify it in two ways:\r\n\r\n\
-(1) Using a unique id (UIN for ICQ, email for MSN) or, a protocol id followed by a unique id in the form <PROTOID:UNIQUEID>, for example <MSN:miranda@hotmail.com> or <ICQ:123456789>.\r\n\r\n\
+(1) Using a unique ID (UIN for ICQ, email for MSN) or, a protocol ID followed by a unique ID in the form <PROTOID:UNIQUEID>, for example <MSN:miranda@hotmail.com> or <ICQ:123456789>.\r\n\r\n\
(2) Using the contact function:\r\n\
?contact(x,y)\r\n\
A contact will be searched which will have value x for its property y, y can be one of the following:\r\n\
-first, last, nick, email, id or display\r\n\r\n\
+first, last, nick, email, ID or display\r\n\r\n\
For example: ?contact(miranda@hotmail.com,email) or ?contact(Miranda,nick). The contact function will return either a unique contact according to the arguments or nothing if none or multiple contacts exists with the given property.\
")