5 files changed, 74 insertions, 87 deletions
diff --git a/langpacks/english/Plugins/AutoShutdown.txt b/langpacks/english/Plugins/AutoShutdown.txt
index 2ada857004..29f2e45ed9 100644
--- a/langpacks/english/Plugins/AutoShutdown.txt
+++ b/langpacks/english/Plugins/AutoShutdown.txt
@@ -16,7 +16,6 @@
 [&Ignore hidden or temporary contacts when watching for all contacts being offline]
 [Critical shutdown events]
 [Automatically shutdown the computer and turn the power off when one of the following occurs:]
-[&Thunderstorm warning is issued (Weather)]
 [Automatic shutdown]
 [Select the automatic shutdown event]
 [Shutdown at &specific time]
diff --git a/langpacks/english/Plugins/HistoryPP.txt b/langpacks/english/Plugins/HistoryPP.txt
index 97e81ce88b..c1ddbab3ab 100644
--- a/langpacks/english/Plugins/HistoryPP.txt
+++ b/langpacks/english/Plugins/HistoryPP.txt
@@ -346,3 +346,4 @@
 [Delete]
 [Up]
 [Down]
+[Select]
diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index 04e9f19ca8..d61e8f57e0 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -30,6 +30,10 @@
 [Protocol icon]
 [Gaming icon]
 [Steam game]
+;file \protocols\Steam\src\steam_chats.cpp
+[Owner]
+[Participant]
+[&Leave chat session]
 ;file \protocols\Steam\src\steam_contacts.cpp
 [Looking to play]
 [ (Non-Steam)]
@@ -52,5 +56,6 @@
 [Network]
 ;file \protocols\Steam\src\steam_server.cpp
 ;file \protocols\Steam\src\steam_utils.cpp
+[You were invited to play a game]
 [closed chat session]
 ;file \protocols\Steam\src\steam_xstatus.cpp
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index ab1abea065..014e2c111a 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
 ;file \protocols\VKontakte\res\resource.rc
-[Show in protocol menu ]
+[Show in protocol menu]
 [Create new chat]
 [Status message]
 [Send message to my wall]
diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index 6f9019be7e..c1a10c92cf 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.8
+;  Version: 1.1.0.1
 ;  Authors: Miranda NG team
 ;============================================================
 [Retrieves weather information and displays it in your contact list.]
@@ -12,14 +12,12 @@
 [Webpage]
 [Close]
 [Options]
-[Update weather information on startup]
 [Update weather information every]
 [minutes]
 [Consider weather info updated only when condition and temperature are changed]
 [Remove old data when updating]
 [Make the contact italic when weather alert is issued]
 [Modes]
-[Use weather condition as protocol status]
 [Avatar only mode]
 [Units]
 [Temperature]
@@ -58,9 +56,6 @@
 [Use external file]
 [Overwrite file upon update]
 [Path:]
-[Link Settings]
-[More Info URL]
-[Weather Map]
 [Other Options]
 [Set as default station]
 [Disable automatic update for this station]
@@ -68,7 +63,6 @@
 [Change]
 [Cancel]
 [Popup Options]
-[Enable popups]
 [Popup only when condition changes]
 [Colors]
 [Background color]
@@ -89,6 +83,8 @@
 [Updates]
 [Alerts]
 [Errors]
+[Enter your personel API key from Visual Crossing Weather site]
+[Obtain key]
 [Contact List]
 [Brief Info Title]
 [Note Text]
@@ -96,7 +92,6 @@
 [External Log]
 [History Log]
 [Variable List]
-[More Variables]
 [Reset]
 [Status Message]
 [Sunset]
@@ -107,16 +102,6 @@
 [Dew point]
 [Humidity]
 [More...]
-[Weather Protocol INI Setup]
-[Install and load your weather ini file here]
-[Weather Protocol cannot find any weather INI file stored in your computer. To setup weather INI and add weather stations, please follow the steps:]
-[Click here to download a weather ini file from Miranda file listing]
-[Extract the weather ini file from archive to this directory]
-[Click here to load the data from the new ini file into memory]
-[Add new weather station and close this dialog]
-[Total INI files]
-[Total memory used]
-[Reload INI]
 [City:]
 [Menu]
 [Dismiss Popup]
@@ -131,36 +116,7 @@
 [To default]
 ;file \protocols\Weather\src\stdafx.h
 [N/A]
-[Invalid ID format, missing "/" (10)]
-[Invalid service (11)]
-[Invalid station (12)]
-[Weather service ini for this station is not found (20)]
-[Netlib error - check your internet connection (30)]
-[Empty data is retrieved (40)]
-[Document not found (42)]
-[Document too short to contain any weather data (43)]
-[Unknown error (99)]
-[HTTP Error: No content (204)]
-[HTTP Error: Data moved (301)]
-[HTTP Error: Use proxy (305)]
-[HTTP Error: Temporary redirect (307)]
-[HTTP Error: Bad request (400)]
-[HTTP Error: Unauthorized (401)]
-[HTTP Error: Payment required (402)]
-[HTTP Error: Forbidden (403)]
-[HTTP Error: Not found (404)]
-[HTTP Error: Method not allowed (405)]
-[HTTP Error: Proxy authentication required (407)]
-[HTTP Error: Gone (410)]
-[HTTP Error: Internal server error (500)]
-[HTTP Error: Bad gateway (502)]
-[HTTP Error: Service unavailable (503)]
-[HTTP Error: Gateway timeout (504)]
-[%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]
 ;file \protocols\Weather\src\weather.cpp
