12 files changed, 160 insertions, 154 deletions
diff --git a/langpacks/english/Plugins/CurrencyRates.txt b/langpacks/english/Plugins/CurrencyRates.txt
index d023540967..fc14ea5e44 100644
--- a/langpacks/english/Plugins/CurrencyRates.txt
+++ b/langpacks/english/Plugins/CurrencyRates.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: CurrencyRates.dll
 ;  Plugin: Currency Rates
-;  Version: 0.2.1.1
+;  Version: 0.2.1.2
 ;  Authors: Dioksin
 ;============================================================
 [Shows currency rates.]
@@ -73,13 +73,14 @@
 ;file \protocols\CurrencyRates\src\CurrencyRateInfoDlg.cpp
 [Currency Rate]
 ;file \protocols\CurrencyRates\src\CurrencyRatesProviderBase.cpp
-[Source of Information]
-[Rate Value]
-[Previous Rate Value]
-[Fetch Time]
-[Fetch Date]
-[Fetch Time and Date]
-[Percentage Character (%)]
+[Source of information]
+[Rate value]
+[Rate delta]
+[Previous rate value]
+[Fetch time]
+[Fetch date]
+[Fetch time and date]
+[Percent character (%)]
 [Tabulation]
 [Left slash (\\)]
 ;file \protocols\CurrencyRates\src\CurrencyRatesProviderCurrencyConverter.cpp
@@ -108,10 +109,6 @@
 [Currency Rates Auto Update Disabled]
 [Currency Symbol]
 [Network]
