Hello community, here is the log from the commit of package baloo5 for openSUSE:Factory checked in at 2016-07-15 12:30:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/baloo5 (Old) and /work/SRC/openSUSE:Factory/.baloo5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "baloo5" Changes: -------- --- /work/SRC/openSUSE:Factory/baloo5/baloo5.changes 2016-07-03 12:19:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.baloo5.new/baloo5.changes 2016-07-15 12:30:04.000000000 +0200 @@ -1,0 +2,18 @@ +Wed Jul 6 15:01:17 UTC 2016 - [email protected] + +- Update to 5.24.0 + * DocumentUrlDB::del Only assert when children of dir + actually exist + * Ignore malformed Queries which have a binary operator + without first argument + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.24.0.php + +------------------------------------------------------------------- +Tue Jul 5 11:05:59 UTC 2016 - [email protected] + +- Use the new %kf5_find_lang macro to create the file list for the + lang package +- Remove rpmlintrc file, it is not needed any more now + +------------------------------------------------------------------- Old: ---- baloo-5.23.0.tar.xz baloo5-rpmlintrc New: ---- baloo-5.24.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ baloo5.spec ++++++ --- /var/tmp/diff_new_pack.acqw2b/_old 2016-07-15 12:30:06.000000000 +0200 +++ /var/tmp/diff_new_pack.acqw2b/_new 2016-07-15 12:30:06.000000000 +0200 @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.23 +%define _tar_path 5.24 Name: baloo5 -Version: 5.23.0 +Version: 5.24.0 Release: 0 %define kf5_version %{version} Summary: Framework for searching and managing metadata @@ -28,7 +28,6 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/baloo-%{version}.tar.xz Source1: baselibs.conf -Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE fix-cmakelists-comments.diff -- Change cmake 3.0 block comments to work in cmake 2.x Patch1: fix-cmakelists-comments.diff BuildRequires: extra-cmake-modules >= %{_tar_path} @@ -148,11 +147,14 @@ %patch1 -p1 %build - %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 + %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %make_jobs %install %kf5_makeinstall -C build +%if %{with lang} + %kf5_find_lang +%endif %post -n libKF5Baloo5 -p /sbin/ldconfig @@ -225,10 +227,8 @@ %doc COPYING* %if %{with lang} -%files lang -%defattr(-,root,root) +%files lang -f %{name}.lang %doc COPYING* -%{_kf5_localedir}/ %endif %changelog ++++++ baloo-5.23.0.tar.xz -> baloo-5.24.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/CMakeLists.txt new/baloo-5.24.0/CMakeLists.txt --- old/baloo-5.23.0/CMakeLists.txt 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/CMakeLists.txt 2016-07-03 01:57:07.000000000 +0200 @@ -1,8 +1,8 @@ # set minimum version requirements cmake_minimum_required(VERSION 2.8.12) set(REQUIRED_QT_VERSION 5.4.0) -set(KF5_VERSION "5.23.0") # handled by release scripts -set(KF5_DEP_VERSION "5.23.0") # handled by release scripts +set(KF5_VERSION "5.24.0") # handled by release scripts +set(KF5_DEP_VERSION "5.24.0") # handled by release scripts # set up project project(Baloo) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/autotests/unit/lib/advancedqueryparsertest.cpp new/baloo-5.24.0/autotests/unit/lib/advancedqueryparsertest.cpp --- old/baloo-5.23.0/autotests/unit/lib/advancedqueryparsertest.cpp 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/autotests/unit/lib/advancedqueryparsertest.cpp 2016-07-03 01:57:07.000000000 +0200 @@ -36,6 +36,7 @@ void testNesting(); void testDateTime(); void testOperators(); + void testBinaryOperatorMissingFirstArg(); }; void AdvancedQueryParserTest::testSimpleProperty() @@ -190,6 +191,15 @@ QCOMPARE(term, expectedTerm); } +void AdvancedQueryParserTest::testBinaryOperatorMissingFirstArg() +{ + AdvancedQueryParser parser; + Term term = parser.parse(QStringLiteral("=:2")); + Term expectedTerm; + QCOMPARE(term, expectedTerm); +} + + QTEST_MAIN(AdvancedQueryParserTest) #include "advancedqueryparsertest.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/fr/baloosearch.po new/baloo-5.24.0/po/fr/baloosearch.po --- old/baloo-5.23.0/po/fr/baloosearch.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/fr/baloosearch.po 2016-07-03 01:57:07.000000000 +0200 @@ -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. -# Vincent Pinon <[email protected]>, 2014. +# Vincent Pinon <[email protected]>, 2014, 2016. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-09-19 08:51+0000\n" -"PO-Revision-Date: 2015-06-11 15:42+0200\n" +"PO-Revision-Date: 2016-06-13 18:58+0100\n" "Last-Translator: Vincent Pinon <[email protected]>\n" -"Language-Team: French <[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" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -34,7 +34,7 @@ #: main.cpp:41 msgid "A tool to search through the files indexed by Baloo" -msgstr "" +msgstr "Un outil pour rechercher dans les fichiers indexés par Baloo" #: main.cpp:43 msgid "Vishesh Handa" @@ -46,19 +46,19 @@ #: main.cpp:50 msgid "The maximum number of results" -msgstr "" +msgstr "Le nombre maximum de résultats " #: main.cpp:51 msgid "limit" -msgstr "" +msgstr "Limite" #: main.cpp:53 msgid "Offset from which to start the search" -msgstr "" +msgstr "Décalage à partir duquel commencer la recherche" #: main.cpp:54 msgid "offset" -msgstr "" +msgstr "décalage" #: main.cpp:56 msgid "Type of data to be searched" @@ -66,20 +66,20 @@ #: main.cpp:57 msgid "typeStr" -msgstr "" +msgstr "typeStr" #: main.cpp:59 msgid "Limit search to specified directory" -msgstr "" +msgstr "Limiter la rechercher au dossier spécifié" #: main.cpp:60 msgid "directory" -msgstr "" +msgstr "dossier" #: main.cpp:61 msgid "query" -msgstr "" +msgstr "requête" #: main.cpp:61 msgid "List of words to query for" -msgstr "" +msgstr "Liste de mots à chercher" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/fr/balooshow.po new/baloo-5.24.0/po/fr/balooshow.po --- old/baloo-5.23.0/po/fr/balooshow.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/fr/balooshow.po 2016-07-03 01:57:07.000000000 +0200 @@ -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. -# Vincent Pinon <[email protected]>, 2014. +# Vincent Pinon <[email protected]>, 2014, 2016. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-10-11 08:16+0000\n" -"PO-Revision-Date: 2015-06-11 15:42+0200\n" +"PO-Revision-Date: 2016-06-13 18:56+0100\n" "Last-Translator: Vincent Pinon <[email protected]>\n" -"Language-Team: French <[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" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -53,15 +53,19 @@ "The Baloo index could not be opened. Please run \"balooctl status\" to see " "if Baloo is enabled and working." msgstr "" +"Impossible d'ouvrir l'index Baloo. Veuillez exécuter la commande « balooctl " +"status » pour voir si Baloo est activé et fonctionnel." #: main.cpp:121 msgid "The fileID is not equal to the actual Baloo fileID" msgstr "" +"L'identifiant de fichier n'est pas égal à l'identifiant de fichier actuel de " +"Baloo" #: main.cpp:122 msgid "This is a bug" -msgstr "" +msgstr "Ceci est un bug" #: main.cpp:150 msgid "No index information found" -msgstr "" +msgstr "Aucune information d'index trouvée" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/he/kio_baloosearch.po new/baloo-5.24.0/po/he/kio_baloosearch.po --- old/baloo-5.23.0/po/he/kio_baloosearch.po 1970-01-01 01:00:00.000000000 +0100 +++ new/baloo-5.24.0/po/he/kio_baloosearch.po 2016-07-03 01:57:07.000000000 +0200 @@ -0,0 +1,22 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Elkana Bardugo <[email protected]>, 2016. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2014-10-15 07:45+0000\n" +"PO-Revision-Date: 2016-06-29 17:56+0200\n" +"Last-Translator: Elkana Bardugo <[email protected]>\n" +"Language-Team: Hebrew <[email protected]>\n" +"Language: he\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 2.0\n" + +#: kio_search.cpp:47 +msgid "Search Folder" +msgstr "חיפוש תיקיה" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/he/kio_timeline.po new/baloo-5.24.0/po/he/kio_timeline.po --- old/baloo-5.23.0/po/he/kio_timeline.po 1970-01-01 01:00:00.000000000 +0100 +++ new/baloo-5.24.0/po/he/kio_timeline.po 2016-07-03 01:57:07.000000000 +0200 @@ -0,0 +1,35 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Elkana Bardugo <[email protected]>, 2016. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2015-09-09 08:06+0000\n" +"PO-Revision-Date: 2016-06-29 20:03+0200\n" +"Last-Translator: Elkana Bardugo <[email protected]>\n" +"Language-Team: Hebrew <[email protected]>\n" +"Language: he\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 2.0\n" + +#: kio_timeline.cpp:62 +msgctxt "" +"Month and year used in a tree above the actual days. Have a look at http://"; +"doc.qt.io/qt-5/qdate.html#toString to see which variables you can use and " +"ask [email protected] if you have problems understanding how to translate " +"this" +msgid "MMMM yyyy" +msgstr "" + +#: kio_timeline.cpp:120 +msgid "Today" +msgstr "היום" + +#: kio_timeline.cpp:121 kio_timeline.cpp:190 +msgid "Calendar" +msgstr "לוח שנה" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/it/baloo_file.po new/baloo-5.24.0/po/it/baloo_file.po --- old/baloo-5.23.0/po/it/baloo_file.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/it/baloo_file.po 2016-07-03 01:57:07.000000000 +0200 @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/it/baloo_file_extractor.po new/baloo-5.24.0/po/it/baloo_file_extractor.po --- old/baloo-5.23.0/po/it/baloo_file_extractor.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/it/baloo_file_extractor.po 2016-07-03 01:57:07.000000000 +0200 @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/it/balooctl.po new/baloo-5.24.0/po/it/balooctl.po --- old/baloo-5.23.0/po/it/balooctl.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/it/balooctl.po 2016-07-03 01:57:07.000000000 +0200 @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" msgctxt "NAME OF TRANSLATORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/it/baloomonitorplugin.po new/baloo-5.24.0/po/it/baloomonitorplugin.po --- old/baloo-5.23.0/po/it/baloomonitorplugin.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/it/baloomonitorplugin.po 2016-07-03 01:57:07.000000000 +0200 @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" #: ../../file/indexerstate.h:42 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/it/baloosearch.po new/baloo-5.24.0/po/it/baloosearch.po --- old/baloo-5.23.0/po/it/baloosearch.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/it/baloosearch.po 2016-07-03 01:57:07.000000000 +0200 @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" msgctxt "NAME OF TRANSLATORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/it/balooshow.po new/baloo-5.24.0/po/it/balooshow.po --- old/baloo-5.23.0/po/it/balooshow.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/it/balooshow.po 2016-07-03 01:57:07.000000000 +0200 @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" msgctxt "NAME OF TRANSLATORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/it/kio_baloosearch.po new/baloo-5.24.0/po/it/kio_baloosearch.po --- old/baloo-5.23.0/po/it/kio_baloosearch.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/it/kio_baloosearch.po 2016-07-03 01:57:07.000000000 +0200 @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" #: kio_search.cpp:47 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/it/kio_tags.po new/baloo-5.24.0/po/it/kio_tags.po --- old/baloo-5.23.0/po/it/kio_tags.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/it/kio_tags.po 2016-07-03 01:57:07.000000000 +0200 @@ -15,7 +15,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: kio_tags.cpp:63 kio_tags.cpp:161 msgid "Tag" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/it/kio_timeline.po new/baloo-5.24.0/po/it/kio_timeline.po --- old/baloo-5.23.0/po/it/kio_timeline.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/it/kio_timeline.po 2016-07-03 01:57:07.000000000 +0200 @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" #: kio_timeline.cpp:62 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/zh_TW/balooctl.po new/baloo-5.24.0/po/zh_TW/balooctl.po --- old/baloo-5.23.0/po/zh_TW/balooctl.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/zh_TW/balooctl.po 2016-07-03 01:57:07.000000000 +0200 @@ -2,227 +2,222 @@ # This file is distributed under the same license as the PACKAGE package. # # Franklin, 2014, 2015. +# Jeff Huang <[email protected]>, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-12-15 08:19+0000\n" -"PO-Revision-Date: 2015-06-09 16:46+0800\n" -"Last-Translator: Franklin\n" -"Language-Team: Chinese Traditional <[email protected]>\n" +"PO-Revision-Date: 2016-06-28 21:58+0800\n" +"Last-Translator: Jeff Huang <[email protected]>\n" +"Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\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: Lokalize 2.0\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Franklin Weng" +msgstr "Franklin Weng, Jeff Huang" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "[email protected]" +msgstr "[email protected], [email protected]" #: ../../file/indexerstate.h:42 msgid "Unknown" -msgstr "" +msgstr "未知" #: ../../file/indexerstate.h:45 msgid "Idle" -msgstr "" +msgstr "閒置" #: ../../file/indexerstate.h:48 msgid "Suspended" -msgstr "" +msgstr "暫停" #: ../../file/indexerstate.h:51 msgid "Initial Indexing" -msgstr "" +msgstr "初始索引" #: ../../file/indexerstate.h:54 -#, fuzzy -#| msgid "Index the specified files" msgid "Indexing new files" -msgstr "建立指定檔案索引" +msgstr "建立新檔案索引" #: ../../file/indexerstate.h:57 -#, fuzzy -#| msgid "Index the specified files" msgid "Indexing modified files" -msgstr "建立指定檔案索引" +msgstr "建立修改過的檔案索引" #: ../../file/indexerstate.h:60 msgid "Indexing Extended Attributes" -msgstr "" +msgstr "建立延伸屬性索引" #: ../../file/indexerstate.h:63 msgid "Indexing file content" -msgstr "" +msgstr "建立檔案內容索引" #: ../../file/indexerstate.h:66 -#, fuzzy -#| msgid "Check for any unindexed files and index them" msgid "Checking for unindexed files" -msgstr "檢查是否有任何未建索引的檔案，並建立索引" +msgstr "檢查是否有未建索引的檔案" #: configcommand.cpp:45 msgid "Manipulate the Baloo configuration" -msgstr "" +msgstr "操作 Baloo 設定" #: configcommand.cpp:68 msgid "The config command can be used to manipulate the Baloo Configuration" -msgstr "" +msgstr "config 命令可以用於操作 Baloo 設定" #: configcommand.cpp:69 msgid "Usage: balooctl config <command>" -msgstr "" +msgstr "用法：balooctl config <命令>" #: configcommand.cpp:70 msgid "Possible Commands:" -msgstr "" +msgstr "可能的命令：" #: configcommand.cpp:73 msgid "Add a value to config parameter" -msgstr "" +msgstr "加入一個值到 config 參數中" #: configcommand.cpp:74 msgid "Remove a value from a config parameter" -msgstr "" +msgstr "從 config 參數移除一個值" #: configcommand.cpp:75 msgid "Show the value of a config parameter" -msgstr "" +msgstr "顯示 config 參數的值" #: configcommand.cpp:76 msgid "Set the value of a config parameter" -msgstr "" +msgstr "設定 config 參數的值" #: configcommand.cpp:77 msgid "Display this help menu" -msgstr "" +msgstr "顯示此說明選單" #: configcommand.cpp:83 msgid "The following configuration options may be listed:" -msgstr "" +msgstr "以下的設定選項可能會被列出：" #: configcommand.cpp:85 configcommand.cpp:398 msgid "Controls if Baloo indexes hidden files and folders" -msgstr "" +msgstr "控制 Baloo 是否對隱藏的檔案與資料夾建立索引" #: configcommand.cpp:86 msgid "Controls if baloo indexes file content." -msgstr "" +msgstr "控制 baloo 是否對檔案內容建立索引。" #: configcommand.cpp:87 configcommand.cpp:150 configcommand.cpp:261 msgid "The list of folders which Baloo indexes" -msgstr "" +msgstr "Baloo 建立索引的資料夾清單" #: configcommand.cpp:88 configcommand.cpp:151 configcommand.cpp:262 msgid "The list of folders which Baloo will never index" -msgstr "" +msgstr "Baloo 絕對不會建立索引的資料夾清單" #: configcommand.cpp:89 configcommand.cpp:152 configcommand.cpp:263 msgid "The list of filters which are used to exclude files" -msgstr "" +msgstr "用來排除檔案的過濾器清單" #: configcommand.cpp:90 configcommand.cpp:153 configcommand.cpp:264 msgid "The list of mimetypes which are used to exclude files" -msgstr "" +msgstr "用來排除檔案的 MIME 類型清單" #: configcommand.cpp:142 configcommand.cpp:253 configcommand.cpp:390 #: configcommand.cpp:459 msgid "Config parameter could not be found" -msgstr "" +msgstr "找不到 config 參數" #: configcommand.cpp:148 configcommand.cpp:259 configcommand.cpp:396 msgid "The following configuration options may be modified:" -msgstr "" +msgstr "以下的設定選項可能會被修改：" #: configcommand.cpp:161 configcommand.cpp:191 configcommand.cpp:272 #: configcommand.cpp:314 msgid "A folder must be provided" -msgstr "" +msgstr "必須提供一個資料夾" #: configcommand.cpp:167 configcommand.cpp:197 configcommand.cpp:278 #: configcommand.cpp:320 msgid "Path does not exist" -msgstr "" +msgstr "路徑不存在" #: configcommand.cpp:172 configcommand.cpp:202 configcommand.cpp:283 #: configcommand.cpp:325 msgid "Path is not a directory" -msgstr "" +msgstr "路徑並非目錄" #: configcommand.cpp:179 #, kde-format msgid "%1 is not in the list of include folders" -msgstr "" +msgstr "%1 不在包含的資料夾的清單內" #: configcommand.cpp:209 #, kde-format msgid "%1 is not in the list of exclude folders" -msgstr "" +msgstr "%1 不在排除的資料夾的清單內" #: configcommand.cpp:221 configcommand.cpp:356 msgid "A filter must be provided" -msgstr "" +msgstr "必須提供一個過濾器" #: configcommand.cpp:227 #, kde-format msgid "%1 is not in list of exclude filters" -msgstr "" +msgstr "%1 不在排除的過濾器的清單內" #: configcommand.cpp:238 configcommand.cpp:374 msgid "A mimetype must be provided" -msgstr "" +msgstr "必須提供一個 MIME 類型" #: configcommand.cpp:244 #, kde-format msgid "%1 is not in list of exclude mimetypes" -msgstr "" +msgstr "%1 不在排除的 MIME 類型的清單內" #: configcommand.cpp:290 #, kde-format msgid "%1 is already in the list of include folders" -msgstr "" +msgstr "%1 已經在包含的資料夾的清單內" #: configcommand.cpp:296 #, kde-format msgid "Parent folder %1 is already in the list of include folders" -msgstr "" +msgstr "父目錄 %1 已經在包含的資料夾的清單內" #: configcommand.cpp:302 configcommand.cpp:344 #, kde-format msgid "%1 is in the list of exclude folders" -msgstr "" +msgstr "%1 在排除的資料夾的清單內" #: configcommand.cpp:332 #, kde-format msgid "%1 is already in the list of exclude folders" -msgstr "" +msgstr "%1 已經在排除的資料夾的清單內" #: configcommand.cpp:338 #, kde-format msgid "Parent folder %1 is already in the list of exclude folders" -msgstr "" +msgstr "父目錄 %1 已經在排除的資料夾的清單內" #: configcommand.cpp:362 msgid "Exclude filter is already in the list" -msgstr "" +msgstr "排除過濾器已在清單內" #: configcommand.cpp:380 msgid "Exclude mimetype is already in the list" -msgstr "" +msgstr "排除 MIME 類型已在清單內" #: configcommand.cpp:407 configcommand.cpp:434 msgid "A value must be provided" -msgstr "" +msgstr "必須提供一個值" #: configcommand.cpp:428 configcommand.cpp:455 msgid "Invalid value" -msgstr "" +msgstr "不合法的值" #: main.cpp:67 msgid "balooctl" @@ -281,49 +276,44 @@ msgstr "建立指定檔案索引" #: main.cpp:86 -#, fuzzy -#| msgid "Index the specified files" msgid "Forget the specified files" -msgstr "建立指定檔案索引" +msgstr "忘記指定檔案索引" #: main.cpp:87 msgid "Modify the Baloo configuration" -msgstr "" +msgstr "修改 Baloo 設定" #: statuscommand.cpp:45 -#, fuzzy -#| msgid "Print the status of the indexer" msgid "Print the status of the Indexer" msgstr "印出索引器狀態" #: statuscommand.cpp:54 msgid "Baloo is currently disabled. To enable, please run \"balooctl enable\"" -msgstr "" +msgstr "Baloo 目前已停用。要啟用，請執行「balooctl enable」" #: statuscommand.cpp:60 msgid "Baloo Index could not be opened" -msgstr "" +msgstr "無法開啟 Baloo 索引" #: statuscommand.cpp:81 msgid "Baloo File Indexer is running" -msgstr "" +msgstr "Baloo 檔案索引器正在執行中" #: statuscommand.cpp:82 #, kde-format msgid "Indexer state: %1" -msgstr "" +msgstr "索引器狀態：%1" #: statuscommand.cpp:85 msgid "Baloo File Indexer is not running" -msgstr "" +msgstr "Baloo 檔案索引器未執行" #: statuscommand.cpp:91 -#, fuzzy, kde-format -#| msgid "Index the specified files" +#, kde-format msgid "Indexed %1 / %2 files" -msgstr "建立指定檔案索引" +msgstr "已索引 %1/%2 個檔案" #: statuscommand.cpp:108 #, kde-format msgid "File: %1" -msgstr "" +msgstr "檔案：%1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/zh_TW/baloosearch.po new/baloo-5.24.0/po/zh_TW/baloosearch.po --- old/baloo-5.23.0/po/zh_TW/baloosearch.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/zh_TW/baloosearch.po 2016-07-03 01:57:07.000000000 +0200 @@ -2,28 +2,29 @@ # This file is distributed under the same license as the PACKAGE package. # # Franklin Weng <franklin at goodhorse dot idv dot tw>, 2014, 2015. +# Jeff Huang <[email protected]>, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-09-19 08:51+0000\n" -"PO-Revision-Date: 2015-05-20 14:28+0800\n" -"Last-Translator: Franklin\n" -"Language-Team: Chinese Traditional <[email protected]>\n" +"PO-Revision-Date: 2016-06-28 16:59+0800\n" +"Last-Translator: Jeff Huang <[email protected]>\n" +"Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\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: Lokalize 2.0\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Franklin Weng" +msgstr "Franklin Weng, Jeff Huang" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "[email protected]" +msgstr "[email protected], [email protected]" #: main.cpp:39 msgid "Baloo Search" @@ -31,7 +32,7 @@ #: main.cpp:41 msgid "A tool to search through the files indexed by Baloo" -msgstr "" +msgstr "透過已由 Baloo 所索引的檔案搜尋的工具" #: main.cpp:43 msgid "Vishesh Handa" @@ -43,21 +44,19 @@ #: main.cpp:50 msgid "The maximum number of results" -msgstr "" +msgstr "最多結果筆數" #: main.cpp:51 msgid "limit" -msgstr "" +msgstr "限制" #: main.cpp:53 -#, fuzzy -#| msgid "Offset from which start the search" msgid "Offset from which to start the search" msgstr "開始搜尋的位移" #: main.cpp:54 msgid "offset" -msgstr "" +msgstr "位移" #: main.cpp:56 msgid "Type of data to be searched" @@ -65,22 +64,20 @@ #: main.cpp:57 msgid "typeStr" -msgstr "" +msgstr "typeStr" #: main.cpp:59 msgid "Limit search to specified directory" -msgstr "" +msgstr "限制搜尋特定目錄" #: main.cpp:60 msgid "directory" -msgstr "" +msgstr "目錄" #: main.cpp:61 msgid "query" -msgstr "" +msgstr "query" #: main.cpp:61 -#, fuzzy -#| msgid "The words to search for" msgid "List of words to query for" -msgstr "要搜尋的文字" +msgstr "要搜尋的文字列表" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/zh_TW/balooshow.po new/baloo-5.24.0/po/zh_TW/balooshow.po --- old/baloo-5.23.0/po/zh_TW/balooshow.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/zh_TW/balooshow.po 2016-07-03 01:57:07.000000000 +0200 @@ -2,28 +2,29 @@ # This file is distributed under the same license as the PACKAGE package. # # Franklin Weng <franklin at goodhorse dot idv dot tw>, 2014. +# Jeff Huang <[email protected]>, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-10-11 08:16+0000\n" -"PO-Revision-Date: 2014-02-19 12:55+0800\n" -"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n" -"Language-Team: Chinese Traditional <[email protected]>\n" +"PO-Revision-Date: 2016-06-28 17:06+0800\n" +"Last-Translator: Jeff Huang <[email protected]>\n" +"Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\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: Lokalize 2.0\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Franklin Weng" +msgstr "Franklin Weng, Jeff Huang" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "[email protected]" +msgstr "[email protected], [email protected]" #: main.cpp:56 msgid "Baloo Show" @@ -50,15 +51,17 @@ "The Baloo index could not be opened. Please run \"balooctl status\" to see " "if Baloo is enabled and working." msgstr "" +"Baloo 索引無法開啟。請執行「balooctl status」來檢視 Baloo 是否已啟用並正在運" +"行中。" #: main.cpp:121 msgid "The fileID is not equal to the actual Baloo fileID" -msgstr "" +msgstr "fileID 不等於實際上的 Baloo fileID" #: main.cpp:122 msgid "This is a bug" -msgstr "" +msgstr "這是臭蟲" #: main.cpp:150 msgid "No index information found" -msgstr "" +msgstr "找不到索引資訊" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/po/zh_TW/kio_timeline.po new/baloo-5.24.0/po/zh_TW/kio_timeline.po --- old/baloo-5.23.0/po/zh_TW/kio_timeline.po 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/po/zh_TW/kio_timeline.po 2016-07-03 01:57:07.000000000 +0200 @@ -2,36 +2,30 @@ # This file is distributed under the same license as the PACKAGE package. # # Franklin Weng <franklin at goodhorse dot idv dot tw>, 2014, 2015. +# Jeff Huang <[email protected]>, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-09-09 08:06+0000\n" -"PO-Revision-Date: 2015-09-02 15:35+0800\n" -"Last-Translator: Franklin\n" -"Language-Team: Chinese Traditional <[email protected]>\n" +"PO-Revision-Date: 2016-06-28 17:23+0800\n" +"Last-Translator: Jeff Huang <[email protected]>\n" +"Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\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: Lokalize 2.0\n" #: kio_timeline.cpp:62 -#, fuzzy -#| msgctxt "" -#| "Month and year used in a tree above the actual days. Have a look at " -#| "http://doc.qt.io/qt-5/qdate.html#toString to see which variables you can " -#| "use and ask [email protected] if you have problems understanding how " -#| "to translate this" -#| msgid "%MMMM %yy" msgctxt "" "Month and year used in a tree above the actual days. Have a look at http://"; "doc.qt.io/qt-5/qdate.html#toString to see which variables you can use and " "ask [email protected] if you have problems understanding how to translate " "this" msgid "MMMM yyyy" -msgstr "%yy 年 %MMMM" +msgstr "MMMM yyyy" #: kio_timeline.cpp:120 msgid "Today" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/src/engine/documenturldb.h new/baloo-5.24.0/src/engine/documenturldb.h --- old/baloo-5.23.0/src/engine/documenturldb.h 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/src/engine/documenturldb.h 2016-07-03 01:57:07.000000000 +0200 @@ -24,6 +24,9 @@ #include "idtreedb.h" #include "idfilenamedb.h" +#include <QDebug> +#include <QFile> + namespace Baloo { class UrlTest; @@ -96,14 +99,7 @@ idFilenameDb.del(docId); QVector<quint64> subDocs = idTreeDb.get(path.parentId); -#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) - const int docIdIndex = subDocs.indexOf(docId); - if (docIdIndex >= 0) { - subDocs.remove(docIdIndex); - } -#else subDocs.removeOne(docId); -#endif if (!subDocs.isEmpty()) { idTreeDb.put(path.parentId, subDocs); @@ -131,7 +127,25 @@ } if (url.isEmpty()) { - Q_ASSERT_X(idTreeDb.get(docId).isEmpty(), "DocumentUrlDB::del", "This folder still has sub-files in its cache. It cannot be deleted"); + auto subDocs = idTreeDb.get(docId); + if (!subDocs.isEmpty()) { + // Check if subdocs actually exist or is it a curruption + for (auto const& docId : subDocs) { + auto filePath = idFilenameDb.get(docId); + auto fileName = QFile::decodeName(filePath.name); + if (QFile::exists(fileName)) { + Q_ASSERT_X(idTreeDb.get(docId).isEmpty(), + "DocumentUrlDB::del", + "This folder still has sub-files in its cache. It cannot be deleted"); + } else { + /* + * FIXME: this is not an ideal solution we need to figure out how such currptions are + * creeping in or at least if we detect some figure out a proper cleaning mechanism + */ + qWarning() << "Database has corrupted entries baloo may misbehave, please recreate the DB by running $ balooctl disable && balooctl enable"; + } + } + } return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/src/kioslaves/kded/baloosearchmodule.desktop new/baloo-5.24.0/src/kioslaves/kded/baloosearchmodule.desktop --- old/baloo-5.23.0/src/kioslaves/kded/baloosearchmodule.desktop 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/src/kioslaves/kded/baloosearchmodule.desktop 2016-07-03 01:57:07.000000000 +0200 @@ -20,6 +20,7 @@ Name[en_GB]=Search Folder Updater Name[es]=Actualizador de la carpeta de búsquedas Name[fi]=Hakukansion päivitin +Name[fr]=Mise à jour du dossier Recherche Name[gd]=Inneal-ùrachaidh nam pasganan-luirg Name[gl]=Actualizador do cartafol de busca Name[hu]=Keresésfrissítő @@ -58,6 +59,7 @@ Comment[en_GB]=Allows automatic updates of Search Folders Comment[es]=Permite actualizaciones automáticas de las carpetas de búsqueda Comment[fi]=Mahdollistaa hakukansioiden automaattisen päivittämisen +Comment[fr]=Permet une mise à jour automatique des dossiers de recherche Comment[gd]=Bheir e comas ùrachaidh fhèin-obrachail dhut airson nam pasganan-luirg Comment[gl]=Permite actualizar automaticamente os cartafoles de busca. Comment[hu]=Lehetővé teszi a keresési mappák automatikus frissítését diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/baloo-5.23.0/src/lib/advancedqueryparser.cpp new/baloo-5.24.0/src/lib/advancedqueryparser.cpp --- old/baloo-5.23.0/src/lib/advancedqueryparser.cpp 2016-06-06 13:23:49.000000000 +0200 +++ new/baloo-5.24.0/src/lib/advancedqueryparser.cpp 2016-07-03 01:57:07.000000000 +0200 @@ -146,13 +146,17 @@ // Lex the input string QStringList tokens = lex(text); - for (const QString &token : tokens) { // If a key and an operator have been parsed, now is time for a value if (valueExpected) { // When the parser encounters a literal, it puts it in the value of // termInConstruction so that "foo bar baz" is parsed as expected. - termInConstruction.setProperty(termInConstruction.value().toString()); + auto property = termInConstruction.value().toString(); + if (property.isEmpty()) { + qDebug() << "Binary operator without first argument encountered:" << text; + return Term(); + } + termInConstruction.setProperty(property); QVariant value = tokenToVariant(token); if (value.type() != QVariant::String) {
