Merge branch 'Plasma/5.14'

dataengines/weather/ions/data/envcan_i18n.dat

@@ -78,8 +78,6 @@ weather condition|Snow Crystals
 weather condition|Snow Grains
 weather condition|Squalls
 weather condition|Sunny
-weather condition|Mainly Sunny
-weather condition|Partly Cloudy
 weather condition|Thunderstorm with Hail
 weather condition|Thunderstorm with Rain
 weather condition|Thunderstorm with Sand or Dust Storm
@@ -161,6 +159,7 @@ weather forecast|Chance of wet snow or rain
 weather forecast|Clear
 weather forecast|Clearing
 weather forecast|Cloudy
+weather forecast|Mainly cloudy
 weather forecast|Cloudy periods
 weather forecast|Cloudy with sunny periods
 weather forecast|Drizzle

dataengines/weather/ions/data/noaa_i18n.dat

@@ -48,7 +48,6 @@ weather condition|Heavy Drizzle Fog
 weather condition|Heavy Drizzle Fog/Mist
 weather condition|Heavy Drizzle Ice Pellets
 weather condition|Heavy Drizzle Snow
-weather condition|Heavy Drizzle Snow
 weather condition|Heavy Dust Storm
 weather condition|Heavy Freezing Drizzle
 weather condition|Heavy Freezing Drizzle Rain
@@ -290,6 +289,7 @@ weather forecast|Freezing Rain
 weather forecast|Chance Rain/Snow
 weather forecast|Rain/Snow Likely
 weather forecast|Rain/Snow
+weather forecast|Slight Chance Snow
 weather forecast|Chance Snow
 weather forecast|Snow Likely
 weather forecast|Snow
@@ -297,15 +297,14 @@ weather forecast|Heavy Snow
 weather forecast|Chance Flurries
 weather forecast|Flurries Likely
 weather forecast|Flurries
-weather forecast|Chance Snow Showers
-weather forecast|Snow Showers Likely
-weather forecast|Snow Showers
+weather forecast|Slight Chance Snow Showers
 weather forecast|Chance Snow Showers
 weather forecast|Snow Showers Likely
 weather forecast|Snow Showers
 weather forecast|Chance Drizzle
 weather forecast|Drizzle Likely
 weather forecast|Drizzle
+weather forecast|Slight Chance Rain
 weather forecast|Chance Rain
 weather forecast|Rain Likely
 weather forecast|Rain
@@ -313,9 +312,6 @@ weather forecast|Heavy Rain
 weather forecast|Chance Rain Showers
 weather forecast|Rain Showers Likely
 weather forecast|Rain Showers
-weather forecast|Chance Rain Showers
-weather forecast|Rain Showers Likely
-weather forecast|Rain Showers
 weather forecast|Sleet
 weather forecast|Smoke
 weather forecast|Freezing Fog
@@ -335,6 +331,7 @@ weather forecast|Cloudy
 weather forecast|Mostly Cloudy
 weather forecast|Partly Cloudy
 weather forecast|Mostly Sunny
+weather forecast|Partly Sunny
 weather forecast|Sunny
 weather forecast|Increasing Clouds
 weather forecast|Becoming Cloudy
@@ -345,5 +342,4 @@ weather forecast|Decreasing Clouds
 weather forecast|Becoming Sunny
 weather forecast|Clear
 weather forecast|Mostly Clear
-weather forecast|Chance Thunderstorms
 weather forecast|Slight Chance Thunderstorms

dataengines/weather/ions/envcan/ion_envcan.cpp

@@ -213,6 +213,7 @@ QMap<QString, IonInterface::ConditionIcons> EnvCanadaIon::setupForecastIconMappi
         { QStringLiteral("a mix of sun and cloud"), PartlyCloudyDay },
         { QStringLiteral("cloudy with sunny periods"), PartlyCloudyDay },
         { QStringLiteral("partly cloudy"), PartlyCloudyDay },
+        { QStringLiteral("mainly cloudy"), PartlyCloudyDay },
         { QStringLiteral("mainly sunny"), FewCloudsDay },
         { QStringLiteral("sunny"), ClearDay },
         { QStringLiteral("blizzard"), Snow },