Merge branch 'Plasma/5.2'

Conflicts:
	CMakeLists.txt
	applets/batterymonitor/package/metadata.desktop
	applets/clipboard/metadata.desktop
	klipper/plasma-dataengine-clipboard.desktop
	ksmserver/screenlocker/kcm/package/metadata.desktop
	lookandfeel/metadata.desktop
	plasma-windowed/plasma-windowed.desktop
	shell/packageplugins/layouttemplate/plasma-packagestructure-
layouttemplate.desktop
	shell/packageplugins/qmlWallpaper/plasma-packagestructure-
wallpaper.desktop
	shell/packageplugins/shell/plasma-packagestructure-plasma-
shell.desktop
	shell/packageplugins/wallpaperimages/plasma-packagestructure-
wallpaperimages.desktop

applets/batterymonitor/package/metadata.desktop

@@ -2,6 +2,7 @@
 Name=Battery and Brightness
 Name[ca]=Bateria i lluminositat
 Name[cs]=Baterie a Jas
+Name[da]=Batteri og lysstyrke
 Name[de]=Akku und Bildschirmhelligkeit
 Name[el]=Μπαταρία και φωτεινότητα
 Name[en_GB]=Battery and Brightness

applets/digital-clock/package/contents/ui/DigitalClock.qml

@@ -229,10 +229,11 @@ Item {
     MouseArea {
         id: mouseArea
 
+        property int wheelDelta: 0
+
         anchors.fill: parent
 
         onClicked: plasmoid.expanded = !plasmoid.expanded
-
         onWheel: {
             if (!plasmoid.configuration.wheelChangesTimezone) {
                 return;
@@ -240,12 +241,17 @@ Item {
 
             var delta = wheel.angleDelta.y || wheel.angleDelta.x
             var newIndex = main.tzIndex;
-
-            if (delta < 0) {
-                newIndex--;
-            } else if (delta > 0) {
+            wheelDelta += delta;
+            // magic number 120 for common "one click"
+            // See: http://qt-project.org/doc/qt-5/qml-qtquick-wheelevent.html#angleDelta-prop
+            while (wheelDelta >= 120) {
+                wheelDelta -= 120;
                 newIndex++;
             }
+            while (wheelDelta <= -120) {
+                wheelDelta += 120;
+                newIndex--;
+            }
 
             if (newIndex >= plasmoid.configuration.selectedTimeZones.length) {
                 newIndex = 0;
@@ -253,11 +259,13 @@ Item {
                 newIndex = plasmoid.configuration.selectedTimeZones.length - 1;
             }
 
-            plasmoid.configuration.lastSelectedTimezone = plasmoid.configuration.selectedTimeZones[newIndex];
-            main.tzIndex = newIndex;
+            if (newIndex != main.tzIndex) {
+                plasmoid.configuration.lastSelectedTimezone = plasmoid.configuration.selectedTimeZones[newIndex];
+                main.tzIndex = newIndex;
 
-            dataSource.dataChanged();
-            setupLabels();
+                dataSource.dataChanged();
+                setupLabels();
+            }
         }
     }
 
@@ -411,7 +419,7 @@ Item {
         // get the time for the given timezone from the dataengine
         var now = dataSource.data[plasmoid.configuration.selectedTimeZones[zone]]["DateTime"];
         // get current UTC time
-        var msUTC = now.getTime() + (now.getTimezoneOffset() * 60000);
+        var msUTC = now.getTime() + (-(now.getTimezoneOffset()) * 60000);
         // add the dataengine TZ offset to it
         var dateTime = new Date(msUTC + (dataSource.data[plasmoid.configuration.selectedTimeZones[zone]]["Offset"] * 1000));
 
@@ -480,7 +488,7 @@ Item {
             }
         }
 
-        tzOffset = new Date().getTimezoneOffset();
+        tzOffset = -(new Date().getTimezoneOffset());
         dateTimeChanged();
         timeFormatCorrection(Qt.locale().timeFormat(Locale.ShortFormat));
         updateToolTip();

lookandfeel/metadata.desktop

@@ -36,6 +36,7 @@ Comment[zh_TW]=KDE VDG 設計的微風桌面設計語言
 Encoding=UTF-8
 Keywords=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;
 Keywords[ca]=Escriptori;Espai de treball;Aparença;Aparença i comportament;Sortida;Bloqueig;Suspensió;Aturada;Hibernació;
+Keywords[da]=Skrivebord;Desktop;Arbejdsområde;Udseende;log ud;Lås;Suspendér;Nedlukning;dvale;
 Keywords[de]=Desktop;Arbeitsfläche;Erscheinungsbild;Erscheinungsbild und Verhalten;Abmelden;Sperren;Ruhezustand;Tiefschlaf;Herunterfahren;
 Keywords[el]=Επιφάνεια εργασίας;Χώρος εργασίας; Εμφάνιση;Όψη και Αίσθηση;Αποσύνδεση;Κλείδωμα;Αναστολή;Τερματισμός;Νάρκη;
 Keywords[en_GB]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;

wallpapers/image/backgroundlistmodel.cpp

@@ -355,7 +355,7 @@ QVariant BackgroundListModel::data(const QModelIndex &index, int role) const
         if (b.metadata().isValid() && !b.metadata().authors().isEmpty()) {
             return b.metadata().authors().first().name();
         } else {
-            return i18nc("Unknown Author", "Unknown");
+            return QString();
         }
     break;
 

wallpapers/image/imagepackage/contents/ui/WallpaperDelegate.qml

@@ -127,11 +127,16 @@ MouseArea {
     Timer {
         interval: 1000 // FIXME TODO: Use platform value for tooltip activation delay.
 
-        running: wallpaperDelegate.containsMouse && !pressed && model.display && model.author
+        running: wallpaperDelegate.containsMouse && !pressed && model.display
 
         onTriggered: {
-            Tooltip.showText(wallpaperDelegate, Qt.point(wallpaperDelegate.mouseX, wallpaperDelegate.mouseY),
-                i18nd("plasma_applet_org.kde.image", "%1 by %2", model.display, model.author));
+            if (model.author) {
+                Tooltip.showText(wallpaperDelegate, Qt.point(wallpaperDelegate.mouseX, wallpaperDelegate.mouseY),
+                                 i18nd("plasma_applet_org.kde.image", "%1 by %2", model.display, model.author));
+            } else {
+                Tooltip.showText(wallpaperDelegate, Qt.point(wallpaperDelegate.mouseX, wallpaperDelegate.mouseY),
+                                 model.display);
+            }
         }
     }