Merge branch 'Plasma/5.15'

7 years ago · 52cbdeffe0
parent 51b2c71308 346c3e91a2
commit 52cbdeffe0
2 changed files with 1 additions and 1 deletions
--- a/dataengines/weather/ions/data/noaa_i18n.dat
+++ b/dataengines/weather/ions/data/noaa_i18n.dat
@ -284,6 +284,7 @@ weather forecast|Slight Chance Rain/Freezing Rain
 weather forecast|Chance Rain/Freezing Rain
 weather forecast|Rain/Freezing Rain Likely
 weather forecast|Rain/Freezing Rain
+weather forecast|Wintry Mix Likely
 weather forecast|Wintry Mix
 weather forecast|Slight Chance Freezing Drizzle
 weather forecast|Chance Freezing Drizzle
--- a/kioslave/applications/kio_applications.cpp
+++ b/kioslave/applications/kio_applications.cpp
@ -193,6 +193,5 @@ void ApplicationsProtocol::listDir(const QUrl& url)
    }

    totalSize(count);
-    listEntry(entry);
    finished();
 }