Hello community, here is the log from the commit of package kcoreaddons for openSUSE:Factory checked in at 2015-01-29 12:50:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcoreaddons (Old) and /work/SRC/openSUSE:Factory/.kcoreaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcoreaddons" Changes: -------- --- /work/SRC/openSUSE:Factory/kcoreaddons/kcoreaddons.changes 2014-12-21 11:57:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kcoreaddons.new/kcoreaddons.changes 2015-01-29 12:50:56.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 3 18:03:17 UTC 2015 - [email protected] + +- Update to 5.6.0 + * KDirWatch can now watch /dev/shm as well (kde#314982) + * KDELibs4Migration now always returns an absolute path + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.6.0.php + +------------------------------------------------------------------- Old: ---- kcoreaddons-5.5.0.tar.xz New: ---- kcoreaddons-5.6.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcoreaddons.spec ++++++ --- /var/tmp/diff_new_pack.B8kuAW/_old 2015-01-29 12:50:56.000000000 +0100 +++ /var/tmp/diff_new_pack.B8kuAW/_new 2015-01-29 12:50:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kcoreaddons # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,10 +18,10 @@ %define lname libKF5CoreAddons5 Name: kcoreaddons -Version: 5.5.0 +Version: 5.6.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.5.0 +BuildRequires: extra-cmake-modules >= 1.6.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libqt5-linguist-devel >= 5.2.0 @@ -33,7 +33,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/5.5/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/5.6/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kcoreaddons-5.5.0.tar.xz -> kcoreaddons-5.6.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.5.0/CMakeLists.txt new/kcoreaddons-5.6.0/CMakeLists.txt --- old/kcoreaddons-5.5.0/CMakeLists.txt 2014-12-06 13:33:58.000000000 +0100 +++ new/kcoreaddons-5.6.0/CMakeLists.txt 2015-01-03 13:03:07.000000000 +0100 @@ -2,7 +2,7 @@ project(KCoreAddons) -find_package(ECM 1.5.0 REQUIRED NO_MODULE) +find_package(ECM 1.6.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -37,7 +37,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.5.0") # handled by release scripts +set(KF5_VERSION "5.6.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCOREADDONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.5.0/autotests/CMakeLists.txt new/kcoreaddons-5.6.0/autotests/CMakeLists.txt --- old/kcoreaddons-5.5.0/autotests/CMakeLists.txt 2014-12-06 13:33:58.000000000 +0100 +++ new/kcoreaddons-5.6.0/autotests/CMakeLists.txt 2015-01-03 13:03:07.000000000 +0100 @@ -48,7 +48,11 @@ ) set(ktexttohtmltest_SRCS ktexttohtmltest.cpp ${CMAKE_SOURCE_DIR}/src/lib/text/ktexttohtml.cpp) -ecm_add_test(${ktexttohtmltest_SRCS} TEST_NAME ktexttohtmltest LINK_LIBRARIES Qt5::Test KF5::CoreAddons) +ecm_add_test(${ktexttohtmltest_SRCS} TEST_NAME ktexttohtmltest LINK_LIBRARIES Qt5::Test) +# include the binary dir in order to get kcoreaddons_export.h +target_include_directories(ktexttohtmltest PRIVATE ${KCoreAddons_BINARY_DIR}/src/lib) +# fake static linking to prevent the export macros on Windows from kicking in +target_compile_definitions(ktexttohtmltest PRIVATE -DKCOREADDONS_STATIC_DEFINE=1) target_compile_definitions(kpluginloadertest PRIVATE JSONPLUGIN_FILE="$<TARGET_FILE:jsonplugin>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.5.0/autotests/data/fakeplugin.desktop new/kcoreaddons-5.6.0/autotests/data/fakeplugin.desktop --- old/kcoreaddons-5.5.0/autotests/data/fakeplugin.desktop 2014-12-06 13:33:58.000000000 +0100 +++ new/kcoreaddons-5.6.0/autotests/data/fakeplugin.desktop 2015-01-03 13:03:07.000000000 +0100 @@ -1,23 +1,45 @@ [Desktop Entry] Name=NSA Plugin +Name[ca]=Connector de la NSA Name[cs]=Modul NSA Name[de]=NSA-Modul +Name[en_GB]=NSA Plugin +Name[es]=Complemento NSA Name[fi]=NSA-liitännäinen +Name[ko]=NSA 플러그인 Name[nl]=NSA-plug-in +Name[pl]=Wtyczka NSA Name[pt]='Plugin' da NSA Name[pt_BR]=Plugin NSA Name[sk]=NSA plugin +Name[sl]=Vstavek NSA +Name[sr]=НСА‑ов прикључак +Name[sr@ijekavian]=НСА‑ов прикључак +Name[sr@ijekavianlatin]=NSA‑ov priključak +Name[sr@latin]=NSA‑ov priključak +Name[sv]=NSA-insticksprogram Name[uk]=Додаток NSA Name[x-test]=xxNSA Pluginxx Name[zh_CN]=NSA 插件 Comment=Test Plugin Spy +Comment[ca]=Connector de proves espia Comment[cs]=Testovací modul Spy Comment[de]=Spionage-Testmodul +Comment[en_GB]=Test Plugin Spy +Comment[es]=Probar espía de complementos Comment[fi]=Testivakoiluliitännäinen +Comment[ko]=테스트 플러그인 첩자 Comment[nl]=Plug-in Spy testen +Comment[pl]=Wypróbuj szpiega wtyczki Comment[pt]=Espião dos 'Plugins' de Testes Comment[pt_BR]=Plugin de teste de espionagem Comment[sk]=Testovací plugin špión +Comment[sl]=Preizkusni vohunski vstavek +Comment[sr]=Пробни прикључак шпијун +Comment[sr@ijekavian]=Пробни прикључак шпијун +Comment[sr@ijekavianlatin]=Probni priključak špijun +Comment[sr@latin]=Probni priključak špijun +Comment[sv]=Testa insticksprogramspion Comment[uk]=Тестовий додаток Comment[x-test]=xxTest Plugin Spyxx Comment[zh_CN]=Test Plugin Spy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.5.0/po/ca/kcoreaddons5_qt.po new/kcoreaddons-5.6.0/po/ca/kcoreaddons5_qt.po --- old/kcoreaddons-5.5.0/po/ca/kcoreaddons5_qt.po 2014-12-06 13:33:58.000000000 +0100 +++ new/kcoreaddons-5.6.0/po/ca/kcoreaddons5_qt.po 2015-01-03 13:03:07.000000000 +0100 @@ -4,7 +4,7 @@ # version 3 or later versions approved by the membership of KDE e.V. # # Sebastià Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. -# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014. +# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. # Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Robert Millan <[email protected]>, 2009. @@ -15,7 +15,7 @@ "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" "PO-Revision-Date: 2014-06-24 20:56+0200\n" -"Last-Translator: Antoni Bella Pérez <[email protected]>\n" +"Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.5.0/po/fi/kcoreaddons5_qt.po new/kcoreaddons-5.6.0/po/fi/kcoreaddons5_qt.po --- old/kcoreaddons-5.5.0/po/fi/kcoreaddons5_qt.po 2014-12-06 13:33:58.000000000 +0100 +++ new/kcoreaddons-5.6.0/po/fi/kcoreaddons5_qt.po 2015-01-03 13:03:07.000000000 +0100 @@ -14,7 +14,7 @@ # Tommi Nieminen <[email protected]>, 2009, 2010, 2011. # Tommi Nieminen <[email protected]>, 2009. # Jorma Karvonen <[email protected]>, 2010. -# Lasse Liehu <[email protected]>, 2006, 2010, 2011, 2012, 2013, 2014. +# Lasse Liehu <[email protected]>, 2006, 2010, 2011, 2012, 2013, 2014, 2015. # # KDE Finnish translation sprint participants: # Author: Artnay @@ -27,9 +27,9 @@ "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-10-19 17:16+0300\n" +"PO-Revision-Date: 2015-01-02 16:30+0200\n" "Last-Translator: Lasse Liehu <[email protected]>\n" -"Language-Team: Finnish <[email protected]>\n" +"Language-Team: Finnish <[email protected]>\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -143,11 +143,10 @@ "internationalization visit <a href=\"http://l10n.kde.org\";>http://l10n.kde."; "org</a></p>" msgstr "" -"<p>Kiitos käännösryhmien ympäri maailmaa, KDE on käännetty kymmenille " -"kielille.</p><p>Suomennosryhmän sivut ovat osoitteessa <a href=\"http://"; +"<p>Jos haluat ilmoittaa käännösvirheestä, ehdottaa parannusta tai osallistua " +"suomentamiseen, katso suomennosryhmän sivut osoitteessa <a href=\"http://"; "community.kde.org/KDE_Localization/fi\">http://community.kde.org/"; -"KDE_Localization/fi</a>. Lisätietoa KDE:n kääntämisestä saat osoitteessa <a " -"href=\"http://l10n.kde.org/\";>l10n.kde.org</a>.</p>" +"KDE_Localization/fi</a>.</p>" #: lib/kaboutdata.cpp:942 msgctxt "KAboutData CLI|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.5.0/po/gd/kcoreaddons5_qt.po new/kcoreaddons-5.6.0/po/gd/kcoreaddons5_qt.po --- old/kcoreaddons-5.5.0/po/gd/kcoreaddons5_qt.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kcoreaddons-5.6.0/po/gd/kcoreaddons5_qt.po 2015-01-03 13:03:07.000000000 +0100 @@ -0,0 +1,535 @@ +# GunChleoc <[email protected]>, 2014. +msgid "" +msgstr "" +"PO-Revision-Date: 2014-12-09 10:35+0100\n" +"Last-Translator: GunChleoc <[email protected]>\n" +"Language-Team: Fòram na Gàidhlig\n" +"Language: gd\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : " +"(n > 2 && n < 20) ? 2 : 3;\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Qt-Contexts: true\n" + +#: lib/kaboutdata.cpp:226 +msgctxt "KAboutLicense|" +msgid "" +"No licensing terms for this program have been specified.\n" +"Please check the documentation or the source for any\n" +"licensing terms.\n" +msgstr "" +"Cha deach teirmichean ceadachais a shònrachadh airson a' phrògraim seo.\n" +"Thoir sùil air an docamaideadh no air a' bhun-tùs airson\n" +"teirmichean ceadachais sam bith.\n" + +#: lib/kaboutdata.cpp:234 +#, qt-format +msgctxt "KAboutLicense|" +msgid "This program is distributed under the terms of the %1." +msgstr "Cha am prògram seo 'ga sgaoileadh fo theirmichean a' cheadachais %1." + +#: lib/kaboutdata.cpp:260 +msgctxt "KAboutLicense|@item license (short name)" +msgid "GPL v2" +msgstr "GPL v2" + +#: lib/kaboutdata.cpp:261 +msgctxt "KAboutLicense|@item license" +msgid "GNU General Public License Version 2" +msgstr "GNU General Public License, tionndadh 2" + +#: lib/kaboutdata.cpp:264 +msgctxt "KAboutLicense|@item license (short name)" +msgid "LGPL v2" +msgstr "LGPL v2" + +#: lib/kaboutdata.cpp:265 +msgctxt "KAboutLicense|@item license" +msgid "GNU Lesser General Public License Version 2" +msgstr "GNU Lesser General Public License, tionndadh 2" + +#: lib/kaboutdata.cpp:268 +msgctxt "KAboutLicense|@item license (short name)" +msgid "BSD License" +msgstr "BSD License" + +#: lib/kaboutdata.cpp:269 +msgctxt "KAboutLicense|@item license" +msgid "BSD License" +msgstr "BSD License" + +#: lib/kaboutdata.cpp:272 +msgctxt "KAboutLicense|@item license (short name)" +msgid "Artistic License" +msgstr "Artistic License" + +#: lib/kaboutdata.cpp:273 +msgctxt "KAboutLicense|@item license" +msgid "Artistic License" +msgstr "Artistic License" + +#: lib/kaboutdata.cpp:276 +msgctxt "KAboutLicense|@item license (short name)" +msgid "QPL v1.0" +msgstr "QPL v1.0" + +#: lib/kaboutdata.cpp:277 +msgctxt "KAboutLicense|@item license" +msgid "Q Public License" +msgstr "Q Public License" + +#: lib/kaboutdata.cpp:280 +msgctxt "KAboutLicense|@item license (short name)" +msgid "GPL v3" +msgstr "GPL v3" + +#: lib/kaboutdata.cpp:281 +msgctxt "KAboutLicense|@item license" +msgid "GNU General Public License Version 3" +msgstr "GNU General Public License, tionndadh 3" + +#: lib/kaboutdata.cpp:284 +msgctxt "KAboutLicense|@item license (short name)" +msgid "LGPL v3" +msgstr "LGPL v3" + +#: lib/kaboutdata.cpp:285 +msgctxt "KAboutLicense|@item license" +msgid "GNU Lesser General Public License Version 3" +msgstr "GNU Lesser General Public License, tionndadh 3" + +#: lib/kaboutdata.cpp:289 +msgctxt "KAboutLicense|@item license" +msgid "Custom" +msgstr "Gnàthaichte" + +#: lib/kaboutdata.cpp:292 +msgctxt "KAboutLicense|@item license" +msgid "Not specified" +msgstr "Gun sònrachadh" + +#: lib/kaboutdata.cpp:809 +msgctxt "KAboutData|replace this with information about your translation team" +msgid "" +"<p>KDE is translated into many languages thanks to the work of the " +"translation teams all over the world.</p><p>For more information on KDE " +"internationalization visit <a href=\"http://l10n.kde.org\";>http://l10n.kde."; +"org</a></p>" +msgstr "" +"<p>Tha KDE 'ga eadar-theangachadh gu iomadh cànan taing dhan obair a nì " +"sgiobaidhean eadar-theangachaidh air feadh an t-saoghail.</p><p>Airson " +"barrachd fiosrachaidh mu eadar-theangachadh aig KDE, tadhail air <a href=" +"\"http://l10n.kde.org\";>http://l10n.kde.org</a></p>" + +#: lib/kaboutdata.cpp:942 +msgctxt "KAboutData CLI|" +msgid "Show author information." +msgstr "Seall fiosrachadh ùghdair." + +#: lib/kaboutdata.cpp:943 +msgctxt "KAboutData CLI|" +msgid "Show license information." +msgstr "Seall fiosrachadh a' cheadachais." + +#: lib/kaboutdata.cpp:952 +msgctxt "KAboutData CLI|" +msgid "This application was written by somebody who wants to remain anonymous." +msgstr "" +"Chaidh an aplacaid seo a sgrìobhadh le cuideigin nach eil airson ainm " +"foillseachadh." + +#: lib/kaboutdata.cpp:954 +msgctxt "KAboutData CLI|" +msgid "%s was written by:\n" +msgstr "Chaidh %s a sgrìobhadh le:\n" + +#: lib/plugin/kpluginloader.cpp:121 +#, qt-format +msgctxt "KPluginLoader|" +msgid "The library %1 does not offer a KPluginFactory." +msgstr "Chan eil KPluginFactory air an leabharlann %1." + +#. MetricBinaryDialect size in bytes +#: lib/util/kformatprivate.cpp:88 +#, qt-format +msgctxt "KFormat|MetricBinaryDialect" +msgid "%1 B" +msgstr "%1 B" + +#. MetricBinaryDialect size in 1000 bytes +#: lib/util/kformatprivate.cpp:91 +#, qt-format +msgctxt "KFormat|MetricBinaryDialect" +msgid "%1 kB" +msgstr "%1 kB" + +#. MetricBinaryDialect size in 10^6 bytes +#: lib/util/kformatprivate.cpp:94 +#, qt-format +msgctxt "KFormat|MetricBinaryDialect" +msgid "%1 MB" +msgstr "%1 MB" + +#. MetricBinaryDialect size in 10^9 bytes +#: lib/util/kformatprivate.cpp:97 +#, qt-format +msgctxt "KFormat|MetricBinaryDialect" +msgid "%1 GB" +msgstr "%1 GB" + +#. MetricBinaryDialect size in 10^12 bytes +#: lib/util/kformatprivate.cpp:100 +#, qt-format +msgctxt "KFormat|MetricBinaryDialect" +msgid "%1 TB" +msgstr "%1 TB" + +#. MetricBinaryDialect size in 10^15 bytes +#: lib/util/kformatprivate.cpp:103 +#, qt-format +msgctxt "KFormat|MetricBinaryDialect" +msgid "%1 PB" +msgstr "%1 PB" + +#. MetricBinaryDialect size in 10^18 byte +#: lib/util/kformatprivate.cpp:106 +#, qt-format +msgctxt "KFormat|MetricBinaryDialect" +msgid "%1 EB" +msgstr "%1 EB" + +#. MetricBinaryDialect size in 10^21 bytes +#: lib/util/kformatprivate.cpp:109 +#, qt-format +msgctxt "KFormat|MetricBinaryDialect" +msgid "%1 ZB" +msgstr "%1 ZB" + +#. MetricBinaryDialect size in 10^24 bytes +#: lib/util/kformatprivate.cpp:112 +#, qt-format +msgctxt "KFormat|MetricBinaryDialect" +msgid "%1 YB" +msgstr "%1 YB" + +#. JEDECBinaryDialect memory size in bytes +#: lib/util/kformatprivate.cpp:118 +#, qt-format +msgctxt "KFormat|JEDECBinaryDialect" +msgid "%1 B" +msgstr "%1 B" + +#. JEDECBinaryDialect memory size in 1024 bytes +#: lib/util/kformatprivate.cpp:121 +#, qt-format +msgctxt "KFormat|JEDECBinaryDialect" +msgid "%1 KB" +msgstr "%1 KB" + +#. JEDECBinaryDialect memory size in 10^20 bytes +#: lib/util/kformatprivate.cpp:124 +#, qt-format +msgctxt "KFormat|JEDECBinaryDialect" +msgid "%1 MB" +msgstr "%1 MB" + +#. JEDECBinaryDialect memory size in 10^30 bytes +#: lib/util/kformatprivate.cpp:127 +#, qt-format +msgctxt "KFormat|JEDECBinaryDialect" +msgid "%1 GB" +msgstr "%1 GB" + +#. JEDECBinaryDialect memory size in 10^40 bytes +#: lib/util/kformatprivate.cpp:130 +#, qt-format +msgctxt "KFormat|JEDECBinaryDialect" +msgid "%1 TB" +msgstr "%1 TB" + +#. JEDECBinaryDialect memory size in 10^50 bytes +#: lib/util/kformatprivate.cpp:133 +#, qt-format +msgctxt "KFormat|JEDECBinaryDialect" +msgid "%1 PB" +msgstr "%1 PB" + +#. JEDECBinaryDialect memory size in 10^60 bytes +#: lib/util/kformatprivate.cpp:136 +#, qt-format +msgctxt "KFormat|JEDECBinaryDialect" +msgid "%1 EB" +msgstr "%1 EB" + +#. JEDECBinaryDialect memory size in 10^70 bytes +#: lib/util/kformatprivate.cpp:139 +#, qt-format +msgctxt "KFormat|JEDECBinaryDialect" +msgid "%1 ZB" +msgstr "%1 ZB" + +#. JEDECBinaryDialect memory size in 10^80 bytes +#: lib/util/kformatprivate.cpp:142 +#, qt-format +msgctxt "KFormat|JEDECBinaryDialect" +msgid "%1 YB" +msgstr "%1 YB" + +#. IECBinaryDialect size in bytes +#: lib/util/kformatprivate.cpp:148 +#, qt-format +msgctxt "KFormat|IECBinaryDialect" +msgid "%1 B" +msgstr "%1 B" + +#. IECBinaryDialect size in 1024 bytes +#: lib/util/kformatprivate.cpp:151 +#, qt-format +msgctxt "KFormat|IECBinaryDialect" +msgid "%1 KiB" +msgstr "%1 KiB" + +#. IECBinaryDialect size in 10^20 bytes +#: lib/util/kformatprivate.cpp:154 +#, qt-format +msgctxt "KFormat|IECBinaryDialect" +msgid "%1 MiB" +msgstr "%1 MiB" + +#. IECBinaryDialect size in 10^30 bytes +#: lib/util/kformatprivate.cpp:157 +#, qt-format +msgctxt "KFormat|IECBinaryDialect" +msgid "%1 GiB" +msgstr "%1 GiB" + +#. IECBinaryDialect size in 10^40 bytes +#: lib/util/kformatprivate.cpp:160 +#, qt-format +msgctxt "KFormat|IECBinaryDialect" +msgid "%1 TiB" +msgstr "%1 TiB" + +#. IECBinaryDialect size in 10^50 bytes +#: lib/util/kformatprivate.cpp:163 +#, qt-format +msgctxt "KFormat|IECBinaryDialect" +msgid "%1 PiB" +msgstr "%1 PiB" + +#. IECBinaryDialect size in 10^60 bytes +#: lib/util/kformatprivate.cpp:166 +#, qt-format +msgctxt "KFormat|IECBinaryDialect" +msgid "%1 EiB" +msgstr "%1 EiB" + +#. IECBinaryDialect size in 10^70 bytes +#: lib/util/kformatprivate.cpp:169 +#, qt-format +msgctxt "KFormat|IECBinaryDialect" +msgid "%1 ZiB" +msgstr "%1 ZiB" + +#. IECBinaryDialect size in 10^80 bytes +#: lib/util/kformatprivate.cpp:172 +#, qt-format +msgctxt "KFormat|IECBinaryDialect" +msgid "%1 YiB" +msgstr "%1 YiB" + +#. @item:intext Duration format minutes, seconds and milliseconds +#: lib/util/kformatprivate.cpp:205 +#, qt-format +msgctxt "KFormat|" +msgid "%1m%2.%3s" +msgstr "%1m%2.%3s" + +#. @item:intext Duration format minutes and seconds +#: lib/util/kformatprivate.cpp:210 +#, qt-format +msgctxt "KFormat|" +msgid "%1m%2s" +msgstr "%1m%2s" + +#. @item:intext Duration format hours and minutes +#: lib/util/kformatprivate.cpp:214 +#, qt-format +msgctxt "KFormat|" +msgid "%1h%2m" +msgstr "%1h%2m" + +#. @item:intext Duration format hours, minutes, seconds, milliseconds +#: lib/util/kformatprivate.cpp:218 +#, qt-format +msgctxt "KFormat|" +msgid "%1h%2m%3.%4s" +msgstr "%1h%2m%3.%4s" + +#. @item:intext Duration format hours, minutes, seconds +#: lib/util/kformatprivate.cpp:224 +#, qt-format +msgctxt "KFormat|" +msgid "%1h%2m%3s" +msgstr "%1h%2m%3s" + +#. @item:intext Duration format minutes, seconds and milliseconds +#: lib/util/kformatprivate.cpp:234 +#, qt-format +msgctxt "KFormat|" +msgid "%1:%2.%3" +msgstr "%1:%2.%3" + +#. @item:intext Duration format minutes and seconds +#. ---------- +#. @item:intext Duration format hours and minutes +#: lib/util/kformatprivate.cpp:239 lib/util/kformatprivate.cpp:243 +#, qt-format +msgctxt "KFormat|" +msgid "%1:%2" +msgstr "%1:%2" + +#. @item:intext Duration format hours, minutes, seconds, milliseconds +#: lib/util/kformatprivate.cpp:247 +#, qt-format +msgctxt "KFormat|" +msgid "%1:%2:%3.%4" +msgstr "%1:%2:%3.%4" + +#. @item:intext Duration format hours, minutes, seconds +#: lib/util/kformatprivate.cpp:253 +#, qt-format +msgctxt "KFormat|" +msgid "%1:%2:%3" +msgstr "%1:%2:%3" + +#. @item:intext %1 is a real number, e.g. 1.23 days +#: lib/util/kformatprivate.cpp:269 +#, qt-format +msgctxt "KFormat|" +msgid "%1 days" +msgstr "%1 là(ithean)" + +#. @item:intext %1 is a real number, e.g. 1.23 hours +#: lib/util/kformatprivate.cpp:272 +#, qt-format +msgctxt "KFormat|" +msgid "%1 hours" +msgstr "%1 uair(ean)" + +#. @item:intext %1 is a real number, e.g. 1.23 minutes +#: lib/util/kformatprivate.cpp:275 +#, qt-format +msgctxt "KFormat|" +msgid "%1 minutes" +msgstr "%1 m(h)ionaid(ean)" + +#. @item:intext %1 is a real number, e.g. 1.23 seconds +#: lib/util/kformatprivate.cpp:278 +#, qt-format +msgctxt "KFormat|" +msgid "%1 seconds" +msgstr "%1 d(h)iog(an)" + +#. @item:intext %1 is a whole number +#: lib/util/kformatprivate.cpp:283 +#, qt-format +msgctxt "KFormat|" +msgid "%n millisecond(s)" +msgid_plural "%n millisecond(s)" +msgstr[0] "%n mhille-dhiog" +msgstr[1] "%n mhille-dhiog" +msgstr[2] "%n mhille-dhiogan" +msgstr[3] "%n mhille-dhiog" + +#. @item:intext %n is a whole number +#: lib/util/kformatprivate.cpp:301 +#, qt-format +msgctxt "KFormat|" +msgid "%n day(s)" +msgid_plural "%n day(s)" +msgstr[0] "%n latha" +msgstr[1] "%n latha" +msgstr[2] "%n làithean" +msgstr[3] "%n latha" + +#. @item:intext %n is a whole number +#: lib/util/kformatprivate.cpp:306 +#, qt-format +msgctxt "KFormat|" +msgid "%n hour(s)" +msgid_plural "%n hour(s)" +msgstr[0] "%n uair" +msgstr[1] "%n uair" +msgstr[2] "%n uairean" +msgstr[3] "%n uair" + +#. @item:intext %n is a whole number +#: lib/util/kformatprivate.cpp:311 +#, qt-format +msgctxt "KFormat|" +msgid "%n minute(s)" +msgid_plural "%n minute(s)" +msgstr[0] "%n mhionaid" +msgstr[1] "%n mhionaid" +msgstr[2] "%n mionaidean" +msgstr[3] "%n mionaid" + +#. @item:intext %n is a whole number +#: lib/util/kformatprivate.cpp:316 +#, qt-format +msgctxt "KFormat|" +msgid "%n second(s)" +msgid_plural "%n second(s)" +msgstr[0] "%n diog" +msgstr[1] "%n dhiog" +msgstr[2] "%n diogan" +msgstr[3] "%n diog" + +#. @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 +#. ---------- +#. @item:intext hours and minutes. 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 +#. ---------- +#. @item:intext minutes and seconds. 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 +#: lib/util/kformatprivate.cpp:341 lib/util/kformatprivate.cpp:348 +#: lib/util/kformatprivate.cpp:355 +#, qt-format +msgctxt "KFormat|" +msgid "%1 and %2" +msgstr "%1 agus %2" + +#: lib/util/kformatprivate.cpp:373 +msgctxt "KFormat|" +msgid "Tomorrow" +msgstr "A-màireach" + +#: lib/util/kformatprivate.cpp:375 +msgctxt "KFormat|" +msgid "Today" +msgstr "An-diugh" + +#: lib/util/kformatprivate.cpp:377 +msgctxt "KFormat|" +msgid "Yesterday" +msgstr "An-dè" + +#: lib/util/kformatprivate.cpp:384 +#, qt-format +msgctxt "KFormat|" +msgid "Last %1" +msgstr "An %1 roimhe" + +#: lib/util/kformatprivate.cpp:389 +#, qt-format +msgctxt "KFormat|" +msgid "Next %1" +msgstr "An ath %1" + +#. relative datetime with %1 result of formatReleativeDate() and %2 the formatted time If this does not fit the grammar of your language please contact the i18n team to solve the problem +#: lib/util/kformatprivate.cpp:404 +#, qt-format +msgctxt "KFormat|" +msgid "%1, %2" +msgstr "%1, %2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.5.0/po/ko/kcoreaddons5_qt.po new/kcoreaddons-5.6.0/po/ko/kcoreaddons5_qt.po --- old/kcoreaddons-5.5.0/po/ko/kcoreaddons5_qt.po 2014-12-06 13:33:58.000000000 +0100 +++ new/kcoreaddons-5.6.0/po/ko/kcoreaddons5_qt.po 2015-01-03 13:03:07.000000000 +0100 @@ -18,7 +18,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" -"X-Qt-Contexts: true\n" #: lib/kaboutdata.cpp:226 msgctxt "KAboutLicense|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.5.0/po/zh_CN/kcoreaddons5_qt.po new/kcoreaddons-5.6.0/po/zh_CN/kcoreaddons5_qt.po --- old/kcoreaddons-5.5.0/po/zh_CN/kcoreaddons5_qt.po 2014-12-06 13:33:58.000000000 +0100 +++ new/kcoreaddons-5.6.0/po/zh_CN/kcoreaddons5_qt.po 2015-01-03 13:03:07.000000000 +0100 @@ -15,7 +15,7 @@ "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-08-01 21:39+0800\n" +"PO-Revision-Date: 2014-12-21 17:44+0800\n" "Last-Translator: Feng Chao <[email protected]>\n" "Language-Team: Chinese Simplified <[email protected]>\n" "Language: zh_CN\n" @@ -133,7 +133,8 @@ "<p>感谢分布在世界各地的翻译小组的辛勤工作，KDE 被翻译成多种语言。</p><p>要了" "解更多有关 KDE 国际化的信息，请访问 <a href=\"http://l10n.kde.org\";>http://"; "l10n.kde.org</a></p><p>要了解关于 KDE 简体中文翻译的更多信息，请访问 <a href=" -"\"http://www.kdecn.org/l10n/\";>www.kdecn.org/l10n/</a></p>" +"\"https://community.kde.org/KDE_Localization/zh-cn/\";>翻译组 Wiki 页面</a></" +"p>" #: lib/kaboutdata.cpp:942 msgctxt "KAboutData CLI|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.5.0/src/lib/io/kdirwatch.cpp new/kcoreaddons-5.6.0/src/lib/io/kdirwatch.cpp --- old/kcoreaddons-5.5.0/src/lib/io/kdirwatch.cpp 2014-12-06 13:33:58.000000000 +0100 +++ new/kcoreaddons-5.6.0/src/lib/io/kdirwatch.cpp 2015-01-03 13:03:07.000000000 +0100 @@ -785,7 +785,8 @@ if (path.isEmpty() #ifndef Q_OS_WIN || path == QLatin1String("/dev") - || (path.startsWith(QLatin1String("/dev/")) && !path.startsWith(QLatin1String("/dev/."))) + || (path.startsWith(QLatin1String("/dev/")) && !path.startsWith(QLatin1String("/dev/.")) + && !path.startsWith(QLatin1String("/dev/shm"))) #endif ) { return; // Don't even go there. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.5.0/src/lib/text/ktexttohtml.cpp new/kcoreaddons-5.6.0/src/lib/text/ktexttohtml.cpp --- old/kcoreaddons-5.5.0/src/lib/text/ktexttohtml.cpp 2014-12-06 13:33:58.000000000 +0100 +++ new/kcoreaddons-5.6.0/src/lib/text/ktexttohtml.cpp 2015-01-03 13:03:07.000000000 +0100 @@ -84,7 +84,7 @@ if (mText[mPos] == QLatin1Char('@')) { // the following characters are allowed in a dot-atom (RFC 2822): // a-z A-Z 0-9 . ! # $ % & ' * + - / = ? ^ _ ` { | } ~ - const QString allowedSpecialChars = QLatin1String(".!#$%&'*+-/=?^_`{|}~"); + static const QString allowedSpecialChars = QLatin1String(".!#$%&'*+-/=?^_`{|}~"); // determine the local part of the email address int start = mPos - 1; @@ -147,7 +147,7 @@ { // the following characters are allowed in a dot-atom (RFC 2822): // a-z A-Z 0-9 . ! # $ % & ' * + - / = ? ^ _ ` { | } ~ - const QString allowedSpecialChars = QLatin1String(".!#$%&'*+-/=?^_`{|}~"); + static const QString allowedSpecialChars = QLatin1String(".!#$%&'*+-/=?^_`{|}~"); // the character directly before the URL must not be a letter, a number or // any other character allowed in a dot-atom (RFC 2822). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.5.0/src/lib/util/kdelibs4migration.cpp new/kcoreaddons-5.6.0/src/lib/util/kdelibs4migration.cpp --- old/kcoreaddons-5.5.0/src/lib/util/kdelibs4migration.cpp 2014-12-06 13:33:58.000000000 +0100 +++ new/kcoreaddons-5.6.0/src/lib/util/kdelibs4migration.cpp 2015-01-03 13:03:07.000000000 +0100 @@ -49,7 +49,7 @@ } } if (d->m_kdeHome.isEmpty()) { - d->m_kdeHome = QStringLiteral(KDE4_DEFAULT_HOME); + d->m_kdeHome = homeDir.filePath(QStringLiteral(KDE4_DEFAULT_HOME)); } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
