6 files changed, 161 insertions, 724 deletions
diff --git a/langpacks/english/Weather/Intellicast.txt b/langpacks/english/Weather/Intellicast.txt
deleted file mode 100644
index 552b0225fe..0000000000
--- a/langpacks/english/Weather/Intellicast.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-;============================================================
-;  File: Intellicast.ini
-;  Plugin: Weather
-;============================================================
-[Ceiling]
-[Mon]
-[Tue]
-[Wed]
-[Thu]
-[Fri]
-[Sat]
-[Sun]
-[Full]
-[Sunny]
-[Waning Crescent]
-[Waning Gibbous]
-[Waxing Crescent]
-[Waxing Gibbous]
-[Last Quarter]
-[First Quarter]
-[Partly Sunny]
-[Mostly Sunny]
-[Partly Cloudy]
-[Mostly Cloudy]
-[Mostly Clear]
-[Scattered Thunderstorms]
-[Feel]
-[Forecast Day 1]
-[Forecast Day 2]
-[Forecast Day 3]
-[Forecast Day 4]
-[Forecast Day 5]
-[Forecast Day 6]
-[Forecast Day 7]
-[Forecast Day 8]
-[Forecast Day 9]
-[Forecast Day 10]
-[Forecast today]
-[Heat Index]
-[Moon]
-[MoonRise]
-[MoonSet]
-[Update1]
-[Update2]
-[Wind Chill]
-[Wind Direction]
-[Wind Speed]
-[N]
-[W]
-[S]
-[E]
-[NW]
-[NE]
-[SW]
-[SE]
-[NNW]
-[NNE]
-[SSW]
-[SSE]
-[ENE]
-[WSW]
-[WNW]
-[ESE]
-[WindDir1]
-[WindDir2]
-[Broken Clouds]
-[Scattered Clouds]
-[North]
-[East]
-[South]
-[West]
-[Northwest]
-[Northeast]
-[Southwest]
-[Southeast]
diff --git a/langpacks/english/Weather/wundergrnd_xml.txt b/langpacks/english/Weather/Weather_forecast.txt
index dda5f5f4ca..89cefa05d7 100644
--- a/langpacks/english/Weather/wundergrnd_xml.txt
+++ b/langpacks/english/Weather/Weather_forecast.txt
@@ -1,9 +1,21 @@
 ;============================================================
-;  File: wundergrnd_xml.ini
-;  Module: weather
+;  Plugin: Weather
 ;============================================================
-[Alert]
+[AM Rain]
+[Am Clouds / Pm Sun]
+[Am Light Rain]
+[Am Rain / Snow Showers]
+[Am Rain / Snow]
+[Am Rain]
+[Am Showers / Wind]
+[Am Showers]
+[Am Snow Showers / Wind]
+[Am Snow Showers]
+[Am Snow]
+[Am T-Storms]
 [Blowing Snow]
+[Broken Clouds]
+[Ceiling]
 [Chance Of A Thunderstorm 20% Chance Of Precipitation]
 [Chance Of Rain 20% Chance Of Precipitation]
 [Chance Of Rain 30% Chance Of Precipitation]
@@ -33,77 +45,65 @@
 [Chance Rain 50% Chance Of Precipitation]
 [Chance Rain 80% Chance Of Precipitation]
 [Chance Rain 90% Chance Of Precipitation]
+[Clear / Wind]
 [Clear]
+[Clouds Early / Clearing Late]
+[Cloudy / Wind]
+[Cloudy / Windy]
+[Cloudy And Windy]
 [Cloudy]
-[Day Length Diff]
 [Day Length]
+[Drifting Snow]
 [Drizzle Fog]
 [Drizzle Mist]
 [Drizzle]
 [ENE]
 [ESE]
 [E]
-[East]
 [Elevation]
+[Fair / Windy]
+[Fair And Windy]
+[Fair]
 [Falling]
 [Feel]
+[Few Showers / Wind]
+[Few Showers]
+[Few Snow Showers]
 [First Quarter]
+[Fog / Windy]
+[Fog And Windy]
+[Fog Late]
 [Fog]
