git-svn-id: http://svn.miranda-ng.org/main/trunk@7650 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 13 insertions, 1 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index c4628e8b5a..3b437e4788 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1050,6 +1050,11 @@
 ;file \src\modules\addcontact\addcontact.cpp

 [Add contact]

 [Please authorize my request and add me to your contact list.]

+;file \src\modules\chat\chat_opts.cpp

+;file \src\modules\chat\chat_svc.cpp

+;file \src\modules\chat\clist.cpp

+;file \src\modules\chat\log.cpp

+;file \src\modules\chat\tools.cpp

 ;file \src\modules\clist\clcitems.cpp

 ;file \src\modules\clist\clistmenus.cpp

 [Custom status]

diff --git a/langpacks/english/Plugins/Ping.txt b/langpacks/english/Plugins/Ping.txt
index 6b54de0257..bd6fc5304a 100644
--- a/langpacks/english/Plugins/Ping.txt
+++ b/langpacks/english/Plugins/Ping.txt
@@ -58,6 +58,7 @@
 [Enable All Pings]

 [Disable All Pings]

 ;file \plugins\Ping\src\options.cpp

+[Open log file]

 [All\0*.*\0Text\0*.TXT\0]

 [<none>]

 [<all>]

@@ -72,15 +73,19 @@
 [AVG %.1lf ms]

 [MAX %hd ms]

 [MIN %hd ms]

+[Ping Graph]

 ;file \plugins\Ping\src\pingthread.cpp

-[%s - setting status of protocol '%s' (%d)]

+[%s - setting status of protocol '%S' (%d)]

+[Ping Reply]

 [%s - reply, %d]

+[Ping Timeout]

 [%s - timeout]

 [Disable]

 [enabled]

 [double clicked]

 [Ping]

 [Show/Hide &Ping Window]

+[List]

 ;file \plugins\Ping\src\rawping.cpp

 [Host %s requests that you reduce the amount of traffic you are sending.]

 ;file \plugins\Ping\src\utils.cpp

diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index 9cb6d64185..fcb76bb3a9 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -198,3 +198,5 @@
 [x, and stores y as variable named x]

 [only stores y as variables x]

 ;file \plugins\Variables\src\variables.cpp

+;file \plugins\Variables\src\variables.h

+[--- Special characters ---\r\n\r\nThe following characters have a special meaning in a formatting string:\r\n\r\n?<function>(<arguments>)\r\nThis 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\nThis 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\nThis will parse the given field. Example: I installed Miranda at: %mirandapath%.\r\n\r\n`<string>`\r\nThis 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\nThis 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\nWhenever 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\nA contact will be searched which will have value x for its property y, y can be one of the following:\r\nfirst, last, nick, email, id or display\r\n\r\nFor 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.]