-;file \protocols\CurrencyRates\src\HTTPSession.cpp
-[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
-[CurrencyRates HTTP connections]
-;file \protocols\CurrencyRates\src\IconLib.cpp
 [Protocol icon]
 [Currency Rate up]
 [Currency Rate down]
@@ -120,11 +117,12 @@
 [Export]
 [Swap button]
 [Import]
+;file \protocols\CurrencyRates\src\HTTPSession.cpp
+[This plugin requires a personal key. Press Yes to obtain it at the site and then enter the result in the Options dialog, otherwise this plugin will fail.]
+[CurrencyRates HTTP connections]
 ;file \protocols\CurrencyRates\src\ImportExport.cpp
 [XML File (*.xml)]
 [All files (*.*)]
-;file \protocols\CurrencyRates\src\ModuleInfo.cpp
-[Miranda could not load CurrencyRates plugin. Microsoft HTML parser is missing.]
 ;file \protocols\CurrencyRates\src\SettingsDlg.cpp
 [Log Files (*.txt,*.log)]
 [Enter integer value]
diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index 1b7d8efff1..10bd3c3b31 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: DbEditorPP.dll
 ;  Plugin: Database editor++
-;  Version: 4.0.2.2
+;  Version: 4.1.0.2
 ;  Authors: Bio, Jonathan Gordon
 ;============================================================
 [Advanced Database Editor.]
@@ -94,7 +94,6 @@
 [Copy to contact]
 [Export module]
 [&Add module]
-[&Clone]
 [Export contact]
 [Import settings]
 [From a file]
@@ -108,7 +107,7 @@
 ;file \plugins\DbEditorPP\src\copymodule.cpp
 [Copy module "%s"]
 ;file \plugins\DbEditorPP\src\deletemodule.cpp
-[Are you sure you want to delete module "%s"?]
+[Are you sure you want to delete module "%S"?]
 [Delete module from database]
 [Delete module from database... Loading]
 [Delete from all contacts (including Settings)]
@@ -124,13 +123,13 @@
 [Contact]
 [Module]
 [Setting]
-[Enter a string to search the database for]
-[Stop]
+[Searching...]
+[Finished. Items found: %d / replaced: %d / deleted: %d]
 [Replaced]
 [Deleted]
 [Found]
-[Searching...]
-[Finished. Items found: %d / replaced: %d / deleted: %d]
+[Enter a string to search the database for]
+[Stop]
 ;file \plugins\DbEditorPP\src\icons.cpp
 [Main icon]
 [Closed module]
@@ -154,6 +153,8 @@
 [Open user tree in DBE++]
 ;file \plugins\DbEditorPP\src\main_window.cpp
 [Are you sure you want to delete contact "%s"?]
+[Type]
+[Size]
 [Delete resident settings from database?]
 [%d items deleted.]
 ;file \plugins\DbEditorPP\src\modsettingenum.cpp
@@ -168,8 +169,6 @@
 ;file \plugins\DbEditorPP\src\renamemodule.cpp
 [Add module to "%s"]
 ;file \plugins\DbEditorPP\src\settinglist.cpp
-[Type]
-[Size]
 [Unable to store value in this data type!]
 [Are you sure you want to delete %d contact(s)?]
 [Are you sure you want to delete %d setting(s)?]
diff --git a/langpacks/english/Plugins/Discord.txt b/langpacks/english/Plugins/Discord.txt
index 2c227c1a5d..5b135618ed 100644
--- a/langpacks/english/Plugins/Discord.txt
+++ b/langpacks/english/Plugins/Discord.txt
@@ -12,7 +12,7 @@
 [Password:]
 [Contacts]
 [Default group:]
-[Enable group chats]
+[Enable guilds (servers)]
 [Do not open chat windows on creation]
 [Use subgroups for server channels (requires restart)]
 [Delete messages in Miranda when they are deleted from server]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index bde584cf7f..2cbeabaa97 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Facebook.dll
 ;  Plugin: Facebook
-;  Version: 0.1.0.10
+;  Version: 0.1.0.11
 ;  Authors: Miranda NG Team
 ;============================================================
 [Facebook protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 801c39665a..c28e5129ff 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ICQ.dll
 ;  Plugin: ICQ-WIM protocol
-;  Version: 0.95.12.1
+;  Version: 0.96.1.1
 ;  Authors: George Hazan
 ;============================================================
 [ICQ protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index 5fe49e2cbe..f84af830bc 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Msg_Export.dll
 ;  Plugin: Message export
-;  Version: 3.1.2.6
+;  Version: 3.1.2.7
 ;  Authors: Kennet Nielsen, mod by ring0
 ;============================================================
 [Exports every message, URL or file you receive to a text file.]
diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index 6d3f88fb83..b550b59933 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MyDetails.dll
 ;  Plugin: My details
-;  Version: 0.0.1.12
+;  Version: 0.1.0.1
 ;  Authors: Ricardo Pescuma Domenecci, Drugwash
 ;============================================================
 [Shows and allows you to edit your details for all accounts.]
diff --git a/langpacks/english/Plugins/QuickSearch.txt b/langpacks/english/Plugins/QuickSearch.txt
index 2e0707edf9..556a68690e 100644
--- a/langpacks/english/Plugins/QuickSearch.txt
+++ b/langpacks/english/Plugins/QuickSearch.txt
@@ -1,95 +1,48 @@
-#muuid {e4058506-6494-4d60-9cf4-40bf545f78bd}
+#muuid {49bd9f2a-3111-4eb9-87e3-71e69cd97f7c}
 ;============================================================
 ;  File: QuickSearch.dll
 ;  Plugin: Quick Search
-;  Version: 1.4.2.0
-;  Authors: Awkward
+;  Version: 1.5.0.2
+;  Authors: Bethoven, Awkward
 ;============================================================
-[This plugin allows you to quick search for nickname, firstname, lastname, email, uin in your contact list. And now you may add any setting to display - for example user's version of Miranda, group or city.]
-[Quick Search]
-[Quick search]
-[Title]
-[Module/InfoType]
-[Setting]
+[This plugin allows you to quick search for nickname, firstname, lastname, email, uin in your contact list.]
+;file \plugins\QuickSearch\res\resource.rc
 [Reload]
 [New]
 [Up]
 [Down]
 [Delete]
 [Default]
-[Additional Options]
-[Tool Window Style]
-[Draw Grid]
-[Save search pattern]
-[Auto Close mode]
-[Sort by Status]
-[Show Client Icons]
 [Settings]
 [Title:]
-[Account]
-[Gender]
-[UserID]
-[Nickname]
-[First name]
-[Last name]
-[Group]
-[Container]
-[E-mail]
-[Client ID]
-[Ext IP]
-[LastSeen]
-[Last Event]
-[Online since]
-[Metacontact]
-[Event count]
-[Contact add time]
 [Type:]
-[DB setting]
-[Script]
-[Service]
-[Contact info]
-[Other]
 [Data type:]
-[Byte]
-[Word]
-[DWord]
-[Signed]
-[As hex]
-[String]
-[TimeStamp]
 [Module:]
 [Setting:]
-[Service:]
-[Param]
-[number value]
-[ANSI string]
-[Unicode string]
-[current contact]
-[last result]
-[parameter]
-[Result]
-[Result type]
-[Free memory]
+[InfoType:]
 [Save]
-[All]
-[Close]
+[Tool Window Style]
+[Draw Grid]
+[Save search pattern]
+[Auto Close mode]
+[Sort by Status]
+[Show Client Icons]
+[Additional Options]
 [Refresh]
-[QuickSearch]
 [Show Offline contacts]
-[New column]
-[Save Item]
-[InfoType:]
+[Colorize]
+;file \plugins\QuickSearch\src\frame.cpp
+[Open QS window]
+[Quick search]
+;file \plugins\QuickSearch\src\main.cpp
+[Quick Search]
+[Quick Search window hotkey]
 [New Column]
 [Column Up]
 [Column Down]
 [Delete Column]
 [Male]
 [Female]
-[Contacts]
-[ContactInfo]
-[LastEvent]
-[EventCount]
-[Script Editor]
 [Normal background]
 [Normal foreground]
 [Odd background]
@@ -104,39 +57,96 @@
 [Metacontact foreground]
 [Subcontact background]
 [Subcontact foreground]
+;file \plugins\QuickSearch\src\options.cpp
+[Script]
+[Service]
+[Contact info]
+[Other]
+[Metacontact]
+[Title]
+[Module/InfoType]
+[Setting]
+[DB setting]
+[Byte]
+[Word]
+[Dword]
+[Signed]
+[As hex]
+[String]
+[TimeStamp]
+[Last seen]
+[Last event]
+[Event count]
+[Display name]
+[Account name]
+[New column]
+[Contacts]
+;file \plugins\QuickSearch\src\utils.cpp
+[Account]
+[Gender]
+[UserID]
+[Nickname]
+[First name]
+[Last name]
+[Group]
+[Container]
+[Email]
+[Client ID]
+[Online since]
+[Contact add time]
+[Nick]
+[Custom nick]
+[City]
+[State]
+[Country]
+[Phone]
+[Homepage]
+[About]
+[Age]
+[First name/Last name]
+[Unique ID]
+[Fax]
+[Cellular]
+[Time zone]
+[My notes]
+[Birth day]
+[Birth month]
+[Birth year]
+[Street]
+[ZIP code]
+[Language #1]
+[Language #2]
+[Language #3]
+[Company name]
+[Company department]
+[Company position]
+[Company street]
+[Company city]
+[Company state]
+[Company ZIP]
+[Company country]
+[Company homepage]
+[Display ID]
+;file \plugins\QuickSearch\src\window.cpp
+[Unknown]
+[Stay on Top]
+;file \plugins\QuickSearch\src\window_misc.cpp
+[Do you really want to delete selected contacts]
+[Warning]
+[%i users found (%i) Online: %i]
+[deleted]
+[disabled]
+[active]
+[Online]
+[All]
+[Editing of column %s]
+[Enter new cell value]
+[Change setting through QS]
+[Selected %d contacts]
 [&Delete]
 [&Copy]
 [C&onvert to Meta]
 [Attach to &Tab container]
 [&Move to Group]
 [Some of selected contacts in different metacontacts already]
-[Do you really want to delete selected contacts?]
-[Warning]
-[One or more contacts in same Meta already. Try to convert anyway?]
-[Editing of column ]
-[%i users found (%i) Online: %i]
-[ users found (]
-[) Online: ]
-[Online]
-[deleted]
-[off]
-[active]
-[Colorize]
-[QuickSearch window hotkey]
-[Column content is simple database setting.]
-[Column content is script result.\r\nMore help from "Help" button in script dialog.]
-[Column content is contact property (see list). Can be empty.]
-[Content is last online time.]
-[Content is time of last contact event.]
-[Content is metacontact info.]
-[Content is count of ALL contact events (not messages only)]
-[Other info]
-[Change setting through QS]
-[default]
-[Selected]
-[contacts]
-[Unknown]
-[Stay on Top]
-; these lines are not present in the sources, but they are present in compiled plugin
-[Text Editor]
-[Wrap Text]
+[One or more contacts already belong to the same metacontact. Try to convert anyway?]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 3edfc7ef50..19789403bd 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: VKontakte.dll
 ;  Plugin: VKontakte protocol
-;  Version: 0.1.11.8
+;  Version: 0.1.12.0
 ;  Authors: Miranda NG team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index 783ffb95da..a68078bfb1 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Variables.dll
 ;  Plugin: Variables
-;  Version: 0.2.3.11
+;  Version: 0.2.3.12
 ;  Authors: P Boon
 ;============================================================
 [Adds support for dynamic variables in strings for plugins.]
diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index e9084eca5b..de19680e93 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Weather.dll
 ;  Plugin: Weather
-;  Version: 0.4.0.5
+;  Version: 0.4.0.6
 ;  Authors: Miranda NG team
 ;============================================================
 [Retrieves weather information and displays it in your contact list.]
@@ -156,25 +156,21 @@
 [HTTP Error: Bad gateway (502)]
 [HTTP Error: Service unavailable (503)]
 [HTTP Error: Gateway timeout (504)]
-[%c\\nTemperature: %t\\nFeel-Like: %f\\nPressure: %p\\nWind: %i  %w\\nHumidity: %m\\nDew Point: %e\\nVisibility: %v\\n\\nSun Rise: %r\\nSun Set: %y\\n\\n5 Days Forecast:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]]
-[Feel-Like: %f\\nPressure: %p\\nWind: %i  %w\\nHumidity: %m\\nDew Point: %e\\nVisibility: %v\\n\\nSun Rise: %r\\nSun Set: %y\\n\\n5 Days Forecast:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]]
-[Weather Condition for %n as of %u]
-[%c, %t (feel-like %f)	Wind: %i %w	Humidity: %m]
-[%n at %u:	%c, %t (feel-like %f)	Wind: %i %w	Humidity: %m]
-[%n   (%u)]
-[%c, %t\\nToday:  High %h, Low %l]
-[Temperature: %[Temperature]]
-[%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temperature\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set]
 [%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temp\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set\n----------\n\\n\tnew line]
-[No information available.\r\nPlease update weather condition first.]
-[%[..]\tcustom variables]
-[Here is a list of custom variables that are currently available]
-[The URL for complete forecast has not been set. You can set it from the Edit Settings dialog.]
-[The URL for weather map has not been set. You can set it from the Edit Settings dialog.]
 ;file \protocols\Weather\src\weather.cpp
 [Enable/disable auto update]
 [Auto Update Enabled]
 [Auto Update Disabled]
+[Protocol icon]
+[Update Disabled]
+[View Log]
+[Update with Clear]
+[View Brief]
+[View Complete]
+[Weather Update]
+[Popup]
+[No Popup]
+[Edit Settings]
 [Condition Changed]
 [Alert Issued]
 ;file \protocols\Weather\src\weather_addstn.cpp
@@ -186,6 +182,8 @@
 [<Enter station ID here>]
 ;file \protocols\Weather\src\weather_contacts.cpp
 [Weather condition was not logged.]
+[The URL for complete forecast has not been set. You can set it from the Edit Settings dialog.]
+[The URL for weather map has not been set. You can set it from the Edit Settings dialog.]
 [Get city name from ID]
 [Weather INI information]
 [Browse]
@@ -205,17 +203,6 @@
 [Error when obtaining data: %s]
 ;file \protocols\Weather\src\weather_http.cpp
 [Weather HTTP connections]
-;file \protocols\Weather\src\weather_icons.cpp
-[Protocol icon]
-[Update Disabled]
-[View Log]
-[Update with Clear]
-[View Brief]
-[View Complete]
-[Weather Update]
-[Popup]
-[No Popup]
-[Edit Settings]
 ;file \protocols\Weather\src\weather_info.cpp
 [Name]
 [Author]
@@ -236,6 +223,7 @@
 [Memory Used:]
 [bytes]
 [Description:]
+[Here is a list of custom variables that are currently available]
 ;file \protocols\Weather\src\weather_ini.cpp
 [All update data has been reloaded.]
 [Invalid ini format for: %s]
@@ -245,12 +233,22 @@
 [Frame Title Font]
 [Frame Background]
 ;file \protocols\Weather\src\weather_opt.cpp
+[Weather Condition for %n as of %u]
+[Feel-Like: %f\\nPressure: %p\\nWind: %i  %w\\nHumidity: %m\\nDew Point: %e\\nVisibility: %v\\n\\nSun Rise: %r\\nSun Set: %y\\n\\n5 Days Forecast:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]]
+[%c\\nTemperature: %t\\nFeel-Like: %f\\nPressure: %p\\nWind: %i  %w\\nHumidity: %m\\nDew Point: %e\\nVisibility: %v\\n\\nSun Rise: %r\\nSun Set: %y\\n\\n5 Days Forecast:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]]
+[%n at %u:	%c, %t (feel-like %f)	Wind: %i %w	Humidity: %m]
+[%c, %t (feel-like %f)	Wind: %i %w	Humidity: %m]
+[Temperature: %[Temperature]]
+[%n   (%u)]
+[%c, %t\\nToday:  High %h, Low %l]
 [Weather Protocol Text Preview]
 [Network]
 [General]
 [Display]
 [Popups]
 ;file \protocols\Weather\src\weather_popup.cpp
+[%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temperature\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set]
+[%[..]\tcustom variables]
 ;file \protocols\Weather\src\weather_svcs.cpp
 [Station ID]
 [Disable &weather notification]
@@ -268,6 +266,7 @@
 ;file \protocols\Weather\src\weather_update.cpp
 [Unable to retrieve weather information for %s]
 ;file \protocols\Weather\src\weather_userinfo.cpp
+[No information available.\r\nPlease update weather condition first.]
 [Variable]
 [Information]
 [Retrieving new data, please wait...]
diff --git a/langpacks/english/Plugins/XSoundNotify.txt b/langpacks/english/Plugins/XSoundNotify.txt
index 151e435703..d9b394bdbb 100644
--- a/langpacks/english/Plugins/XSoundNotify.txt
+++ b/langpacks/english/Plugins/XSoundNotify.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: XSoundNotify.dll
 ;  Plugin: XSoundNotify
-;  Version: 1.1.0.4
+;  Version: 1.2.0.1
 ;  Authors: Roman Torsten
 ;============================================================
 [Provides extended options for sound notifications.]