-[Forecast Day 1 Condition]
-[Forecast Day 1 Day]
-[Forecast Day 1 High]
-[Forecast Day 1 Low]
-[Forecast Day 1 Night Text]
-[Forecast Day 1 Text]
-[Forecast Day 1]
-[Forecast Day 2 Condition]
-[Forecast Day 2 Day]
-[Forecast Day 2 High]
-[Forecast Day 2 Low]
-[Forecast Day 2 Night Text]
-[Forecast Day 2 Text]
-[Forecast Day 2]
-[Forecast Day 3 Condition]
-[Forecast Day 3 Day]
-[Forecast Day 3 High]
-[Forecast Day 3 Low]
-[Forecast Day 3 Night Text]
-[Forecast Day 3 Text]
-[Forecast Day 3]
-[Forecast Day 4 Condition]
-[Forecast Day 4 Day]
-[Forecast Day 4 High]
-[Forecast Day 4 Low]
-[Forecast Day 4 Night Text]
-[Forecast Day 4 Text]
-[Forecast Day 4]
-[Forecast Day 5 Condition]
-[Forecast Day 5 Day]
-[Forecast Day 5 High]
-[Forecast Day 5 Low]
-[Forecast Day 5 Night Text]
-[Forecast Day 5 Text]
-[Forecast Day 5]
+[Freezing Drizzle / Windy]
 [Freezing Drizzle Mist]
 [Freezing Drizzle]
 [Freezing Fog]
+[Freezing Rain / Windy]
 [Freezing Rain Mist]
 [Freezing Rain]
-[Friday]
 [Full Moon]
+[Full]
 [Haze]
 [Heat Index]
 [Heavy Blowing Snow]
 [Heavy Fog]
+[Heavy Rain / Wind]
 [Heavy Rain Showers]
+[Heavy Rain]
 [Heavy Showers Snow Blowing Snow]
 [Heavy Showers Snow Heavy Blowing Snow]
 [Heavy Showers Snow Mist]
 [Heavy Showers Snow]
+[Heavy Snow And Windy]
+[Heavy Snow Shower]
 [Heavy Snow Showers]
 [Heavy Snow]
+[Heavy T-Storm]
+[Heavy T-Storms]
 [Heavy Thunderstorm Rain]
+[High]
 [Ice Crystals Mist]
+[Ice Crystals]
 [Ice Pellets 30% Chance Of Precipitation]
 [Ice Pellets 40% Chance Of Precipitation]
 [Ice Pellets 50% Chance Of Precipitation]
@@ -112,9 +112,11 @@
 [Ice Pellets 80% Chance Of Precipitation]
 [Ice Pellets 90% Chance Of Precipitation]
 [Ice Pellets]
-[Last Quarter]
-[Latitude]
+[Isolated T-Storms / Wind]
+[Isolated T-Storms]
 [Light Blowing Snow]
+[Light Drizzle And Fog]
+[Light Drizzle And Windy]
 [Light Drizzle Fog]
 [Light Drizzle Mist Patches Fog]
 [Light Drizzle Mist]
@@ -125,6 +127,8 @@
 [Light Freezing Drizzle Mist]
 [Light Freezing Drizzle Snow]
 [Light Freezing Drizzle]
+[Light Freezing Rain / Fog]
+[Light Freezing Rain / Windy]
 [Light Freezing Rain Light Showers Snow Mist]
 [Light Freezing Rain Light Showers Snow]
 [Light Freezing Rain Light Snow]
@@ -133,11 +137,23 @@
 [Light Ice Pellets Mist]
 [Light Ice Pellets]
 [Light Low Drifting Snow]
+[Light Rain / Fog]
+[Light Rain / Freezing Rain]
+[Light Rain / Wind Early]
+[Light Rain / Wind]
+[Light Rain / Windy]
+[Light Rain And Snow]
+[Light Rain And Windy]
+[Light Rain Early]
 [Light Rain Fog]
+[Light Rain Late]
 [Light Rain Mist]
+[Light Rain Shower And Windy]
+[Light Rain Shower]
 [Light Rain Showers]
 [Light Rain Snow Mist]
 [Light Rain Snow]
+[Light Rain With Thunder]
 [Light Rain]
 [Light Showers Rain Mist]
 [Light Showers Rain Snow Mist]
@@ -151,54 +167,86 @@
 [Light Showers Snow Rain Mist]
 [Light Showers Snow Rain]
 [Light Showers Snow]
+[Light Snow / Fog]
 [Light Snow 30% Chance Of Precipitation]
+[Light Snow And Windy]
 [Light Snow Blowing Snow]
+[Light Snow Early]
 [Light Snow Freezing Fog]
 [Light Snow Grains Mist]
 [Light Snow Grains]