-[Enable/disable auto update]
-[Auto Update Enabled]
-[Auto Update Disabled]
 [Protocol icon]
 [Update Disabled]
 [View Log]
@@ -168,26 +124,18 @@
 [View Brief]
 [View Complete]
 [Weather Update]
+[Weather Map]
 [Edit Settings]
 [Condition Changed]
 [Alert Issued]
-[Weather notifications]
 ;file \protocols\Weather\src\weather_addstn.cpp
 [Current weather information for %s.]
 [%s is now the default weather station]
 [Weather Protocol]
 [Please try again after weather update is completed.]
-[<Enter station name here>]
-[<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]
-[View webpage]
-[Reset to default]
 [Text Files]
 [All Files]
 ;file \protocols\Weather\src\weather_conv.cpp
@@ -196,35 +144,50 @@
 [mm]
 [<unknown time>]
 [<Error>]
+[Invalid ID format, missing "/" (10)]
+[Invalid service (11)]
+[Invalid station (12)]
+[Weather service ini for this station is not found (20)]
+[Netlib error - check your internet connection (30)]
+[Empty data is retrieved (40)]
+[Document not found (42)]
+[Document too short to contain any weather data (43)]
+[Unknown error (99)]
+[HTTP Error: No content (204)]
+[HTTP Error: Data moved (301)]
+[HTTP Error: Use proxy (305)]
+[HTTP Error: Temporary redirect (307)]
+[HTTP Error: Bad request (400)]
+[HTTP Error: Unauthorized (401)]
+[HTTP Error: Payment required (402)]
+[HTTP Error: Forbidden (403)]
+[HTTP Error: Not found (404)]
+[HTTP Error: Method not allowed (405)]
+[HTTP Error: Proxy authentication required (407)]
+[HTTP Error: Gone (410)]
+[HTTP Error: Internal server error (500)]
+[HTTP Error: Bad gateway (502)]
+[HTTP Error: Service unavailable (503)]
+[HTTP Error: Gateway timeout (504)]
 [HTTP Error %i]
 ;file \protocols\Weather\src\weather_data.cpp
 [<Enter city name here>]
-[Error when obtaining data: %s]
-;file \protocols\Weather\src\weather_info.cpp
-[Name]
-[Author]
-[File Version]
-[INI Version]
-[Items]
-[Display Name]
-[File Name]
-[The corresponding INI file for "%s" is not found.]
-[Weather INI information for "%s":]
-[Name:]
-[Internal Name:]
-[Author:]
-[Version:]
-[INI Version:]
-[File Name:]
-[Item Count:]
-[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]
-[No update data file is found. Please check your Plugins\\Weather directory.]
+[N]
+[NNE]
+[NE]
+[ENE]
+[E]
+[ESE]
+[ES]
+[SSE]
+[S]
+[SSW]
+[SW]
+[WSW]
+[W]
+[WNW]
+[WN]
+[NNW]
 ;file \protocols\Weather\src\weather_mwin.cpp
 [Frame Font]
 [Frame Title Font]
@@ -238,16 +201,23 @@
 [Temperature: %[Temperature]]
 [%n   (%u)]
 [%c, %t\\nToday:  High %h, Low %l]
+[%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]
 [Weather Protocol Text Preview]
 [Network]
+[Account]
 [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]
+[Popups]
+;file \protocols\Weather\src\weather_proto.cpp
+[notifications]
+[Enable/disable auto update]
+[Auto Update Enabled]
+[Auto Update Disabled]
+[Coordinates]
 ;file \protocols\Weather\src\weather_svcs.cpp
-[Station ID]
 [Update Weather]
 [Remove Old Data then Update]
 [Brief Information]
@@ -259,10 +229,22 @@
 [Display in a frame]
 ;file \protocols\Weather\src\weather_update.cpp
 [Unable to retrieve weather information for %s]
+[New moon]
+[Waxing crescent]
+[Waxing gibbous]
+[Waning gibbous]
+[Waning crescent]
+[Condition]
+[High]
+[Low]
+[Moon phase]
+[Wind speed]
+[Wind direction]
+[Feel]
 ;file \protocols\Weather\src\weather_userinfo.cpp
-[No information available.\r\nPlease update weather condition first.]
 [Variable]
 [Information]
+[No information available.\r\nPlease update weather condition first.]
 [Retrieving new data, please wait...]
 [More Info]
 [Current condition for %n]