diff -Nru powerdevil-5.10.3/CMakeLists.txt powerdevil-5.10.4/CMakeLists.txt --- powerdevil-5.10.3/CMakeLists.txt 2017-06-27 10:03:58.000000000 +0000 +++ powerdevil-5.10.4/CMakeLists.txt 2017-07-18 11:52:21.000000000 +0000 @@ -1,5 +1,5 @@ project(PowerDevil) -set(PROJECT_VERSION "5.10.3") +set(PROJECT_VERSION "5.10.4") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) diff -Nru powerdevil-5.10.3/debian/changelog powerdevil-5.10.4/debian/changelog --- powerdevil-5.10.3/debian/changelog 2017-07-01 09:16:01.000000000 +0000 +++ powerdevil-5.10.4/debian/changelog 2017-07-19 13:37:27.000000000 +0000 @@ -1,3 +1,9 @@ +powerdevil (4:5.10.4-0ubuntu1) artful; urgency=low + + * New upstream release (5.10.4) + + -- Rik Mills Wed, 19 Jul 2017 14:37:27 +0100 + powerdevil (4:5.10.3-0ubuntu1) artful; urgency=low * New upstream release (5.10.3) diff -Nru powerdevil-5.10.3/debian/control powerdevil-5.10.4/debian/control --- powerdevil-5.10.3/debian/control 2017-07-01 09:16:01.000000000 +0000 +++ powerdevil-5.10.4/debian/control 2017-07-19 13:37:27.000000000 +0000 @@ -5,24 +5,24 @@ Uploaders: Maximiliano Curia Build-Depends: cmake (>= 2.8.12), debhelper (>= 9), - extra-cmake-modules (>= 5.35.0~), - kinit-dev (>= 5.35.0~), - kwayland-dev (>= 4:5.35.0~), - libkf5activities-dev (>= 5.35.0~), - libkf5auth-dev (>= 5.35.0~), - libkf5bluezqt-dev (>= 5.35.0~), - libkf5config-dev (>= 5.35.0~), - libkf5dbusaddons-dev (>= 5.35.0~), - libkf5globalaccel-dev (>= 5.35.0~), - libkf5i18n-dev (>= 5.35.0~), - libkf5idletime-dev (>= 5.35.0~), - libkf5kdelibs4support-dev (>= 5.35.0~), - libkf5kio-dev (>= 5.35.0~), - libkf5networkmanagerqt-dev (>= 5.35.0~), - libkf5notifyconfig-dev (>= 5.35.0~), - libkf5screen-dev (>= 4:5.10.3~), - libkf5solid-dev (>= 5.35.0~), - libkf5wayland-dev (>= 4:5.35.0~), + extra-cmake-modules (>= 5.36.0~), + kinit-dev (>= 5.36.0~), + kwayland-dev (>= 4:5.36.0~), + libkf5activities-dev (>= 5.36.0~), + libkf5auth-dev (>= 5.36.0~), + libkf5bluezqt-dev (>= 5.36.0~), + libkf5config-dev (>= 5.36.0~), + libkf5dbusaddons-dev (>= 5.36.0~), + libkf5globalaccel-dev (>= 5.36.0~), + libkf5i18n-dev (>= 5.36.0~), + libkf5idletime-dev (>= 5.36.0~), + libkf5kdelibs4support-dev (>= 5.36.0~), + libkf5kio-dev (>= 5.36.0~), + libkf5networkmanagerqt-dev (>= 5.36.0~), + libkf5notifyconfig-dev (>= 5.36.0~), + libkf5screen-dev (>= 4:5.10.4~), + libkf5solid-dev (>= 5.36.0~), + libkf5wayland-dev (>= 4:5.36.0~), libqt5x11extras5-dev (>= 5.6.1~), libudev-dev, libx11-dev, @@ -38,7 +38,7 @@ libxrandr-dev, pkg-config, pkg-kde-tools (>= 0.15.18~), - plasma-workspace-dev (>= 4:5.10.3~), + plasma-workspace-dev (>= 4:5.10.4~), qtbase5-dev (>= 5.6.1~) Standards-Version: 3.9.8 Homepage: https://projects.kde.org/projects/kde/workspace/powerdevil diff -Nru powerdevil-5.10.3/po/fr/powerdevilglobalconfig.po powerdevil-5.10.4/po/fr/powerdevilglobalconfig.po --- powerdevil-5.10.3/po/fr/powerdevilglobalconfig.po 2017-06-27 10:03:27.000000000 +0000 +++ powerdevil-5.10.4/po/fr/powerdevilglobalconfig.po 2017-07-18 11:50:59.000000000 +0000 @@ -5,16 +5,16 @@ # Sébastien Renard , 2009. # Ludovic Grossard , 2012, 2015. # xavier , 2013. -# Vincent Pinon , 2016. +# Vincent Pinon , 2016, 2017. # msgid "" msgstr "" "Project-Id-Version: powerdevil\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-05-11 03:05+0200\n" -"PO-Revision-Date: 2016-11-23 12:47+0100\n" +"PO-Revision-Date: 2017-06-28 21:49+0100\n" "Last-Translator: Vincent Pinon \n" -"Language-Team: French \n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -147,4 +147,4 @@ #: generalPage.ui:175 #, kde-format msgid "Pause media players when suspending:" -msgstr "" \ No newline at end of file +msgstr "Mettre en pause les lecteurs multimédia lors de la mise en veille :" \ No newline at end of file diff -Nru powerdevil-5.10.3/po/fr/powerdevil.po powerdevil-5.10.4/po/fr/powerdevil.po --- powerdevil-5.10.3/po/fr/powerdevil.po 2017-06-27 10:03:27.000000000 +0000 +++ powerdevil-5.10.4/po/fr/powerdevil.po 2017-07-18 11:50:59.000000000 +0000 @@ -5,16 +5,16 @@ # Sébastien Renard , 2009, 2012. # xavier , 2013, 2014. # Maxime Corteel , 2015. -# Vincent Pinon , 2016. +# Vincent Pinon , 2016, 2017. # msgid "" msgstr "" "Project-Id-Version: powerdevil\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-06-15 04:52+0200\n" -"PO-Revision-Date: 2016-11-23 13:56+0100\n" +"PO-Revision-Date: 2017-06-28 18:28+0100\n" "Last-Translator: Vincent Pinon \n" -"Language-Team: French \n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -124,7 +124,7 @@ #: actions/bundled/suspendsessionconfig.cpp:90 #, kde-format msgid "Hybrid suspend" -msgstr "" +msgstr "Mise en veille hybride" #: actions/bundled/handlebuttoneventsconfig.cpp:110 #: actions/bundled/suspendsessionconfig.cpp:92 diff -Nru powerdevil-5.10.3/po/zh_CN/libpowerdevilcommonconfig.po powerdevil-5.10.4/po/zh_CN/libpowerdevilcommonconfig.po --- powerdevil-5.10.3/po/zh_CN/libpowerdevilcommonconfig.po 2017-06-27 10:03:49.000000000 +0000 +++ powerdevil-5.10.4/po/zh_CN/libpowerdevilcommonconfig.po 2017-07-18 11:52:03.000000000 +0000 @@ -1,21 +1,21 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# Feng Chao , 2014. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-10-17 08:24+0000\n" -"PO-Revision-Date: 2014-07-05 14:56+0800\n" -"Last-Translator: Feng Chao \n" -"Language-Team: Chinese Simplified \n" +"PO-Revision-Date: 2017-07-11 06:33-0400\n" +"Last-Translator: guoyunhebrave \n" +"Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Language: zh-CN\n" +"X-Crowdin-File: /kf5-stable/messages/kde-workspace/libpowerdevilcommonconfig." +"pot\n" #: ErrorOverlay.cpp:40 #, kde-format diff -Nru powerdevil-5.10.3/po/zh_CN/powerdevilactivitiesconfig.po powerdevil-5.10.4/po/zh_CN/powerdevilactivitiesconfig.po --- powerdevil-5.10.3/po/zh_CN/powerdevilactivitiesconfig.po 2017-06-27 10:03:49.000000000 +0000 +++ powerdevil-5.10.4/po/zh_CN/powerdevilactivitiesconfig.po 2017-07-18 11:52:03.000000000 +0000 @@ -1,23 +1,21 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# FengChao , 2011, 2013. -# Weng Xuetian , 2011, 2016. -# Xuetian Weng , 2015. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-05-09 03:03+0200\n" -"PO-Revision-Date: 2016-06-17 13:01-0800\n" -"Last-Translator: Weng Xuetian \n" -"Language-Team: Chinese \n" +"PO-Revision-Date: 2017-07-11 06:33-0400\n" +"Last-Translator: guoyunhebrave \n" +"Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Language: zh-CN\n" +"X-Crowdin-File: /kf5-stable/messages/kde-workspace/" +"powerdevilactivitiesconfig.pot\n" #, kde-format msgctxt "NAME OF TRANSLATORS" diff -Nru powerdevil-5.10.3/po/zh_CN/powerdevilglobalconfig.po powerdevil-5.10.4/po/zh_CN/powerdevilglobalconfig.po --- powerdevil-5.10.3/po/zh_CN/powerdevilglobalconfig.po 2017-06-27 10:03:49.000000000 +0000 +++ powerdevil-5.10.4/po/zh_CN/powerdevilglobalconfig.po 2017-07-18 11:52:03.000000000 +0000 @@ -1,16 +1,9 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# Feng Chao , 2010, 2011, 2014. -# Weng Xuetian , 2012, 2015, 2016. -# Xuetian Weng , 2015. -# Guo Yunhe , 2017. msgid "" msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-05-11 03:05+0200\n" -"PO-Revision-Date: 2017-05-27 12:36-0400\n" +"PO-Revision-Date: 2017-07-11 06:33-0400\n" "Last-Translator: guoyunhebrave \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -Nru powerdevil-5.10.3/po/zh_CN/powerdevil.po powerdevil-5.10.4/po/zh_CN/powerdevil.po --- powerdevil-5.10.3/po/zh_CN/powerdevil.po 2017-06-27 10:03:49.000000000 +0000 +++ powerdevil-5.10.4/po/zh_CN/powerdevil.po 2017-07-18 11:52:03.000000000 +0000 @@ -1,27 +1,20 @@ -# Chinese Translation. -# Copyright (C) 2008 This_file_is_part_of_KDE -# This file is distributed under the same license as the KDE package. -# -# Grissiom , 2008, 2009. -# Feng Chao , 2010, 2011, 2013, 2014, 2015. -# Ni Hui , 2010. -# Weng Xuetian , 2011, 2012, 2013, 2015, 2016. -# Xuetian Weng , 2014, 2015. -# Guo Yunhe , 2017. msgid "" msgstr "" -"Project-Id-Version: kdebase\n" +"Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-06-15 04:52+0200\n" -"PO-Revision-Date: 2017-03-19 00:53+0200\n" -"Last-Translator: Guo Yunhe \n" -"Language-Team: Chinese \n" +"PO-Revision-Date: 2017-07-11 06:33-0400\n" +"Last-Translator: guoyunhebrave \n" +"Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Language: zh-CN\n" +"X-Crowdin-File: /kf5-stable/messages/kde-workspace/powerdevil.pot\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -443,228 +436,4 @@ #: powerdevilcore.cpp:709 #, kde-format msgid "Your battery is now fully charged." -msgstr "电池已充满。" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# powersaving profiles 貌似说不通，profile 不一定都是powersaving的吧 -# capabilities 也不知用什么合适的翻译好…… \ No newline at end of file +msgstr "电池已充满。" \ No newline at end of file diff -Nru powerdevil-5.10.3/po/zh_CN/powerdevilprofilesconfig.po powerdevil-5.10.4/po/zh_CN/powerdevilprofilesconfig.po --- powerdevil-5.10.3/po/zh_CN/powerdevilprofilesconfig.po 2017-06-27 10:03:49.000000000 +0000 +++ powerdevil-5.10.4/po/zh_CN/powerdevilprofilesconfig.po 2017-07-18 11:52:03.000000000 +0000 @@ -1,22 +1,21 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# Lie Ex , 2010. -# Feng Chao , 2011. msgid "" msgstr "" -"Project-Id-Version: powerdevilprofilesconfig\n" +"Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-05-09 03:03+0200\n" -"PO-Revision-Date: 2011-10-30 13:29+0800\n" -"Last-Translator: FengChao \n" -"Language-Team: Chinese Simplified \n" +"PO-Revision-Date: 2017-07-11 06:33-0400\n" +"Last-Translator: guoyunhebrave \n" +"Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Language: zh-CN\n" +"X-Crowdin-File: /kf5-stable/messages/kde-workspace/powerdevilprofilesconfig." +"pot\n" #, kde-format msgctxt "NAME OF TRANSLATORS"