+[Light Snow Late]
 [Light Snow Light Blowing Snow]
 [Light Snow Low Drifting Snow Mist]
 [Light Snow Low Drifting Snow]
 [Light Snow Mist]
 [Light Snow Rain]
 [Light Snow Shallow Fog]
+[Light Snow Shower And Windy]
+[Light Snow Shower]
 [Light Snow Showers]
 [Light Snow]
 [Light Thunderstorm Rain]
 [Light Thunderstorm]
 [Local Time]
-[longer]
-[Longitude]
 [Low Drifting Snow Mist]
 [Low Drifting Snow]
-[Max]
-[Min]
+[Low]
 [Mist]
-[Monday]
+[Moderate]
+[Moon phase]
 [Moon]
 [Moonrise]
 [Moonset]
 [Mostly Clear]
+[Mostly Cloudy / Wind]
+[Mostly Cloudy And Windy]
 [Mostly Cloudy]
+[Mostly Sunny / Wind]
 [Mostly Sunny]
-[N/a]
 [NE]
 [NNE]
 [NNW]
 [NW]
 [N]
 [New Moon]
-[North]
-[Northeast]
-[Northwest]
-[of the Moon is Illuminated]
+[Night]
+[Observatory]
 [Overcast]
 [Partial Fog]
+[Partially cloudy]
+[Partially sunny]
+[Partly Cloudy / Wind]
+[Partly Cloudy / Windy]
+[Partly Cloudy And Windy]
 [Partly Cloudy]
 [Partly Sunny]
 [Patches Fog Mist]
 [Patches Fog]
+[Pm Light Rain]
+[Pm Rain / Snow]
+[Pm Rain / Wind]
+[Pm Rain]
+[Pm Showers / Wind]
+[Pm Showers]
+[Pm Snow Showers]
+[Pm Snow]
+[Pm T-Storms]
+[Precipitation]
 [Pressure Change]
+[Pressure Tendency]
+[Rain / Freezing Rain / Wind]
+[Rain / Freezing Rain]
+[Rain / Snow / Wind]
+[Rain / Snow Early]
+[Rain / Snow Late]
+[Rain / Snow Showers Early]
+[Rain / Snow Showers Late]
+[Rain / Snow Showers]
+[Rain / Snow]
+[Rain / Thunder]
+[Rain / Wind Early]
+[Rain / Wind]
 [Rain 100% Chance Of Precipitation]
 [Rain 20% Chance Of Precipitation]
 [Rain 40% Chance Of Precipitation]
@@ -207,8 +255,14 @@
 [Rain 70% Chance Of Precipitation]
 [Rain 80% Chance Of Precipitation]
 [Rain 90% Chance Of Precipitation]
+[Rain And Snow]
+[Rain Early]
 [Rain Fog]
+[Rain Late]
 [Rain Mist]
+[Rain Shower]
+[Rain Showers]
+[Rain To Snow]
 [Rain]
 [Rising]
 [SE]
@@ -216,10 +270,19 @@
 [SSW]
 [SW]
 [S]
-[Saturday]
+[Sand]
 [Scattered Clouds]
+[Scattered Showers]
+[Scattered Snow Showers]
+[Scattered T-Storms / Wind]
+[Scattered T-Storms]
+[Scattered Thunderstorms]
 [Shallow Fog]
-[shorter]
+[Showers / Wind Late]
+[Showers / Wind]
+[Showers Early]
+[Showers In The Vicinity]
+[Showers Late]
 [Showers Rain Snow]
 [Showers Rain]
 [Showers Showers Rain]
@@ -229,7 +292,13 @@
 [Showers Snow Mist]
 [Showers Snow Rain]
 [Showers Snow]
+[Showers]
+[Sleet And Windy]
+[Sleet]
 [Smoke]
+[Snow / Wind Early]
+[Snow / Wind]
+[Snow / Windy]
 [Snow 100% Chance Of Precipitation]
 [Snow 20% Chance Of Precipitation]
 [Snow 30% Chance Of Precipitation]
@@ -239,7 +308,9 @@
 [Snow 70% Chance Of Precipitation]
 [Snow 80% Chance Of Precipitation]
 [Snow 90% Chance Of Precipitation]
+[Snow And Sleet]
 [Snow Blowing Snow]
+[Snow Early]
 [Snow Freezing Rain Mist]
 [Snow Freezing Rain]
 [Snow Grains]
