Hello community, here is the log from the commit of package kjobwidgets for openSUSE:Factory checked in at 2015-03-16 09:27:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjobwidgets (Old) and /work/SRC/openSUSE:Factory/.kjobwidgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjobwidgets" Changes: -------- --- /work/SRC/openSUSE:Factory/kjobwidgets/kjobwidgets.changes 2015-02-16 17:31:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kjobwidgets.new/kjobwidgets.changes 2015-03-16 09:27:13.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Mar 7 16:58:34 UTC 2015 - [email protected] + +- Update to 5.8.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.8.0.php +- Drop kwidgetaddons-devel requires from devel package + +------------------------------------------------------------------- Old: ---- kjobwidgets-5.7.0.tar.xz New: ---- kjobwidgets-5.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjobwidgets.spec ++++++ --- /var/tmp/diff_new_pack.acCfNe/_old 2015-03-16 09:27:14.000000000 +0100 +++ /var/tmp/diff_new_pack.acCfNe/_new 2015-03-16 09:27:14.000000000 +0100 @@ -17,13 +17,13 @@ %define lname libKF5JobWidgets5 -%define _tar_path 5.7 +%define _tar_path 5.8 Name: kjobwidgets Version: %{_tar_path}.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.7.0 +BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: fdupes BuildRequires: kcoreaddons-devel >= %{kf5_version} BuildRequires: kf5-filesystem @@ -59,7 +59,6 @@ Requires: %lname = %{version} Requires: extra-cmake-modules Requires: kcoreaddons-devel >= %{kf5_version} -Requires: kwidgetsaddons-devel >= %{kf5_version} Requires: pkgconfig(Qt5Widgets) >= 5.2.0 %description devel ++++++ kjobwidgets-5.7.0.tar.xz -> kjobwidgets-5.8.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.7.0/CMakeLists.txt new/kjobwidgets-5.8.0/CMakeLists.txt --- old/kjobwidgets-5.7.0/CMakeLists.txt 2015-02-08 16:20:44.000000000 +0100 +++ new/kjobwidgets-5.8.0/CMakeLists.txt 2015-03-07 15:46:16.000000000 +0100 @@ -2,7 +2,7 @@ project(KJobWidgets) -find_package(ECM 1.7.0 REQUIRED NO_MODULE) +find_package(ECM 1.8.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -12,8 +12,8 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.7.0") # handled by release scripts -set(KF5_DEP_VERSION "5.7.0") # handled by release scripts +set(KF5_VERSION "5.8.0") # handled by release scripts +set(KF5_DEP_VERSION "5.8.0") # handled by release scripts set(REQUIRED_QT_VERSION 5.2.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) @@ -59,6 +59,7 @@ ecm_configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5JobWidgetsConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5JobWidgetsConfig.cmake" + PATH_VARS KDE_INSTALL_DBUSINTERFACEDIR INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.7.0/KF5JobWidgetsConfig.cmake.in new/kjobwidgets-5.8.0/KF5JobWidgetsConfig.cmake.in --- old/kjobwidgets-5.7.0/KF5JobWidgetsConfig.cmake.in 2015-02-08 16:20:44.000000000 +0100 +++ new/kjobwidgets-5.8.0/KF5JobWidgetsConfig.cmake.in 2015-03-07 15:46:16.000000000 +0100 @@ -1,10 +1,9 @@ @PACKAGE_INIT@ -set(KJOBWIDGETS_DBUS_INTERFACES_DIR "${PACKAGE_PREFIX_DIR}/@DBUS_INTERFACES_INSTALL_DIR@") +set(KJOBWIDGETS_DBUS_INTERFACES_DIR "@PACKAGE_KDE_INSTALL_DBUSINTERFACEDIR@") find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") -find_dependency(KF5WidgetsAddons "@KF5_DEP_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5JobWidgetsTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.7.0/po/bs/kjobwidgets5_qt.po new/kjobwidgets-5.8.0/po/bs/kjobwidgets5_qt.po --- old/kjobwidgets-5.7.0/po/bs/kjobwidgets5_qt.po 2015-02-08 16:20:44.000000000 +0100 +++ new/kjobwidgets-5.8.0/po/bs/kjobwidgets5_qt.po 2015-03-07 15:46:16.000000000 +0100 @@ -1,414 +1,289 @@ -# translation of kdelibs4.po to bosanski -# Marko Rosic <[email protected]>, 2003. -# Toplica Tanaskovic <[email protected]>, 2003, 2004, 2005. -# Chusslove Illich <[email protected]>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010. -# Dalibor Djuric <[email protected]>, 2009, 2010. -# Dalibor Djuric <[email protected]>, 2010. -# KDE 4 <[email protected]>, 2011. -# Bosnian translation of kdelibs4 -# Initially converted from translation of kdelibs4.po by -# Samir Ribić <[email protected]> msgid "" msgstr "" -"Project-Id-Version: kdelibs4\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2013-12-21 17:26+0000\n" -"Last-Translator: Ademovic Saudin <[email protected]>\n" -"Language-Team: bosanski <[email protected]>\n" -"Language: bosnian\n" +"Project-Id-Version: kde5\n" +"PO-Revision-Date: 2015-02-19 10:14+0100\n" +"Last-Translator: Samir ribic <megaribi@localhost>\n" +"Language-Team: Bosnian\n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Qt-Contexts: true\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Launchpad (build 16872)\n" -"X-Launchpad-Export-Date: 2013-12-22 05:52+0000\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" -"X-Environment: kde\n" -"X-Qt-Contexts: true\n" #: kjobtrackerformatters.cpp:32 -#, fuzzy, qt-format -#| msgctxt "size in bytes" -#| msgid "%1 B" +#, qt-format msgctxt "KJobTrackerFormatters|" msgid "%1 B" -msgstr "%1 B" +msgstr "" #: kjobtrackerformatters.cpp:33 -#, fuzzy, qt-format -#| msgctxt "size in 1024 bytes" -#| msgid "%1 KiB" +#, qt-format msgctxt "KJobTrackerFormatters|" msgid "%1 KiB" -msgstr "%1 KiB" +msgstr "" #: kjobtrackerformatters.cpp:34 -#, fuzzy, qt-format -#| msgctxt "size in 2^20 bytes" -#| msgid "%1 MiB" +#, qt-format msgctxt "KJobTrackerFormatters|" msgid "%1 MiB" -msgstr "%1 MiB" +msgstr "" #: kjobtrackerformatters.cpp:35 -#, fuzzy, qt-format -#| msgctxt "size in 2^30 bytes" -#| msgid "%1 GiB" +#, qt-format msgctxt "KJobTrackerFormatters|" msgid "%1 GiB" -msgstr "%1 GiB" +msgstr "" #: kjobtrackerformatters.cpp:36 -#, fuzzy, qt-format -#| msgctxt "size in 2^40 bytes" -#| msgid "%1 TiB" +#, qt-format msgctxt "KJobTrackerFormatters|" msgid "%1 TiB" -msgstr "%1 TiB" +msgstr "" #: kjobtrackerformatters.cpp:37 -#, fuzzy, qt-format -#| msgctxt "size in 2^50 bytes" -#| msgid "%1 PiB" +#, qt-format msgctxt "KJobTrackerFormatters|" msgid "%1 PiB" -msgstr "%1 PiB" +msgstr "" #: kjobtrackerformatters.cpp:38 -#, fuzzy, qt-format -#| msgctxt "size in 2^60 bytes" -#| msgid "%1 EiB" +#, qt-format msgctxt "KJobTrackerFormatters|" msgid "%1 EiB" -msgstr "%1 EiB" +msgstr "" #: kjobtrackerformatters.cpp:39 -#, fuzzy, qt-format -#| msgctxt "size in 2^70 bytes" -#| msgid "%1 ZiB" +#, qt-format msgctxt "KJobTrackerFormatters|" msgid "%1 ZiB" -msgstr "%1 ZiB" +msgstr "" #: kjobtrackerformatters.cpp:40 -#, fuzzy, qt-format -#| msgctxt "size in 2^80 bytes" -#| msgid "%1 YiB" +#, qt-format msgctxt "KJobTrackerFormatters|" msgid "%1 YiB" -msgstr "%1 YiB" +msgstr "" #: kjobtrackerformatters.cpp:62 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 days" -#| msgid "%1 days" +#, qt-format msgctxt "KJobTrackerFormatters|@item:intext" msgid "%n day(s)" msgid_plural "%n day(s)" -msgstr[0] "%1 dana" -msgstr[1] "%1 dana" -msgstr[2] "%1 dana" +msgstr[0] "" +msgstr[1] "" #: kjobtrackerformatters.cpp:69 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 hours" -#| msgid "%1 hours" +#, qt-format msgctxt "KJobTrackerFormatters|@item:intext" msgid "%n hour(s)" msgid_plural "%n hour(s)" -msgstr[0] "%1 sati" -msgstr[1] "%1 sati" -msgstr[2] "%1 sati" +msgstr[0] "" +msgstr[1] "" #: kjobtrackerformatters.cpp:76 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 minutes" -#| msgid "%1 minutes" +#, qt-format msgctxt "KJobTrackerFormatters|@item:intext" msgid "%n minute(s)" msgid_plural "%n minute(s)" -msgstr[0] "%1 minuta" -msgstr[1] "%1 minuta" -msgstr[2] "%1 minuta" +msgstr[0] "" +msgstr[1] "" #: kjobtrackerformatters.cpp:83 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 seconds" -#| msgid "%1 seconds" +#, qt-format msgctxt "KJobTrackerFormatters|@item:intext" msgid "%n second(s)" msgid_plural "%n second(s)" -msgstr[0] "%1 sekundi" -msgstr[1] "%1 sekundi" -msgstr[2] "%1 sekundi" +msgstr[0] "" +msgstr[1] "" #: kjobtrackerformatters.cpp:104 -#, fuzzy, qt-format -#| msgctxt "" -#| "@item:intext days and hours. This uses the previous item:intext messages. " -#| "If this does not fit the grammar of your language please contact the i18n " -#| "team to solve the problem" -#| msgid "%1 and %2" +#, qt-format msgctxt "KJobTrackerFormatters|@item:intext days and hours." msgid "%1 and %2" -msgstr "%1 i %2" +msgstr "" #: kjobtrackerformatters.cpp:108 -#, fuzzy, qt-format -#| msgctxt "" -#| "@item:intext days and hours. This uses the previous item:intext messages. " -#| "If this does not fit the grammar of your language please contact the i18n " -#| "team to solve the problem" -#| msgid "%1 and %2" +#, qt-format msgctxt "KJobTrackerFormatters|@item:intext hours and minutes." msgid "%1 and %2" -msgstr "%1 i %2" +msgstr "" #: kjobtrackerformatters.cpp:112 -#, fuzzy, qt-format -#| msgctxt "" -#| "@item:intext days and hours. This uses the previous item:intext messages. " -#| "If this does not fit the grammar of your language please contact the i18n " -#| "team to solve the problem" -#| msgid "%1 and %2" +#, qt-format msgctxt "KJobTrackerFormatters|@item:intext minutes and seconds." msgid "%1 and %2" -msgstr "%1 i %2" +msgstr "" #: kstatusbarjobtracker.cpp:163 -#, fuzzy -#| msgid "Stop" msgctxt "KStatusBarJobTracker|" msgid "Stop" -msgstr "Zaustavi" +msgstr "" #: kstatusbarjobtracker.cpp:244 -#, fuzzy -#| msgid " Stalled " msgctxt "KStatusBarJobTracker|" msgid " Stalled " -msgstr " zastoj " +msgstr "" #: kstatusbarjobtracker.cpp:246 -#, fuzzy, qt-format -#| msgid " %1/s " +#, qt-format msgctxt "KStatusBarJobTracker|" msgid " %1/s " -msgstr " %1/s " +msgstr "" #: kwidgetjobtracker.cpp:270 kwidgetjobtracker.cpp:281 -#, fuzzy, qt-format -#| msgctxt "%1 is the label, we add a ':' to it" -#| msgid "%1:" +#, qt-format msgctxt "KWidgetJobTracker|%1 is the label, we add a ':' to it" msgid "%1:" -msgstr "%1:" +msgstr "" #: kwidgetjobtracker.cpp:335 -#, fuzzy, qt-format -#| msgid "%2 of %3 complete" -#| msgid_plural "%2 of %3 complete" +#, qt-format msgctxt "KWidgetJobTracker|" msgid "%1 of %2 complete" msgid_plural "%1 of %2 complete" -msgstr[0] "%2 od %3 dovršeno" -msgstr[1] "%2 od %3 dovršeno" -msgstr[2] "%2 od %3 dovršeno" +msgstr[0] "" +msgstr[1] "" #: kwidgetjobtracker.cpp:355 kwidgetjobtracker.cpp:372 -#, fuzzy, qt-format -#| msgid "%2 / %1 folder" -#| msgid_plural "%2 / %1 folders" +#, qt-format msgctxt "KWidgetJobTracker|" msgid "%1 / %n folder(s)" msgid_plural "%1 / %n folder(s)" -msgstr[0] "%2 / %1 direktorij" -msgstr[1] "%2 / %1 direktorija" -msgstr[2] "%2 / %1 direktorija" +msgstr[0] "" +msgstr[1] "" #: kwidgetjobtracker.cpp:359 kwidgetjobtracker.cpp:377 -#, fuzzy, qt-format -#| msgid "%2 / %1 file" -#| msgid_plural "%2 / %1 files" +#, qt-format msgctxt "KWidgetJobTracker|" msgid "%1 / %n file(s)" msgid_plural "%1 / %n file(s)" -msgstr[0] "%2 / %1 datoteke" -msgstr[1] "%2 / %1 datoteke" -msgstr[2] "%2 / %1 datoteka" +msgstr[0] "" +msgstr[1] "" #: kwidgetjobtracker.cpp:387 -#, fuzzy, qt-format -#| msgid "%1% of %2" +#, qt-format msgctxt "KWidgetJobTracker|" msgid "%1% of %2" -msgstr "%1% od %2" +msgstr "" #: kwidgetjobtracker.cpp:392 -#, fuzzy, qt-format -#| msgid "%2% of 1 file" -#| msgid_plural "%2% of %1 files" +#, qt-format msgctxt "KWidgetJobTracker|" msgid "%1% of %n file(s)" msgid_plural "%1% of %n file(s)" -msgstr[0] "%2% od %1 datoteke" -msgstr[1] "%2% od %1 datoteke" -msgstr[2] "%2% od %1 datoteka" +msgstr[0] "" +msgstr[1] "" #: kwidgetjobtracker.cpp:394 -#, fuzzy, qt-format -#| msgid "%1%" +#, qt-format msgctxt "KWidgetJobTracker|" msgid "%1%" -msgstr "%1%" +msgstr "" #: kwidgetjobtracker.cpp:407 -#, fuzzy -#| msgid "Stalled" msgctxt "KWidgetJobTracker|" msgid "Stalled" -msgstr "zastoj" +msgstr "" #: kwidgetjobtracker.cpp:414 -#, fuzzy, qt-format -#| msgid "%2/s (%3 remaining)" -#| msgid_plural "%2/s (%3 remaining)" +#, qt-format msgctxt "KWidgetJobTracker|" msgid "%1/s (%2 remaining)" msgid_plural "%1/s (%2 remaining)" -msgstr[0] "%2/s (još %3)" -msgstr[1] "%2/s (još %3)" -msgstr[2] "%2/s (još %3)" +msgstr[0] "" +msgstr[1] "" #: kwidgetjobtracker.cpp:417 -#, fuzzy, qt-format -#| msgctxt "speed in bytes per second" -#| msgid "%1/s" +#, qt-format msgctxt "KWidgetJobTracker|speed in bytes per second" msgid "%1/s" -msgstr "%1/s" +msgstr "" #: kwidgetjobtracker.cpp:425 -#, fuzzy -#| msgid "&Close" msgctxt "KWidgetJobTracker|" msgid "&Close" -msgstr "&Zatvori" +msgstr "" #: kwidgetjobtracker.cpp:427 -#, fuzzy -#| msgid "Close the current window or document" msgctxt "KWidgetJobTracker|" msgid "Close the current window or document" -msgstr "Zatvori trenutni prozor ili dokument" +msgstr "" #: kwidgetjobtracker.cpp:440 -#, fuzzy, qt-format -#| msgid "%1/s (done)" +#, qt-format msgctxt "KWidgetJobTracker|" msgid "%1/s (done)" -msgstr "%1/s (gotovo)" +msgstr "" #: kwidgetjobtracker.cpp:447 -#, fuzzy -#| msgid "&Resume" msgctxt "KWidgetJobTracker|" msgid "&Resume" -msgstr "&Nastavi" +msgstr "" #: kwidgetjobtracker.cpp:453 kwidgetjobtracker.cpp:524 -#, fuzzy -#| msgid "&Pause" msgctxt "KWidgetJobTracker|" msgid "&Pause" -msgstr "&Pauziraj" +msgstr "" #: kwidgetjobtracker.cpp:477 -#, fuzzy -#| msgctxt "The source url of a job" -#| msgid "Source:" msgctxt "KWidgetJobTracker|The source url of a job" msgid "Source:" -msgstr "Izvor:" +msgstr "" #: kwidgetjobtracker.cpp:485 -#, fuzzy -#| msgctxt "The destination url of a job" -#| msgid "Destination:" msgctxt "KWidgetJobTracker|The destination url of a job" msgid "Destination:" -msgstr "Odredište:" +msgstr "" #: kwidgetjobtracker.cpp:509 kwidgetjobtracker.cpp:685 -#, fuzzy -#| msgid "Click this to expand the dialog, to show details" msgctxt "KWidgetJobTracker|" msgid "Click this to expand the dialog, to show details" -msgstr "Kliknite ovdje da proširite dijalog na detalje." +msgstr "" #: kwidgetjobtracker.cpp:543 -#, fuzzy -#| msgid "&Keep this window open after transfer is complete" msgctxt "KWidgetJobTracker|" msgid "&Keep this window open after transfer is complete" -msgstr "&Zadrži ovaj prozor otvoren pošto se prijenos okonča" +msgstr "" #: kwidgetjobtracker.cpp:551 -#, fuzzy -#| msgid "Open &File" msgctxt "KWidgetJobTracker|" msgid "Open &File" -msgstr "Otvori &datoteku" +msgstr "" #: kwidgetjobtracker.cpp:557 -#, fuzzy -#| msgid "Open &Destination" msgctxt "KWidgetJobTracker|" msgid "Open &Destination" -msgstr "Otvori &odredište" +msgstr "" #: kwidgetjobtracker.cpp:565 -#, fuzzy -#| msgid "&Cancel" msgctxt "KWidgetJobTracker|" msgid "&Cancel" -msgstr "&Odustani" +msgstr "" #: kwidgetjobtracker.cpp:573 -#, fuzzy -#| msgid "Progress Dialog" msgctxt "KWidgetJobTracker|" msgid "Progress Dialog" -msgstr "Dijalog napretka" +msgstr "" #: kwidgetjobtracker.cpp:588 -#, fuzzy, qt-format -#| msgid "%1 folder" -#| msgid_plural "%1 folders" +#, qt-format msgctxt "KWidgetJobTracker|" msgid "%n folder(s)" msgid_plural "%n folder(s)" -msgstr[0] "%1 direktorij" -msgstr[1] "%1 direktorija" -msgstr[2] "%1 direktorija" +msgstr[0] "" +msgstr[1] "" #: kwidgetjobtracker.cpp:592 -#, fuzzy, qt-format -#| msgid "%1 file" -#| msgid_plural "%1 files" +#, qt-format msgctxt "KWidgetJobTracker|" msgid "%n file(s)" msgid_plural "%n file(s)" -msgstr[0] "%1 datoteka" -msgstr[1] "%1 datoteke" -msgstr[2] "%1 datoteka" +msgstr[0] "" +msgstr[1] "" #: kwidgetjobtracker.cpp:678 -#, fuzzy -#| msgid "Click this to collapse the dialog, to hide details" msgctxt "KWidgetJobTracker|" msgid "Click this to collapse the dialog, to hide details" -msgstr "Kliknite da sažmete dijalog i sklonite detalje." +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.7.0/po/da/kjobwidgets5_qt.po new/kjobwidgets-5.8.0/po/da/kjobwidgets5_qt.po --- old/kjobwidgets-5.7.0/po/da/kjobwidgets5_qt.po 2015-02-08 16:20:44.000000000 +0100 +++ new/kjobwidgets-5.8.0/po/da/kjobwidgets5_qt.po 2015-03-07 15:46:16.000000000 +0100 @@ -4,14 +4,14 @@ # # Martin Schlander, 2008. # Martin Schlander <[email protected]>, 2008. -# Martin Schlander <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Martin Schlander <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. # Keld Simonsen <[email protected]>, 2010. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2014-09-21 15:44+0200\n" +"PO-Revision-Date: 2015-02-28 21:41+0100\n" "Last-Translator: Martin Schlander <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" "Language: da\n" @@ -85,64 +85,43 @@ msgstr[1] "%n dage" #: kjobtrackerformatters.cpp:69 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 hours" -#| msgid "%1 hours" +#, qt-format msgctxt "KJobTrackerFormatters|@item:intext" msgid "%n hour(s)" msgid_plural "%n hour(s)" -msgstr[0] "%1 timer" -msgstr[1] "%1 timer" +msgstr[0] "%n time" +msgstr[1] "%n timer" #: kjobtrackerformatters.cpp:76 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 minutes" -#| msgid "%1 minutes" +#, qt-format msgctxt "KJobTrackerFormatters|@item:intext" msgid "%n minute(s)" msgid_plural "%n minute(s)" -msgstr[0] "%1 minutter" -msgstr[1] "%1 minutter" +msgstr[0] "%n minut" +msgstr[1] "%n minutter" #: kjobtrackerformatters.cpp:83 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 seconds" -#| msgid "%1 seconds" +#, qt-format msgctxt "KJobTrackerFormatters|@item:intext" msgid "%n second(s)" msgid_plural "%n second(s)" -msgstr[0] "%1 sekunder" -msgstr[1] "%1 sekunder" +msgstr[0] "%n sekund" +msgstr[1] "%n sekunder" #: kjobtrackerformatters.cpp:104 -#, fuzzy, qt-format -#| msgctxt "" -#| "@item:intext days and hours. This uses the previous item:intext messages. " -#| "If this does not fit the grammar of your language please contact the i18n " -#| "team to solve the problem" -#| msgid "%1 and %2" +#, qt-format msgctxt "KJobTrackerFormatters|@item:intext days and hours." msgid "%1 and %2" msgstr "%1 og %2" #: kjobtrackerformatters.cpp:108 -#, fuzzy, qt-format -#| msgctxt "" -#| "@item:intext days and hours. This uses the previous item:intext messages. " -#| "If this does not fit the grammar of your language please contact the i18n " -#| "team to solve the problem" -#| msgid "%1 and %2" +#, qt-format msgctxt "KJobTrackerFormatters|@item:intext hours and minutes." msgid "%1 and %2" msgstr "%1 og %2" #: kjobtrackerformatters.cpp:112 -#, fuzzy, qt-format -#| msgctxt "" -#| "@item:intext days and hours. This uses the previous item:intext messages. " -#| "If this does not fit the grammar of your language please contact the i18n " -#| "team to solve the problem" -#| msgid "%1 and %2" +#, qt-format msgctxt "KJobTrackerFormatters|@item:intext minutes and seconds." msgid "%1 and %2" msgstr "%1 og %2" @@ -198,11 +177,10 @@ msgstr[1] "%2 / %1 filer" #: kwidgetjobtracker.cpp:387 -#, fuzzy, qt-format -#| msgid "%1% of %2" +#, qt-format msgctxt "KWidgetJobTracker|" msgid "%1% of %2" -msgstr "%1% af %2 " +msgstr "%1% af %2" #: kwidgetjobtracker.cpp:392 #, fuzzy, qt-format @@ -215,15 +193,12 @@ msgstr[1] "%2% af %1 filer" #: kwidgetjobtracker.cpp:394 -#, fuzzy, qt-format -#| msgid "%1%" +#, qt-format msgctxt "KWidgetJobTracker|" msgid "%1%" msgstr "%1%" #: kwidgetjobtracker.cpp:407 -#, fuzzy -#| msgid "Stalled" msgctxt "KWidgetJobTracker|" msgid "Stalled" msgstr "Gået i stå" @@ -239,102 +214,73 @@ msgstr[1] "%2/s (%3 tilbage)" #: kwidgetjobtracker.cpp:417 -#, fuzzy, qt-format -#| msgctxt "speed in bytes per second" -#| msgid "%1/s" +#, qt-format msgctxt "KWidgetJobTracker|speed in bytes per second" msgid "%1/s" msgstr "%1/s" #: kwidgetjobtracker.cpp:425 -#, fuzzy -#| msgid "&Close" msgctxt "KWidgetJobTracker|" msgid "&Close" msgstr "&Luk" #: kwidgetjobtracker.cpp:427 -#, fuzzy -#| msgid "Close the current window or document" msgctxt "KWidgetJobTracker|" msgid "Close the current window or document" msgstr "Luk det aktuelle vindue eller dokument" #: kwidgetjobtracker.cpp:440 -#, fuzzy, qt-format -#| msgid "%1/s (done)" +#, qt-format msgctxt "KWidgetJobTracker|" msgid "%1/s (done)" msgstr "%1/s (færdig)" #: kwidgetjobtracker.cpp:447 -#, fuzzy -#| msgid "&Resume" msgctxt "KWidgetJobTracker|" msgid "&Resume" msgstr "&Genoptag" #: kwidgetjobtracker.cpp:453 kwidgetjobtracker.cpp:524 -#, fuzzy -#| msgid "&Pause" msgctxt "KWidgetJobTracker|" msgid "&Pause" msgstr "&Pause" #: kwidgetjobtracker.cpp:477 -#, fuzzy -#| msgctxt "The source url of a job" -#| msgid "Source:" msgctxt "KWidgetJobTracker|The source url of a job" msgid "Source:" msgstr "Kilde:" #: kwidgetjobtracker.cpp:485 -#, fuzzy -#| msgctxt "The destination url of a job" -#| msgid "Destination:" msgctxt "KWidgetJobTracker|The destination url of a job" msgid "Destination:" msgstr "Destination:" #: kwidgetjobtracker.cpp:509 kwidgetjobtracker.cpp:685 -#, fuzzy -#| msgid "Click this to expand the dialog, to show details" msgctxt "KWidgetJobTracker|" msgid "Click this to expand the dialog, to show details" msgstr "Klik for at folde dialogen ud, så detaljer vises" #: kwidgetjobtracker.cpp:543 -#, fuzzy -#| msgid "&Keep this window open after transfer is complete" msgctxt "KWidgetJobTracker|" msgid "&Keep this window open after transfer is complete" msgstr "&Hold dette vindue åbent efter overførsel er færdig" #: kwidgetjobtracker.cpp:551 -#, fuzzy -#| msgid "Open &File" msgctxt "KWidgetJobTracker|" msgid "Open &File" msgstr "Åbn &fil" #: kwidgetjobtracker.cpp:557 -#, fuzzy -#| msgid "Open &Destination" msgctxt "KWidgetJobTracker|" msgid "Open &Destination" msgstr "Åbn &destination" #: kwidgetjobtracker.cpp:565 -#, fuzzy -#| msgid "&Cancel" msgctxt "KWidgetJobTracker|" msgid "&Cancel" msgstr "&Annullér" #: kwidgetjobtracker.cpp:573 -#, fuzzy -#| msgid "Progress Dialog" msgctxt "KWidgetJobTracker|" msgid "Progress Dialog" msgstr "Fremgangsdialog" @@ -360,8 +306,6 @@ msgstr[1] "%1 filer" #: kwidgetjobtracker.cpp:678 -#, fuzzy -#| msgid "Click this to collapse the dialog, to hide details" msgctxt "KWidgetJobTracker|" msgid "Click this to collapse the dialog, to hide details" msgstr "Klik for at folde dialogen sammen, så detaljer skjules" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.7.0/po/fr/kjobwidgets5_qt.po new/kjobwidgets-5.8.0/po/fr/kjobwidgets5_qt.po --- old/kjobwidgets-5.7.0/po/fr/kjobwidgets5_qt.po 2015-02-08 16:20:44.000000000 +0100 +++ new/kjobwidgets-5.8.0/po/fr/kjobwidgets5_qt.po 2015-03-07 15:46:16.000000000 +0100 @@ -24,10 +24,10 @@ "PO-Revision-Date: 2014-06-29 22:06+0200\n" "Last-Translator: Sebastien Renard <[email protected]>\n" "Language-Team: French <[email protected]>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" "X-Environment: kde\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.7.0/src/kabstractwidgetjobtracker.h new/kjobwidgets-5.8.0/src/kabstractwidgetjobtracker.h --- old/kjobwidgets-5.7.0/src/kabstractwidgetjobtracker.h 2015-02-08 16:20:44.000000000 +0100 +++ new/kjobwidgets-5.8.0/src/kabstractwidgetjobtracker.h 2015-03-07 15:46:16.000000000 +0100 @@ -57,14 +57,14 @@ * * @param job the job to register */ - virtual void registerJob(KJob *job); + void registerJob(KJob *job) Q_DECL_OVERRIDE; /** * Unregister a job from this tracker. * * @param job the job to unregister */ - virtual void unregisterJob(KJob *job); + void unregisterJob(KJob *job) Q_DECL_OVERRIDE; public: /** @@ -125,7 +125,7 @@ * * @param job the job that emitted this signal */ - virtual void finished(KJob *job); + void finished(KJob *job) Q_DECL_OVERRIDE; /** * This method should be called for correct cancellation of IO operation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.7.0/src/kdialogjobuidelegate.h new/kjobwidgets-5.8.0/src/kdialogjobuidelegate.h --- old/kjobwidgets-5.7.0/src/kdialogjobuidelegate.h 2015-02-08 16:20:44.000000000 +0100 +++ new/kjobwidgets-5.8.0/src/kdialogjobuidelegate.h 2015-03-07 15:46:16.000000000 +0100 @@ -77,10 +77,10 @@ */ unsigned long userTimestamp() const; - virtual void showErrorMessage(); + void showErrorMessage() Q_DECL_OVERRIDE; protected Q_SLOTS: - virtual void slotWarning(KJob *job, const QString &plain, const QString &rich); + void slotWarning(KJob *job, const QString &plain, const QString &rich) Q_DECL_OVERRIDE; private: class Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.7.0/src/kstatusbarjobtracker.h new/kjobwidgets-5.8.0/src/kstatusbarjobtracker.h --- old/kjobwidgets-5.7.0/src/kstatusbarjobtracker.h 2015-02-08 16:20:44.000000000 +0100 +++ new/kjobwidgets-5.8.0/src/kstatusbarjobtracker.h 2015-03-07 15:46:16.000000000 +0100 @@ -58,21 +58,21 @@ * * @param job the job to register */ - virtual void registerJob(KJob *job); + void registerJob(KJob *job) Q_DECL_OVERRIDE; /** * Unregister a job from this tracker. * * @param job the job to unregister */ - virtual void unregisterJob(KJob *job); + void unregisterJob(KJob *job) Q_DECL_OVERRIDE; /** * The widget associated to this tracker. * * @return the widget displaying the job progresses */ - virtual QWidget *widget(KJob *job); + QWidget *widget(KJob *job) Q_DECL_OVERRIDE; /** * Sets the mode of the status bar. @@ -88,11 +88,11 @@ */ virtual void description(KJob *job, const QString &title, const QPair<QString, QString> &field1, - const QPair<QString, QString> &field2); - virtual void totalAmount(KJob *job, KJob::Unit unit, qulonglong amount); - virtual void percent(KJob *job, unsigned long percent); - virtual void speed(KJob *job, unsigned long value); - virtual void slotClean(KJob *job); + const QPair<QString, QString> &field2) Q_DECL_OVERRIDE; + void totalAmount(KJob *job, KJob::Unit unit, qulonglong amount) Q_DECL_OVERRIDE; + void percent(KJob *job, unsigned long percent) Q_DECL_OVERRIDE; + void speed(KJob *job, unsigned long value) Q_DECL_OVERRIDE; + void slotClean(KJob *job) Q_DECL_OVERRIDE; private: class Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.7.0/src/kuiserverjobtracker.h new/kjobwidgets-5.8.0/src/kuiserverjobtracker.h --- old/kjobwidgets-5.7.0/src/kuiserverjobtracker.h 2015-02-08 16:20:44.000000000 +0100 +++ new/kjobwidgets-5.8.0/src/kuiserverjobtracker.h 2015-03-07 15:46:16.000000000 +0100 @@ -50,30 +50,30 @@ * * @param job the job to register */ - virtual void registerJob(KJob *job); + void registerJob(KJob *job) Q_DECL_OVERRIDE; /** * Unregister a job from this tracker. * * @param job the job to unregister */ - virtual void unregisterJob(KJob *job); + void unregisterJob(KJob *job) Q_DECL_OVERRIDE; protected Q_SLOTS: /** * The following slots are inherited from KJobTrackerInterface. */ - virtual void finished(KJob *job); - virtual void suspended(KJob *job); - virtual void resumed(KJob *job); + void finished(KJob *job) Q_DECL_OVERRIDE; + void suspended(KJob *job) Q_DECL_OVERRIDE; + void resumed(KJob *job) Q_DECL_OVERRIDE; virtual void description(KJob *job, const QString &title, const QPair<QString, QString> &field1, - const QPair<QString, QString> &field2); - virtual void infoMessage(KJob *job, const QString &plain, const QString &rich); - virtual void totalAmount(KJob *job, KJob::Unit unit, qulonglong amount); - virtual void processedAmount(KJob *job, KJob::Unit unit, qulonglong amount); - virtual void percent(KJob *job, unsigned long percent); - virtual void speed(KJob *job, unsigned long value); + const QPair<QString, QString> &field2) Q_DECL_OVERRIDE; + void infoMessage(KJob *job, const QString &plain, const QString &rich) Q_DECL_OVERRIDE; + void totalAmount(KJob *job, KJob::Unit unit, qulonglong amount) Q_DECL_OVERRIDE; + void processedAmount(KJob *job, KJob::Unit unit, qulonglong amount) Q_DECL_OVERRIDE; + void percent(KJob *job, unsigned long percent) Q_DECL_OVERRIDE; + void speed(KJob *job, unsigned long value) Q_DECL_OVERRIDE; private: class Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.7.0/src/kwidgetjobtracker.h new/kjobwidgets-5.8.0/src/kwidgetjobtracker.h --- old/kjobwidgets-5.7.0/src/kwidgetjobtracker.h 2015-02-08 16:20:44.000000000 +0100 +++ new/kjobwidgets-5.8.0/src/kwidgetjobtracker.h 2015-03-07 15:46:16.000000000 +0100 @@ -52,7 +52,7 @@ * @param job the job that is assigned the widget we want to get * @return the widget displaying the job progresses */ - virtual QWidget *widget(KJob *job); + QWidget *widget(KJob *job) Q_DECL_OVERRIDE; // KDE5: move this two virtual methods to be placed correctly (ereslibre) public Q_SLOTS: @@ -61,14 +61,14 @@ * * @param job the job to register */ - virtual void registerJob(KJob *job); + void registerJob(KJob *job) Q_DECL_OVERRIDE; /** * Unregister a job from this tracker. * * @param job the job to unregister */ - virtual void unregisterJob(KJob *job); + void unregisterJob(KJob *job) Q_DECL_OVERRIDE; public: bool keepOpen(KJob *job) const; @@ -77,17 +77,17 @@ /** * The following slots are inherited from KJobTrackerInterface. */ - virtual void infoMessage(KJob *job, const QString &plain, const QString &rich); + void infoMessage(KJob *job, const QString &plain, const QString &rich) Q_DECL_OVERRIDE; virtual void description(KJob *job, const QString &title, const QPair<QString, QString> &field1, - const QPair<QString, QString> &field2); - virtual void totalAmount(KJob *job, KJob::Unit unit, qulonglong amount); - virtual void processedAmount(KJob *job, KJob::Unit unit, qulonglong amount); - virtual void percent(KJob *job, unsigned long percent); - virtual void speed(KJob *job, unsigned long value); - virtual void slotClean(KJob *job); - virtual void suspended(KJob *job); - virtual void resumed(KJob *job); + const QPair<QString, QString> &field2) Q_DECL_OVERRIDE; + void totalAmount(KJob *job, KJob::Unit unit, qulonglong amount) Q_DECL_OVERRIDE; + void processedAmount(KJob *job, KJob::Unit unit, qulonglong amount) Q_DECL_OVERRIDE; + void percent(KJob *job, unsigned long percent) Q_DECL_OVERRIDE; + void speed(KJob *job, unsigned long value) Q_DECL_OVERRIDE; + void slotClean(KJob *job) Q_DECL_OVERRIDE; + void suspended(KJob *job) Q_DECL_OVERRIDE; + void resumed(KJob *job) Q_DECL_OVERRIDE; //TODO: Misses canResume() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjobwidgets-5.7.0/tests/kjobtrackerstest.h new/kjobwidgets-5.8.0/tests/kjobtrackerstest.h --- old/kjobwidgets-5.7.0/tests/kjobtrackerstest.h 2015-02-08 16:20:44.000000000 +0100 +++ new/kjobwidgets-5.8.0/tests/kjobtrackerstest.h 2015-03-07 15:46:16.000000000 +0100 @@ -36,7 +36,7 @@ KTestJob(int numberOfDirs = 5); ~KTestJob(); - void start(); + void start() Q_DECL_OVERRIDE; private Q_SLOTS: void nextStep(); @@ -47,9 +47,9 @@ void copyNextFile(); void deleteNextFile(); - bool doSuspend(); - bool doResume(); - bool doKill(); + bool doSuspend() Q_DECL_OVERRIDE; + bool doResume() Q_DECL_OVERRIDE; + bool doKill() Q_DECL_OVERRIDE; private: qulonglong m_numberOfDirs; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