@@ -247,20 +318,30 @@
 [Snow Mist]
 [Snow Rain Mist]
 [Snow Rain]
+[Snow Shower / Wind]
+[Snow Shower And Windy]
+[Snow Shower]
+[Snow Showers / Wind Early]
 [Snow Showers 30% Chance Of Precipitation]
 [Snow Showers 40% Chance Of Precipitation]
 [Snow Showers 50% Chance Of Precipitation]
 [Snow Showers 60% Chance Of Precipitation]
 [Snow Showers 70% Chance Of Precipitation]
 [Snow Showers 80% Chance Of Precipitation]
+[Snow Showers Early]
+[Snow Showers Late]
 [Snow Showers]
+[Snow To Rain]
+[Snow To Wintry Mix]
 [Snow]
-[South]
-[Southeast]
-[Southwest]
 [Stable]
 [Steady]
-[Sunday]
+[Sunny / Wind]
+[Sunny / Windy]
+[Sunny]
+[T-Showers Early]
+[T-Showers]
+[T-Storm]
 [T-Storms 100% Chance Of Precipitation]
 [T-Storms 30% Chance Of Precipitation]
 [T-Storms 40% Chance Of Precipitation]
@@ -269,13 +350,17 @@
 [T-Storms 70% Chance Of Precipitation]
 [T-Storms 80% Chance Of Precipitation]
 [T-Storms 90% Chance Of Precipitation]
+[T-Storms Early]
+[T-Storms Late]
+[T-Storms]
+[Temperature]
+[Thunder In The Vicinity]
 [Thunderstorm Rain]
 [Thunderstorm]
 [Thunderstorms And Rain]
-[Thursday]
-[Tuesday]
 [UV Index]
-[Var]
+[UVI]
+[UV]
 [Visible Light Length]
 [WNW]
 [WSW]
@@ -284,9 +369,22 @@
 [Waning Gibbous]
 [Waxing Crescent]
 [Waxing Gibbous]
-[Wednesday]
 [West]
+[Wind Chill]
 [Wind Direction DEG]
+[Wind Direction Degrees]
 [Wind Direction]
 [Wind Gust]
 [Wind Speed]
+[Wind direction]
+[Wind speed]
+[Wintry Mix / Wind]
+[Forecast Day 1]
+[Forecast Day 2]
+[Forecast Day 3]
+[Forecast Day 4]
+[Forecast Day 5]
+[Forecast Day 6]
+[Forecast Day 7]
+[Forecast Day 8]
+[Forecast Day 9]
diff --git a/langpacks/english/Weather/msn.txt b/langpacks/english/Weather/msn.txt
deleted file mode 100644
index abf7515ae3..0000000000
--- a/langpacks/english/Weather/msn.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-;============================================================
-;  File: msn.ini
-;  Plugin: Weather
-;============================================================
-[Condition]
-[Feel]
-[Forecast Day 1]
-[Forecast Day 2]
-[Forecast Day 3]
-[Forecast Day 4]
-[Forecast Day 5]
-[Forecast Day 6]
-[Forecast Day 7]
-[Forecast Day 8]
-[Forecast Day 9]
-[Heat Index]
-[High]
-[Light Rain And Snow]
-[Low]
-[Moon phase]
-[Moonrise]
-[Moonset]
-[Precipitation]
-[Rain Showers]
-[Temperature]
-[UV Index]
-[Wind direction]
-[Wind speed]
diff --git a/langpacks/english/Weather/weatherxml.txt b/langpacks/english/Weather/weatherxml.txt
deleted file mode 100644
index 819b67f4d8..0000000000
--- a/langpacks/english/Weather/weatherxml.txt
+++ /dev/null
@@ -1,215 +0,0 @@
-;============================================================
-;  File: weatherxml.ini
-;  Plugin: Weather
-;============================================================
-[AM Rain]
-[Am Clouds / Pm Sun]
-[Am Light Rain]
-[Am Rain / Snow Showers]
-[Am Rain / Snow]
-[Am Rain]
-[Am Showers / Wind]
-[Am Showers]
-[Am Snow Showers / Wind]
-[Am Snow Showers]
-[Am Snow]
-[Am T-Storms]
-[Clear / Wind]
-[Clouds Early / Clearing Late]
-[Cloudy / Wind]
-[Cloudy / Windy]
-[Cloudy And Windy]
-[Cloudy]
-[Drifting Snow]
-[ENE]
-[ESE]
-[E]
-[Fair / Windy]
-[Fair And Windy]
-[Fair]
-[Feel]
-[Few Showers / Wind]
-[Few Showers]
-[Few Snow Showers]
-[First Quarter]
-[Fog / Windy]
-[Fog And Windy]
-[Fog Late]
-[Fog]
-[Forecast Day 0]
-[Forecast Day 1]
-[Forecast Day 2]
-[Forecast Day 3]
-[Forecast Day 4]
-[Forecast Day 5]
-[Forecast Day 6]
-[Forecast Day 7]
-[Forecast Day 8]
-[Forecast Day 9]
-[Forecast Update VAR]
-[Forecast Update]
-[Freezing Drizzle / Windy]
-[Freezing Rain / Windy]
-[Full Moon]
-[Haze]
-[Heat Index]
-[Heavy Rain / Wind]
-[Heavy Rain]
-[Heavy Snow And Windy]
-[Heavy Snow Shower]
-[Heavy Snow]
-[Heavy T-Storm]
-[Heavy T-Storms]
-[Ice Crystals]
-[Isolated T-Storms / Wind]
-[Isolated T-Storms]
-[Jun]
-[Last Quarter]
-[Latitude]
-[Light Drizzle And Fog]
-[Light Drizzle And Windy]
-[Light Drizzle]
-[Light Freezing Rain / Fog]
-[Light Freezing Rain / Windy]
-[Light Rain / Fog]
-[Light Rain / Freezing Rain]
-[Light Rain / Wind Early]
-[Light Rain / Wind]
-[Light Rain / Windy]
-[Light Rain And Windy]
-[Light Rain Early]
-[Light Rain Late]
-[Light Rain Shower And Windy]
-[Light Rain Shower]
-[Light Rain With Thunder]
-[Light Rain]
-[Light Showers Rain]
-[Light Snow / Fog]
-[Light Snow And Windy]
-[Light Snow Early]
-[Light Snow Late]
-[Light Snow Shower And Windy]
-[Light Snow Shower]
-[Light Snow]
-[Light Thunderstorm Rain]
-[Local Time]
-[Longitude]
-[Mist]
-[Moderate]
-[Moon]
-[Mostly Clear]
-[Mostly Cloudy / Wind]
-[Mostly Cloudy And Windy]
-[Mostly Cloudy]
-[Mostly Sunny / Wind]
-[Mostly Sunny]
-[N/A%]
-[N/a]
-[NE]
-[NNE]
-[NNW]
-[NW]
-[N]
-[New Moon]
-[Night]
-[Observatory]
-[Overcast]
-[Partly Cloudy / Wind]
-[Partly Cloudy / Windy]
-[Partly Cloudy And Windy]
-[Partly Cloudy]
-[Partly Sunny]
-[Pm Light Rain]
-[Pm Rain / Snow]
-[Pm Rain / Wind]
-[Pm Rain]
-[Pm Showers / Wind]
-[Pm Showers]
-[Pm Snow Showers]
-[Pm Snow]
-[Pm T-Storms]
-[Pressure Tendency]
-[Rain / Freezing Rain / Wind]
-[Rain / Freezing Rain]
-[Rain / Snow / Wind]
-[Rain / Snow Early]
-[Rain / Snow Late]
-[Rain / Snow Showers Early]
-[Rain / Snow Showers Late]
-[Rain / Snow Showers]
-[Rain / Snow]
-[Rain / Thunder]
-[Rain / Wind Early]
-[Rain / Wind]
-[Rain And Snow]
-[Rain Early]
-[Rain Late]
-[Rain Shower]
-[Rain To Snow]
-[Rain]
-[SE]
-[SSE]
-[SSW]
-[SW]
-[S]
-[Sand]
-[Scattered Showers]
-[Scattered Snow Showers]
-[Scattered T-Storms / Wind]
-[Scattered T-Storms]
-[Shallow Fog]
-[Showers / Wind Late]
-[Showers / Wind]
-[Showers Early]
-[Showers In The Vicinity]
-[Showers Late]
-[Showers Rain]
-[Showers]
-[Sleet And Windy]
-[Sleet]
-[Smoke]
-[Snow / Wind Early]
-[Snow / Wind]
-[Snow / Windy]
-[Snow And Sleet]
-[Snow Early]
-[Snow Shower / Wind]
-[Snow Shower And Windy]
-[Snow Shower]
-[Snow Showers / Wind Early]
-[Snow Showers Early]
-[Snow Showers Late]
-[Snow To Rain]
-[Snow To Wintry Mix]
-[Snow]
-[Sunny / Wind]
-[Sunny / Windy]
-[Sunny]
-[T-Showers Early]
-[T-Showers]
-[T-Storm]
-[T-Storms Early]
-[T-Storms Late]
-[T-Storms]
-[Thunder In The Vicinity]
-[Thunderstorm Rain]
-[Thunderstorm]
-[UV Index]
-[UVI]
-[UV]
-[Update VAR]
-[WNW]
-[WSW]
-[W]
-[Waning Crescent]
-[Waning Gibbous]
-[Waxing Crescent]
-[Waxing Gibbous]
-[Wind Direction DEG]
-[Wind Direction]
-[Wind Speed]
-[WindDir]
-[Wintry Mix / Wind]
-[falling]
-[rising]
-[steady]
diff --git a/langpacks/english/Weather/wundergrnd_intl.txt b/langpacks/english/Weather/wundergrnd_intl.txt
deleted file mode 100644
index 55650122f7..0000000000
--- a/langpacks/english/Weather/wundergrnd_intl.txt
+++ /dev/null
@@ -1,290 +0,0 @@
-;============================================================
-;  File: wundergrnd_intl.ini
-;  Plugin: Weather
-;============================================================
-[Alert]
-[Blowing Snow]
-[Chance Of A Thunderstorm 20% Chance Of Precipitation]
-[Chance Of Rain 20% Chance Of Precipitation]
-[Chance Of Rain 30% Chance Of Precipitation]
-[Chance Of Rain 40% Chance Of Precipitation]
-[Chance Of Rain 50% Chance Of Precipitation]
-[Chance Of Rain 60% Chance Of Precipitation]
-[Chance Of Rain 70% Chance Of Precipitation]
-[Chance Of Rain 80% Chance Of Precipitation]
-[Chance Of Snow 20% Chance Of Precipitation]
-[Chance Of Snow 30% Chance Of Precipitation]
-[Chance Of Snow 40% Chance Of Precipitation]
-[Chance Of Snow 50% Chance Of Precipitation]
-[Chance Of Snow 60% Chance Of Precipitation]
-[Chance Of Snow 70% Chance Of Precipitation]
-[Chance Of Snow 80% Chance Of Precipitation]
-[Chance Of T-Storms 20% Chance Of Precipitation]
-[Chance Of T-Storms 30% Chance Of Precipitation]
-[Chance Of T-Storms 40% Chance Of Precipitation]
-[Chance Of T-Storms 50% Chance Of Precipitation]
-[Chance Of T-Storms 60% Chance Of Precipitation]
-[Chance Of T-Storms 70% Chance Of Precipitation]
-[Chance Of T-Storms 80% Chance Of Precipitation]
-[Chance Of T-Storms 90% Chance Of Precipitation]
-[Chance Rain 40% Chance Of Precipitation]
-[Chance Rain 50% Chance Of Precipitation]
-[Chance Rain 80% Chance Of Precipitation]
-[Chance Rain 90% Chance Of Precipitation]
-[Clear]
-[Cloudy]
-[Day Length Diff]
-[Day Length]
-[Drizzle Fog]
-[Drizzle Mist]
-[Drizzle]
-[ENE]
-[ESE]
-[E]
-[East]
-[Elevation]
-[Falling]
-[Feel]
-[First Quarter]
-[Fog]
-[Forecast Day 1 Condition]
-[Forecast Day 1 Day]
-[Forecast Day 1 High]
-[Forecast Day 1 Low]
-[Forecast Day 1 Night Text]
-[Forecast Day 1 Text]
-[Forecast Day 1]
-[Forecast Day 2 Condition]
-[Forecast Day 2 Day]
-[Forecast Day 2 High]
-[Forecast Day 2 Low]
-[Forecast Day 2 Night Text]
-[Forecast Day 2 Text]
-[Forecast Day 2]
-[Forecast Day 3 Condition]
-[Forecast Day 3 Day]
-[Forecast Day 3 High]
-[Forecast Day 3 Low]
-[Forecast Day 3 Night Text]
-[Forecast Day 3 Text]
-[Forecast Day 3]
-[Forecast Day 4 Condition]
-[Forecast Day 4 Day]
-[Forecast Day 4 High]
-[Forecast Day 4 Low]
-[Forecast Day 4 Night Text]
-[Forecast Day 4 Text]
-[Forecast Day 4]
-[Forecast Day 5 Condition]
-[Forecast Day 5 Day]
-[Forecast Day 5 High]
-[Forecast Day 5 Low]
-[Forecast Day 5 Night Text]
-[Forecast Day 5 Text]
-[Forecast Day 5]
-[Freezing Drizzle Mist]
-[Freezing Drizzle]
-[Freezing Fog]
-[Freezing Rain Mist]
-[Freezing Rain]
-[Friday]
-[Full Moon]
-[Haze]
-[Heat Index]
-[Heavy Blowing Snow]
-[Heavy Fog]
-[Heavy Rain Showers]
-[Heavy Showers Snow Blowing Snow]
-[Heavy Showers Snow Heavy Blowing Snow]
-[Heavy Showers Snow Mist]
-[Heavy Showers Snow]
-[Heavy Snow Showers]
-[Heavy Snow]
-[Heavy Thunderstorm Rain]
-[Ice Crystals Mist]
-[Ice Pellets 30% Chance Of Precipitation]
-[Ice Pellets 40% Chance Of Precipitation]
-[Ice Pellets 50% Chance Of Precipitation]
-[Ice Pellets 60% Chance Of Precipitation]
-[Ice Pellets 70% Chance Of Precipitation]
-[Ice Pellets 80% Chance Of Precipitation]
-[Ice Pellets 90% Chance Of Precipitation]
-[Ice Pellets]
-[Last Quarter]
-[Latitude]
-[Light Blowing Snow]
-[Light Drizzle Fog]
-[Light Drizzle Mist Patches Fog]
-[Light Drizzle Mist]
-[Light Drizzle]
-[Light Fog]
-[Light Freezing Drizzle Light Snow Grains Mist]
-[Light Freezing Drizzle Light Snow]
-[Light Freezing Drizzle Mist]
-[Light Freezing Drizzle Snow]
-[Light Freezing Drizzle]
-[Light Freezing Rain Light Showers Snow Mist]
-[Light Freezing Rain Light Showers Snow]
-[Light Freezing Rain Light Snow]
-[Light Freezing Rain Mist]
-[Light Freezing Rain]
-[Light Ice Pellets Mist]
-[Light Ice Pellets]
-[Light Low Drifting Snow]
-[Light Rain Fog]
-[Light Rain Mist]
-[Light Rain Showers]
-[Light Rain Snow Mist]
-[Light Rain Snow]
-[Light Rain]
-[Light Showers Rain Mist]
-[Light Showers Rain Snow Mist]
-[Light Showers Rain Snow]
-[Light Showers Rain]
-[Light Showers Showers Rain]
-[Light Showers Snow Blowing Snow]
-[Light Showers Snow Light Blowing Snow]
-[Light Showers Snow Low Drifting Snow]
-[Light Showers Snow Mist]
-[Light Showers Snow Rain Mist]
-[Light Showers Snow Rain]
-[Light Showers Snow]
-[Light Snow 30% Chance Of Precipitation]
-[Light Snow Blowing Snow]
-[Light Snow Freezing Fog]
-[Light Snow Grains Mist]
-[Light Snow Grains]
-[Light Snow Light Blowing Snow]
-[Light Snow Low Drifting Snow Mist]
-[Light Snow Low Drifting Snow]
-[Light Snow Mist]
-[Light Snow Rain]
-[Light Snow Shallow Fog]
-[Light Snow Showers]
-[Light Snow]
-[Light Thunderstorm Rain]
-[Light Thunderstorm]
-[Local Time]
-[Longitude]
-[Low Drifting Snow Mist]
-[Low Drifting Snow]
-[Max]
-[Min]
-[Mist]
-[Monday]
-[Moon]
-[Moonrise]
-[Moonset]
-[Mostly Clear]
-[Mostly Cloudy]
-[Mostly Sunny]
-[N/a]
-[NE]
-[NNE]
-[NNW]
-[NW]
-[N]
-[New Moon]
-[North]
-[Northeast]
-[Northwest]
-[Overcast]
-[Partial Fog]
-[Partly Cloudy]
-[Partly Sunny]
-[Patches Fog Mist]
-[Patches Fog]
-[Pressure Change]
-[Rain 100% Chance Of Precipitation]
-[Rain 20% Chance Of Precipitation]
-[Rain 40% Chance Of Precipitation]
-[Rain 50% Chance Of Precipitation]
-[Rain 60% Chance Of Precipitation]
-[Rain 70% Chance Of Precipitation]
-[Rain 80% Chance Of Precipitation]
-[Rain 90% Chance Of Precipitation]
-[Rain Fog]
-[Rain Mist]
-[Rain]
-[Rising]
-[SE]
-[SSE]
-[SSW]
-[SW]
-[S]
-[Saturday]
-[Scattered Clouds]
-[Shallow Fog]
-[Showers Rain Snow]
-[Showers Rain]
-[Showers Showers Rain]
-[Showers Snow Blowing Snow]
-[Showers Snow Heavy Blowing Snow]
-[Showers Snow Low Drifting Snow]
-[Showers Snow Mist]
-[Showers Snow Rain]
-[Showers Snow]
-[Smoke]
-[Snow 100% Chance Of Precipitation]
-[Snow 20% Chance Of Precipitation]
-[Snow 30% Chance Of Precipitation]
-[Snow 40% Chance Of Precipitation]
-[Snow 50% Chance Of Precipitation]
-[Snow 60% Chance Of Precipitation]
-[Snow 70% Chance Of Precipitation]
-[Snow 80% Chance Of Precipitation]
-[Snow 90% Chance Of Precipitation]
-[Snow Blowing Snow]
-[Snow Freezing Rain Mist]
-[Snow Freezing Rain]
-[Snow Grains]
-[Snow Heavy Blowing Snow]
-[Snow Mist]
-[Snow Rain Mist]
-[Snow Rain]
-[Snow Showers 30% Chance Of Precipitation]
-[Snow Showers 40% Chance Of Precipitation]
-[Snow Showers 50% Chance Of Precipitation]
-[Snow Showers 60% Chance Of Precipitation]
-[Snow Showers 70% Chance Of Precipitation]
-[Snow Showers 80% Chance Of Precipitation]
-[Snow Showers]
-[Snow]
-[South]
-[Southeast]
-[Southwest]
-[Stable]
-[Steady]
-[Sunday]
-[T-Storms 100% Chance Of Precipitation]
-[T-Storms 30% Chance Of Precipitation]
-[T-Storms 40% Chance Of Precipitation]
-[T-Storms 50% Chance Of Precipitation]
-[T-Storms 60% Chance Of Precipitation]
-[T-Storms 70% Chance Of Precipitation]
-[T-Storms 80% Chance Of Precipitation]
-[T-Storms 90% Chance Of Precipitation]
-[Thunderstorm Rain]
-[Thunderstorm]
-[Thunderstorms And Rain]
-[Thursday]
-[Tuesday]
-[UV Index]
-[Var]
-[Visible Light Length]
-[WNW]
-[WSW]
-[W]
-[Waning Crescent]
-[Waning Gibbous]
-[Waxing Crescent]
-[Waxing Gibbous]
-[Wednesday]
-[West]
-[Wind Direction DEG]
-[Wind Direction]
-[Wind Gust]
-[Wind Speed]
-[longer]
-[of the Moon is Illuminated]
-[shorter]
diff --git a/langpacks/english/Weather/yweather.txt b/langpacks/english/Weather/yweather.txt
deleted file mode 100644
index f14e079e75..0000000000
--- a/langpacks/english/Weather/yweather.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-;============================================================
-;  File: yweather.ini
-;  Plugin: Weather
-;============================================================
-[ENE]
-[ESE]
-[E]
-[East]
-[Feel]
-[Forecast Day 1 Condition]
-[Forecast Day 1 Date]
-[Forecast Day 1 Day]
-[Forecast Day 1 High]
-[Forecast Day 1 Low]
-[Forecast Day 1]
-[Fri]
-[Heat Index]
-[Mon]
-[Mostly Clear]
-[Mostly Cloudy]
-[Mostly Sunny]
-[NE]
-[NNE]
-[NNW]
-[NW]
-[N]
-[North]
-[Northeast]
-[Northwest]
-[Partly Cloudy]
-[Partly Sunny]
-[SE]
-[SSE]
-[SSW]
-[SW]
-[S]
-[Sat]
-[Scattered Clouds]
-[South]
-[Southeast]
-[Southwest]
-[Sun]
-[Sunny]
-[Thu]
-[Tue]
-[WNW]
-[WSW]
-[W]
-[Wed]
-[West]
-[Wind Direction Degrees]
-[Wind Direction]
-[Wind Speed]