Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2017-10-27 13:53:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Fri Oct 27 13:53:36 2017 rev:48 rq:536308 version:5.39.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2017-09-19 16:22:31.178744040 +0200 +++ /work/SRC/openSUSE:Factory/.kconfig.new/kconfig.changes 2017-10-27 13:54:17.160029573 +0200 @@ -1,0 +2,12 @@ +Mon Oct 23 06:41:38 CEST 2017 - [email protected] + +- Update to 5.39.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.39.0.php +- Changes since 5.38.0: + * [KConfigGroup] reserve() more and add some C++11 + * Deprecate KStandardShortcut::SaveOptions + * Add apidox to KStandardShorcut::StandardShortcut + +------------------------------------------------------------------- Old: ---- kconfig-5.38.0.tar.xz New: ---- kconfig-5.39.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.nKwwpf/_old 2017-10-27 13:54:17.799999660 +0200 +++ /var/tmp/diff_new_pack.nKwwpf/_new 2017-10-27 13:54:17.803999473 +0200 @@ -18,13 +18,13 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.38 +%define _tar_path 5.39 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kconfig -Version: 5.38.0 +Version: 5.39.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} ++++++ kconfig-5.38.0.tar.xz -> kconfig-5.39.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/CMakeLists.txt new/kconfig-5.39.0/CMakeLists.txt --- old/kconfig-5.38.0/CMakeLists.txt 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/CMakeLists.txt 2017-10-07 21:09:06.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.38.0") # handled by release scripts +set(KF5_VERSION "5.39.0") # handled by release scripts project(KConfig VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.38.0 NO_MODULE) +find_package(ECM 5.39.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/cs/kconfig5_qt.po new/kconfig-5.39.0/po/cs/kconfig5_qt.po --- old/kconfig-5.38.0/po/cs/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/cs/kconfig5_qt.po 2017-10-07 21:09:06.000000000 +0200 @@ -4,7 +4,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2017-08-10 15:03+0100\n" +"PO-Revision-Date: 2017-09-12 12:34+0100\n" "Last-Translator: Vít Pelčák <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" "Language: cs\n" @@ -367,12 +367,12 @@ #: gui/kstandardshortcut.cpp:155 msgctxt "KStandardShortcut|@action" msgid "Show Toolbar" -msgstr "Zobrazit nástrojovou lištu" +msgstr "Zobrazit panel nástrojů" #: gui/kstandardshortcut.cpp:156 msgctxt "KStandardShortcut|@action" msgid "Show Statusbar" -msgstr "Zobrazit stavovou lištu" +msgstr "Zobrazit stavový panel" #: gui/kstandardshortcut.cpp:157 msgctxt "KStandardShortcut|@action" @@ -392,7 +392,7 @@ #: gui/kstandardshortcut.cpp:160 msgctxt "KStandardShortcut|@action" msgid "Configure Toolbars" -msgstr "Nastavit nástrojové lišty" +msgstr "Nastavit panely nástrojů" #: gui/kstandardshortcut.cpp:161 msgctxt "KStandardShortcut|@action" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/de/kconfig5_qt.po new/kconfig-5.39.0/po/de/kconfig5_qt.po --- old/kconfig-5.38.0/po/de/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/de/kconfig5_qt.po 2017-10-07 21:09:06.000000000 +0200 @@ -1,14 +1,14 @@ # Thomas Diehl <[email protected]>, 2003. # Thomas Reitelbach <[email protected]>, 2006, 2007, 2008. # Frederik Schwarzer <[email protected]>, 2012, 2014, 2015, 2016. -# Burkhard Lück <[email protected]>, 2014, 2015, 2016. +# Burkhard Lück <[email protected]>, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2016-08-17 12:17+0100\n" -"Last-Translator: Frederik Schwarzer <[email protected]>\n" +"PO-Revision-Date: 2017-09-25 15:13+0100\n" +"Last-Translator: Burkhard Lück <[email protected]>\n" "Language-Team: German <[email protected]>\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -426,20 +426,14 @@ msgstr "Über KDE" #: gui/kstandardshortcut.cpp:167 -#, fuzzy -#| msgctxt "KStandardShortcut|@action" -#| msgid "Delete File" msgctxt "KStandardShortcut|@action" msgid "Delete" -msgstr "Datei löschen" +msgstr "Löschen" #: gui/kstandardshortcut.cpp:168 -#, fuzzy -#| msgctxt "KStandardShortcut|@action" -#| msgid "Rename File" msgctxt "KStandardShortcut|@action" msgid "Rename" -msgstr "Datei umbenennen" +msgstr "Umbenennen" #: gui/kstandardshortcut.cpp:169 msgctxt "KStandardShortcut|@action" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/fr/kconfig5_qt.po new/kconfig-5.39.0/po/fr/kconfig5_qt.po --- old/kconfig-5.38.0/po/fr/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/fr/kconfig5_qt.po 2017-10-07 21:09:06.000000000 +0200 @@ -9,16 +9,16 @@ # Joëlle Cornavin <[email protected]>, 2008. # xavier <[email protected]>, 2013. # Maxime Corteel <[email protected]>, 2014, 2015. -# Vincent Pinon <[email protected]>, 2016. +# Vincent Pinon <[email protected]>, 2016, 2017. # msgid "" msgstr "" "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2016-11-27 23:36+0100\n" +"PO-Revision-Date: 2017-09-14 18:07+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" @@ -438,20 +438,14 @@ msgstr "À propos de KDE" #: gui/kstandardshortcut.cpp:167 -#, fuzzy -#| msgctxt "KStandardShortcut|@action" -#| msgid "Delete File" msgctxt "KStandardShortcut|@action" msgid "Delete" -msgstr "Supprimer le fichier" +msgstr "Supprimer" #: gui/kstandardshortcut.cpp:168 -#, fuzzy -#| msgctxt "KStandardShortcut|@action" -#| msgid "Rename File" msgctxt "KStandardShortcut|@action" msgid "Rename" -msgstr "Renommer le fichier" +msgstr "Renommer" #: gui/kstandardshortcut.cpp:169 msgctxt "KStandardShortcut|@action" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/gl/kconfig5_qt.po new/kconfig-5.39.0/po/gl/kconfig5_qt.po --- old/kconfig-5.38.0/po/gl/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/gl/kconfig5_qt.po 2017-10-07 21:09:06.000000000 +0200 @@ -6,13 +6,14 @@ # marce villarino <[email protected]>, 2009. # Marce Villarino <[email protected]>, 2009, 2014. # Adrián Chaves Fernández <[email protected]>, 2015, 2017. +# Adrián Chaves (Gallaecio) <[email protected]>, 2017. msgid "" msgstr "" "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2017-07-24 17:13+0100\n" -"Last-Translator: Adrián Chaves <[email protected]>\n" +"PO-Revision-Date: 2017-09-29 21:21+0100\n" +"Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -115,12 +116,12 @@ #: gui/kstandardshortcut.cpp:90 msgctxt "KStandardShortcut|@action" msgid "Delete Word Backwards" -msgstr "Borrar unha palabra cara tras" +msgstr "Eliminar unha palabra cara tras" #: gui/kstandardshortcut.cpp:91 msgctxt "KStandardShortcut|@action" msgid "Delete Word Forward" -msgstr "Borrar unha palabra cara diante" +msgstr "Eliminar unha palabra cara diante" #: gui/kstandardshortcut.cpp:93 msgctxt "KStandardShortcut|@action" @@ -365,7 +366,7 @@ #: gui/kstandardshortcut.cpp:153 msgctxt "KStandardShortcut|@action" msgid "Edit Bookmarks" -msgstr "Xestionar os marcadores" +msgstr "Editar os marcadores" #: gui/kstandardshortcut.cpp:154 msgctxt "KStandardShortcut|@action" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/ia/kconfig5_qt.po new/kconfig-5.39.0/po/ia/kconfig5_qt.po --- old/kconfig-5.38.0/po/ia/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/ia/kconfig5_qt.po 2017-10-07 21:09:06.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. # -# g.sora <[email protected]>, 2010. +# g.sora <[email protected]>, 2010, 2017. # Giovanni Sora <[email protected]>, 2014, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2016-11-29 14:01+0100\n" -"Last-Translator: Giovanni Sora <[email protected]>\n" -"Language-Team: Interlingua <[email protected]>\n" +"PO-Revision-Date: 2017-09-14 23:24+0100\n" +"Last-Translator: giovanni <[email protected]>\n" +"Language-Team: Interlingua <[email protected]>\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" @@ -427,20 +427,14 @@ msgstr "Re KDE" #: gui/kstandardshortcut.cpp:167 -#, fuzzy -#| msgctxt "KStandardShortcut|@action" -#| msgid "Delete File" msgctxt "KStandardShortcut|@action" msgid "Delete" -msgstr "Dele file" +msgstr "Dele" #: gui/kstandardshortcut.cpp:168 -#, fuzzy -#| msgctxt "KStandardShortcut|@action" -#| msgid "Rename File" msgctxt "KStandardShortcut|@action" msgid "Rename" -msgstr "Renomina file" +msgstr "Renomina" #: gui/kstandardshortcut.cpp:169 msgctxt "KStandardShortcut|@action" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/nb/kconfig5_qt.po new/kconfig-5.39.0/po/nb/kconfig5_qt.po --- old/kconfig-5.38.0/po/nb/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/nb/kconfig5_qt.po 2017-10-07 21:09:06.000000000 +0200 @@ -27,7 +27,7 @@ msgid "Please contact your system administrator." msgstr "Kontakt systemadministratoren din." -#: core/kconfigini.cpp:577 +#: core/kconfigini.cpp:578 #, qt-format msgctxt "KConfigIniBackend|" msgid "Configuration file \"%1\" not writable.\n" @@ -431,12 +431,12 @@ #: gui/kstandardshortcut.cpp:167 msgctxt "KStandardShortcut|@action" -msgid "Delete File" +msgid "Delete" msgstr "" #: gui/kstandardshortcut.cpp:168 msgctxt "KStandardShortcut|@action" -msgid "Rename File" +msgid "Rename" msgstr "" #: gui/kstandardshortcut.cpp:169 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/nl/kconfig5_qt.po new/kconfig-5.39.0/po/nl/kconfig5_qt.po --- old/kconfig-5.38.0/po/nl/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/nl/kconfig5_qt.po 2017-10-07 21:09:06.000000000 +0200 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-08-10 15:45+0100\n" +"PO-Revision-Date: 2017-09-15 10:35+0100\n" "Last-Translator: Freek de Kruijf <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" "Language: nl\n" @@ -418,7 +418,7 @@ #: gui/kstandardshortcut.cpp:166 msgctxt "KStandardShortcut|@action" msgid "About KDE" -msgstr "Info over KDE" +msgstr "Over KDE" #: gui/kstandardshortcut.cpp:167 msgctxt "KStandardShortcut|@action" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/pl/kconfig5_qt.po new/kconfig-5.39.0/po/pl/kconfig5_qt.po --- old/kconfig-5.38.0/po/pl/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/pl/kconfig5_qt.po 2017-10-07 21:09:06.000000000 +0200 @@ -428,15 +428,11 @@ msgstr "O KDE" #: gui/kstandardshortcut.cpp:167 -#| msgctxt "KStandardShortcut|@action" -#| msgid "Delete File" msgctxt "KStandardShortcut|@action" msgid "Delete" msgstr "Usuń" #: gui/kstandardshortcut.cpp:168 -#| msgctxt "KStandardShortcut|@action" -#| msgid "Rename File" msgctxt "KStandardShortcut|@action" msgid "Rename" msgstr "Zmień nazwę" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/se/kconfig5_qt.po new/kconfig-5.39.0/po/se/kconfig5_qt.po --- old/kconfig-5.38.0/po/se/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/se/kconfig5_qt.po 2017-10-07 21:09:06.000000000 +0200 @@ -25,7 +25,7 @@ msgid "Please contact your system administrator." msgstr "" -#: core/kconfigini.cpp:577 +#: core/kconfigini.cpp:578 #, qt-format msgctxt "KConfigIniBackend|" msgid "Configuration file \"%1\" not writable.\n" @@ -429,12 +429,12 @@ #: gui/kstandardshortcut.cpp:167 msgctxt "KStandardShortcut|@action" -msgid "Delete File" +msgid "Delete" msgstr "" #: gui/kstandardshortcut.cpp:168 msgctxt "KStandardShortcut|@action" -msgid "Rename File" +msgid "Rename" msgstr "" #: gui/kstandardshortcut.cpp:169 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/sr/kconfig5_qt.po new/kconfig-5.39.0/po/sr/kconfig5_qt.po --- old/kconfig-5.38.0/po/sr/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/sr/kconfig5_qt.po 2017-10-07 21:09:06.000000000 +0200 @@ -3,7 +3,6 @@ msgid "" msgstr "" "Project-Id-Version: kconfig5_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-04-11 02:17+0000\n" "PO-Revision-Date: 2017-08-21 22:33+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" @@ -18,6 +17,7 @@ "X-Text-Markup: qtrich\n" "X-Environment: kde\n" "X-Qt-Contexts: true\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" #: core/kconfig.cpp:909 msgctxt "KConfig|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/sr@ijekavian/kconfig5_qt.po new/kconfig-5.39.0/po/sr@ijekavian/kconfig5_qt.po --- old/kconfig-5.38.0/po/sr@ijekavian/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/sr@ijekavian/kconfig5_qt.po 2017-10-07 21:09:06.000000000 +0200 @@ -3,7 +3,6 @@ msgid "" msgstr "" "Project-Id-Version: kconfig5_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-04-11 02:17+0000\n" "PO-Revision-Date: 2017-08-21 22:33+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" @@ -18,6 +17,7 @@ "X-Text-Markup: qtrich\n" "X-Environment: kde\n" "X-Qt-Contexts: true\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" #: core/kconfig.cpp:909 msgctxt "KConfig|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/sr@ijekavianlatin/kconfig5_qt.po new/kconfig-5.39.0/po/sr@ijekavianlatin/kconfig5_qt.po --- old/kconfig-5.38.0/po/sr@ijekavianlatin/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/sr@ijekavianlatin/kconfig5_qt.po 2017-10-07 21:09:06.000000000 +0200 @@ -3,7 +3,6 @@ msgid "" msgstr "" "Project-Id-Version: kconfig5_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-04-11 02:17+0000\n" "PO-Revision-Date: 2017-08-21 22:33+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" @@ -18,6 +17,7 @@ "X-Text-Markup: qtrich\n" "X-Environment: kde\n" "X-Qt-Contexts: true\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" #: core/kconfig.cpp:909 msgctxt "KConfig|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/sr@latin/kconfig5_qt.po new/kconfig-5.39.0/po/sr@latin/kconfig5_qt.po --- old/kconfig-5.38.0/po/sr@latin/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/sr@latin/kconfig5_qt.po 2017-10-07 21:09:06.000000000 +0200 @@ -3,7 +3,6 @@ msgid "" msgstr "" "Project-Id-Version: kconfig5_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-04-11 02:17+0000\n" "PO-Revision-Date: 2017-08-21 22:33+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" @@ -18,6 +17,7 @@ "X-Text-Markup: qtrich\n" "X-Environment: kde\n" "X-Qt-Contexts: true\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" #: core/kconfig.cpp:909 msgctxt "KConfig|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/zh_CN/kconfig5_qt.po new/kconfig-5.39.0/po/zh_CN/kconfig5_qt.po --- old/kconfig-5.38.0/po/zh_CN/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/zh_CN/kconfig5_qt.po 2017-10-07 21:09:06.000000000 +0200 @@ -1,3 +1,9 @@ +# +# Yan Shuangchun <[email protected]>, 2003. +# Feng Chao <[email protected]>, 2014. +# Xuetian Weng <[email protected]>, 2014. +# Weng Xuetian <[email protected]>, 2016. +# Guo Yunhe <[email protected]>, 2017. msgid "" msgstr "" "Project-Id-Version: kdeorg\n" @@ -12,9 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: crowdin.com\n" -"X-Crowdin-Project: kdeorg\n" -"X-Crowdin-Language: zh-CN\n" -"X-Crowdin-File: /kf5-trunk/messages/frameworks/baloo_file5.pot\n" +"X-Qt-Contexts: true\n" #: core/kconfig.cpp:909 msgctxt "KConfig|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/po/zh_TW/kconfig5_qt.po new/kconfig-5.39.0/po/zh_TW/kconfig5_qt.po --- old/kconfig-5.38.0/po/zh_TW/kconfig5_qt.po 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/po/zh_TW/kconfig5_qt.po 2017-10-07 21:09:06.000000000 +0200 @@ -2,13 +2,13 @@ # # Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv dot tw>, 2006, 2008. # Franklin Weng <franklin at goodhorse dot idv dot tw>, 2007, 2014, 2015. -# Jeff Huang <[email protected]>, 2016. +# Jeff Huang <[email protected]>, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2016-08-18 17:48+0800\n" +"PO-Revision-Date: 2017-09-27 08:50+0800\n" "Last-Translator: Jeff Huang <[email protected]>\n" "Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\n" @@ -427,20 +427,14 @@ msgstr "關於 KDE" #: gui/kstandardshortcut.cpp:167 -#, fuzzy -#| msgctxt "KStandardShortcut|@action" -#| msgid "Delete File" msgctxt "KStandardShortcut|@action" msgid "Delete" -msgstr "刪除檔案" +msgstr "刪除" #: gui/kstandardshortcut.cpp:168 -#, fuzzy -#| msgctxt "KStandardShortcut|@action" -#| msgid "Rename File" msgctxt "KStandardShortcut|@action" msgid "Rename" -msgstr "重新命名檔案" +msgstr "重新命名" #: gui/kstandardshortcut.cpp:169 msgctxt "KStandardShortcut|@action" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/src/core/kconfiggroup.cpp new/kconfig-5.39.0/src/core/kconfiggroup.cpp --- old/kconfig-5.38.0/src/core/kconfiggroup.cpp 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/src/core/kconfiggroup.cpp 2017-10-07 21:09:06.000000000 +0200 @@ -182,19 +182,25 @@ return value; } -static QList<int> asIntList(const QByteArray &string) +static QVector<int> asIntList(const QByteArray &string) { - QList<int> list; - Q_FOREACH (const QByteArray &s, string.split(',')) { + const auto &splitString = string.split(','); + + QVector<int> list; + list.reserve(splitString.count()); + for (const QByteArray &s : splitString) { list << s.toInt(); } return list; } -static QList<qreal> asRealList(const QByteArray &string) +static QVector<qreal> asRealList(const QByteArray &string) { - QList<qreal> list; - Q_FOREACH (const QByteArray &s, string.split(',')) { + const auto &splitString = string.split(','); + + QVector<qreal> list; + list.reserve(splitString.count()); + for (const QByteArray &s : splitString) { list << s.toDouble(); } return list; @@ -251,7 +257,7 @@ return tmp; } case QMetaType::QPoint: { - const QList<int> list = asIntList(value); + const auto list = asIntList(value); if (list.count() != 2) { qWarning() << errString(pKey, value, aDefault) @@ -261,7 +267,7 @@ return QPoint(list.at(0), list.at(1)); } case QMetaType::QPointF: { - const QList<qreal> list = asRealList(value); + const auto list = asRealList(value); if (list.count() != 2) { qWarning() << errString(pKey, value, aDefault) @@ -271,7 +277,7 @@ return QPointF(list.at(0), list.at(1)); } case QMetaType::QRect: { - const QList<int> list = asIntList(value); + const auto list = asIntList(value); if (list.count() != 4) { qWarning() << errString(pKey, value, aDefault) @@ -286,7 +292,7 @@ return rect; } case QMetaType::QRectF: { - const QList<qreal> list = asRealList(value); + const auto list = asRealList(value); if (list.count() != 4) { qWarning() << errString(pKey, value, aDefault) @@ -301,7 +307,7 @@ return rect; } case QMetaType::QSize: { - const QList<int> list = asIntList(value); + const auto list = asIntList(value); if (list.count() != 2) { qWarning() << errString(pKey, value, aDefault) @@ -316,7 +322,7 @@ return size; } case QMetaType::QSizeF: { - const QList<qreal> list = asRealList(value); + const auto list = asRealList(value); if (list.count() != 2) { qWarning() << errString(pKey, value, aDefault) @@ -331,7 +337,7 @@ return size; } case QMetaType::QDateTime: { - const QList<int> list = asIntList(value); + const auto list = asIntList(value); if (list.count() != 6) { qWarning() << errString(pKey, value, aDefault) << formatError(6, list.count()); @@ -347,7 +353,7 @@ return dt; } case QMetaType::QDate: { - QList<int> list = asIntList(value); + auto list = asIntList(value); if (list.count() == 6) { list = list.mid(0, 3); // don't break config files that stored QDate as QDateTime } @@ -743,8 +749,11 @@ return aDefault; } + const auto &list = KConfigGroupPrivate::deserializeList(data); + QVariantList value; - Q_FOREACH (const QString &v, KConfigGroupPrivate::deserializeList(data)) { + value.reserve(list.count()); + for (const QString &v : list) { value << v; } @@ -880,8 +889,9 @@ Q_ASSERT_X(!d->bConst, "KConfigGroup::writeEntry", "writing to a read-only group"); QList<QByteArray> balist; + balist.reserve(list.count()); - Q_FOREACH (const QString &entry, list) { + for (const QString &entry : list) { balist.append(entry.toUtf8()); } @@ -899,8 +909,9 @@ Q_ASSERT_X(!d->bConst, "KConfigGroup::writeEntry", "writing to a read-only group"); QList<QByteArray> data; + data.reserve(list.count()); - Q_FOREACH (const QVariant &v, list) { + for (const QVariant &v : list) { if (v.type() == QVariant::ByteArray) { data << v.toByteArray(); } else { @@ -950,88 +961,102 @@ writeEntry(key, value.toList(), flags); return; case QMetaType::QPoint: { - QVariantList list; const QPoint rPoint = value.toPoint(); - list.insert(0, rPoint.x()); - list.insert(1, rPoint.y()); + + const QVariantList list{ + rPoint.x(), + rPoint.y() + }; writeEntry(key, list, flags); return; } case QMetaType::QPointF: { - QVariantList list; const QPointF point = value.toPointF(); - list.insert(0, point.x()); - list.insert(1, point.y()); + + const QVariantList list{ + point.x(), + point.y() + }; writeEntry(key, list, flags); return; } case QMetaType::QRect: { - QVariantList list; const QRect rRect = value.toRect(); - list.insert(0, rRect.left()); - list.insert(1, rRect.top()); - list.insert(2, rRect.width()); - list.insert(3, rRect.height()); + + const QVariantList list{ + rRect.left(), + rRect.top(), + rRect.width(), + rRect.height() + }; writeEntry(key, list, flags); return; } case QMetaType::QRectF: { - QVariantList list; const QRectF rRectF = value.toRectF(); - list.insert(0, rRectF.left()); - list.insert(1, rRectF.top()); - list.insert(2, rRectF.width()); - list.insert(3, rRectF.height()); + + const QVariantList list{ + rRectF.left(), + rRectF.top(), + rRectF.width(), + rRectF.height() + }; writeEntry(key, list, flags); return; } case QMetaType::QSize: { - QVariantList list; const QSize rSize = value.toSize(); - list.insert(0, rSize.width()); - list.insert(1, rSize.height()); + + const QVariantList list{ + rSize.width(), + rSize.height() + }; writeEntry(key, list, flags); return; } case QMetaType::QSizeF: { - QVariantList list; const QSizeF rSizeF = value.toSizeF(); - list.insert(0, rSizeF.width()); - list.insert(1, rSizeF.height()); + + const QVariantList list{ + rSizeF.width(), + rSizeF.height() + }; writeEntry(key, list, flags); return; } case QMetaType::QDate: { - QVariantList list; const QDate date = value.toDate(); - list.insert(0, date.year()); - list.insert(1, date.month()); - list.insert(2, date.day()); + const QVariantList list{ + date.year(), + date.month(), + date.day() + }; writeEntry(key, list, flags); return; } case QMetaType::QDateTime: { - QVariantList list; const QDateTime rDateTime = value.toDateTime(); const QTime time = rDateTime.time(); const QDate date = rDateTime.date(); - list.insert(0, date.year()); - list.insert(1, date.month()); - list.insert(2, date.day()); - - list.insert(3, time.hour()); - list.insert(4, time.minute()); - list.insert(5, time.second()); + const QVariantList list{ + date.year(), + date.month(), + date.day(), + + time.hour(), + time.minute(), + time.second(), + }; writeEntry(key, list, flags); return; @@ -1115,7 +1140,8 @@ Q_ASSERT_X(!d->bConst, "KConfigGroup::writePathEntry", "writing to a read-only group"); QList<QByteArray> list; - Q_FOREACH (const QString &path, value) { + list.reserve(value.length()); + for (const QString &path : value) { list << translatePath(path).toUtf8(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.38.0/src/gui/kstandardshortcut.h new/kconfig-5.39.0/src/gui/kstandardshortcut.h --- old/kconfig-5.38.0/src/gui/kstandardshortcut.h 2017-09-03 10:01:50.000000000 +0200 +++ new/kconfig-5.39.0/src/gui/kstandardshortcut.h 2017-10-07 21:09:06.000000000 +0200 @@ -58,67 +58,96 @@ //This means that everything will be well-ordered from here on. AccelNone = 0, // File menu - Open, New, Close, Save, + Open, ///< Open file. + New, ///< Create a new document. + Close, ///< Close current document. + Save, ///< Save current document. // The Print item - Print, - Quit, + Print, ///< Print current document. + Quit, ///< Quit the program. // Edit menu - Undo, Redo, Cut, Copy, Paste, PasteSelection, - SelectAll, Deselect, DeleteWordBack, DeleteWordForward, - Find, FindNext, FindPrev, Replace, + Undo, ///< Undo last operation. + Redo, ///< Redo last operation. + Cut, ///< Cut selected area and store it in the clipboard. + Copy, ///< Copy selected area into the clipboard. + Paste, ///< Paste contents of clipboard at mouse/cursor position. + PasteSelection, ///< Paste the selection at mouse/cursor position. + SelectAll, ///< Select all. + Deselect, ///< Deselect any selected elements. + DeleteWordBack, ///< Delete a word back from mouse/cursor position. + DeleteWordForward, ///< Delete a word forward from mouse/cursor position. + Find, ///< Initiate a 'find' request in the current document. + FindNext, ///< Find the next instance of a stored 'find'. + FindPrev, ///< Find a previous instance of a stored 'find'. + Replace, ///< Find and replace matches. // Navigation - Home, Begin, End, Prior, Next, - Up, Back, Forward, Reload, + Home, ///< Go to home page. + Begin, ///< Go to beginning of the document. + End, ///< Go to end of the document. + Prior, ///< Scroll up one page. + Next, ///< Scroll down one page. + Up, ///< Up. + Back, ///< Back. + Forward, ///< Forward. + Reload, ///< Reload. // Text Navigation - BeginningOfLine, EndOfLine, GotoLine, - BackwardWord, ForwardWord, + BeginningOfLine, ///< Go to beginning of current line. + EndOfLine, ///< Go to end of current line. + GotoLine, ///< Go to line. + BackwardWord, ///< BackwardWord. + ForwardWord, ///< ForwardWord. // View parameters - AddBookmark, ZoomIn, ZoomOut, FullScreen, - ShowMenubar, + AddBookmark, ///< Add current page to bookmarks. + ZoomIn, ///< Zoom in. + ZoomOut, ///< Zoom out. + FullScreen, ///< Full Screen mode. + ShowMenubar, ///< Show Menu Bar. // Tabular navigation - TabNext, TabPrev, + TabNext, ///< Next Tab. + TabPrev, ///< Previous Tab. // Help menu - Help, WhatsThis, + Help, ///< Help the user in the current situation. + WhatsThis, ///< What's This button. // Text completion - TextCompletion, PrevCompletion, NextCompletion, SubstringCompletion, - - RotateUp, RotateDown, - - OpenRecent, - SaveAs, - Revert, - PrintPreview, - Mail, - Clear, - ActualSize, - FitToPage, - FitToWidth, - FitToHeight, - Zoom, - Goto, - GotoPage, - DocumentBack, - DocumentForward, - EditBookmarks, - Spelling, - ShowToolbar, - ShowStatusbar, - SaveOptions, - KeyBindings, - Preferences, - ConfigureToolbars, - ConfigureNotifications, - TipofDay, - ReportBug, - SwitchApplicationLanguage, - AboutApp, - AboutKDE, - - DeleteFile, // @since 5.25 - RenameFile, // @since 5.25 - MoveToTrash, // @since 5.25 - - Donate, // @since 5.26 + TextCompletion, ///< Complete text in input widgets. + PrevCompletion, ///< Iterate through a list when completion returns multiple items. + NextCompletion, ///< Iterate through a list when completion returns multiple items. + SubstringCompletion, ///< Find a string within another string or list of strings. + RotateUp, ///< Help users iterate through a list of entries. + RotateDown, ///< Help users iterate through a list of entries. + OpenRecent, ///< Open a recently used document. + SaveAs, ///< Save the current document under a different name. + Revert, ///< Revert the current document to the last saved version. + PrintPreview, ///< Show a print preview of the current document. + Mail, ///< Send the current document by mail. + Clear, ///< Clear the content of the focus widget. + ActualSize, ///< View the document at its actual size. + FitToPage, ///< Fit the document view to the size of the current window. + FitToWidth, ///< Fit the document view to the width of the current window. + FitToHeight, ///< Fit the document view to the height of the current window. + Zoom, ///< Select the current zoom level. + Goto, ///< Jump to some specific location in the document. + GotoPage, ///< Go to a specific page. + DocumentBack, ///< Move back (document style menu). + DocumentForward, ///< Move forward (document style menu). + EditBookmarks, ///< Edit the application bookmarks. + Spelling, ///< Pop up the spell checker. + ShowToolbar, ///< Show/Hide the toolbar. + ShowStatusbar, ///< Show/Hide the statusbar. + SaveOptions, ///< @deprecated since 5.39 + KeyBindings, ///< Display the configure key bindings dialog. + Preferences, ///< Display the preferences/options dialog. + ConfigureToolbars, ///< Display the toolbar configuration dialog. + ConfigureNotifications, ///< Display the notifications configuration dialog. + TipofDay, ///< Display the "Tip of the Day". + ReportBug, ///< Display the Report Bug dialog. + SwitchApplicationLanguage, ///< Display the Switch Application Language dialog. + AboutApp, ///< Display the application's About dialog. + AboutKDE, ///< Display the About KDE dialog. + DeleteFile, ///< Permanently delete files or folders. @since 5.25 + RenameFile, ///< Rename files or folders. @since 5.25 + MoveToTrash, ///< Move files or folders to the trash. @since 5.25 + Donate, ///< Open donation page on kde.org. @since 5.26 // Insert new items here! StandardShortcutCount // number of standard shortcuts @@ -229,7 +258,7 @@ KCONFIGGUI_EXPORT const QList<QKeySequence> &undo(); /** - * Redo. Default: Shift-Ctrl-z + * Redo last operation. Default: Shift-Ctrl-z * @return the shortcut of the standard accelerator */ KCONFIGGUI_EXPORT const QList<QKeySequence> &redo(); @@ -277,19 +306,19 @@ KCONFIGGUI_EXPORT const QList<QKeySequence> &deleteWordForward(); /** - * Find, search. Default: Ctrl-f + * Initiate a 'find' request in the current document. Default: Ctrl-f * @return the shortcut of the standard accelerator */ KCONFIGGUI_EXPORT const QList<QKeySequence> &find(); /** - * Find/search next. Default: F3 + * Find the next instance of a stored 'find' Default: F3 * @return the shortcut of the standard accelerator */ KCONFIGGUI_EXPORT const QList<QKeySequence> &findNext(); /** - * Find/search previous. Default: Shift-F3 + * Find a previous instance of a stored 'find'. Default: Shift-F3 * @return the shortcut of the standard accelerator */ KCONFIGGUI_EXPORT const QList<QKeySequence> &findPrev(); @@ -313,31 +342,31 @@ KCONFIGGUI_EXPORT const QList<QKeySequence> &zoomOut(); /** - * Goto home page. Default: Alt-Home + * Go to home page. Default: Alt-Home * @return the shortcut of the standard accelerator */ KCONFIGGUI_EXPORT const QList<QKeySequence> &home(); /** - * Goto beginning of the document. Default: Ctrl-Home + * Go to beginning of the document. Default: Ctrl-Home * @return the shortcut of the standard accelerator */ KCONFIGGUI_EXPORT const QList<QKeySequence> &begin(); /** - * Goto end of the document. Default: Ctrl-End + * Go to end of the document. Default: Ctrl-End * @return the shortcut of the standard accelerator */ KCONFIGGUI_EXPORT const QList<QKeySequence> &end(); /** - * Goto beginning of current line. Default: Home + * Go to beginning of current line. Default: Home * @return the shortcut of the standard accelerator */ KCONFIGGUI_EXPORT const QList<QKeySequence> &beginningOfLine(); /** - * Goto end of current line. Default: End + * Go to end of current line. Default: End * @return the shortcut of the standard accelerator */ KCONFIGGUI_EXPORT const QList<QKeySequence> &endOfLine(); @@ -478,21 +507,21 @@ KCONFIGGUI_EXPORT const QList<QKeySequence> &showMenubar(); /** - * Delete File. Default: Shift+Delete + * Permanently delete files or folders. Default: Shift+Delete * @return the shortcut of the standard accelerator * @since 5.25 */ KCONFIGGUI_EXPORT const QList<QKeySequence> &deleteFile(); /** - * Rename File. Default: F2 + * Rename files or folders. Default: F2 * @return the shortcut of the standard accelerator * @since 5.25 */ KCONFIGGUI_EXPORT const QList<QKeySequence> &renameFile(); /** - * Move to Trash. Default: Delete + * Moves files or folders to the trash. Default: Delete * @return the shortcut of the standard accelerator * @since 5.25 */ ++++++ kconfig-desktop-translations.patch ++++++ --- /var/tmp/diff_new_pack.nKwwpf/_old 2017-10-27 13:54:18.047988068 +0200 +++ /var/tmp/diff_new_pack.nKwwpf/_new 2017-10-27 13:54:18.051987881 +0200 @@ -1,7 +1,7 @@ -Index: kconfig-5.36.0/src/core/kconfig.cpp +Index: kconfig-5.39.0/src/core/kconfig.cpp =================================================================== ---- kconfig-5.36.0.orig/src/core/kconfig.cpp -+++ kconfig-5.36.0/src/core/kconfig.cpp +--- kconfig-5.39.0.orig/src/core/kconfig.cpp ++++ kconfig-5.39.0/src/core/kconfig.cpp @@ -982,6 +982,19 @@ QByteArray KConfigPrivate::lookupData(co return it->mValue; } @@ -22,10 +22,10 @@ QString KConfigPrivate::lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags, bool *expand) const { -Index: kconfig-5.36.0/src/core/kconfig_p.h +Index: kconfig-5.39.0/src/core/kconfig_p.h =================================================================== ---- kconfig-5.36.0.orig/src/core/kconfig_p.h -+++ kconfig-5.36.0/src/core/kconfig_p.h +--- kconfig-5.39.0.orig/src/core/kconfig_p.h ++++ kconfig-5.39.0/src/core/kconfig_p.h @@ -47,6 +47,7 @@ public: QString lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags, bool *expand) const; @@ -34,10 +34,10 @@ void putData(const QByteArray &group, const char *key, const QByteArray &value, KConfigBase::WriteConfigFlags flags, bool expand = false); -Index: kconfig-5.36.0/src/core/kconfigdata.h +Index: kconfig-5.39.0/src/core/kconfigdata.h =================================================================== ---- kconfig-5.36.0.orig/src/core/kconfigdata.h -+++ kconfig-5.36.0/src/core/kconfigdata.h +--- kconfig-5.39.0.orig/src/core/kconfigdata.h ++++ kconfig-5.39.0/src/core/kconfigdata.h @@ -180,6 +180,19 @@ public: Iterator findExactEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); @@ -58,11 +58,11 @@ Iterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); -Index: kconfig-5.36.0/src/core/kconfiggroup.cpp +Index: kconfig-5.39.0/src/core/kconfiggroup.cpp =================================================================== ---- kconfig-5.36.0.orig/src/core/kconfiggroup.cpp -+++ kconfig-5.36.0/src/core/kconfiggroup.cpp -@@ -1174,6 +1174,18 @@ bool KConfigGroup::hasKey(const char *ke +--- kconfig-5.39.0.orig/src/core/kconfiggroup.cpp ++++ kconfig-5.39.0/src/core/kconfiggroup.cpp +@@ -1200,6 +1200,18 @@ bool KConfigGroup::hasKey(const char *ke return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); } @@ -81,10 +81,10 @@ bool KConfigGroup::hasKey(const QString &key) const { return hasKey(key.toUtf8().constData()); -Index: kconfig-5.36.0/src/core/kconfiggroup.h +Index: kconfig-5.39.0/src/core/kconfiggroup.h =================================================================== ---- kconfig-5.36.0.orig/src/core/kconfiggroup.h -+++ kconfig-5.36.0/src/core/kconfiggroup.h +--- kconfig-5.39.0.orig/src/core/kconfiggroup.h ++++ kconfig-5.39.0/src/core/kconfiggroup.h @@ -623,6 +623,11 @@ public: */ QMap<QString, QString> entryMap() const; @@ -97,10 +97,10 @@ protected: bool hasGroupImpl(const QByteArray &group) const Q_DECL_OVERRIDE; KConfigGroup groupImpl(const QByteArray &b) Q_DECL_OVERRIDE; -Index: kconfig-5.36.0/src/core/kdesktopfile.cpp +Index: kconfig-5.39.0/src/core/kdesktopfile.cpp =================================================================== ---- kconfig-5.36.0.orig/src/core/kdesktopfile.cpp -+++ kconfig-5.36.0/src/core/kdesktopfile.cpp +--- kconfig-5.39.0.orig/src/core/kdesktopfile.cpp ++++ kconfig-5.39.0/src/core/kdesktopfile.cpp @@ -29,6 +29,7 @@ #include <QtCore/QFileInfo> #include <QUrl> @@ -167,10 +167,10 @@ } QString KDesktopFile::readPath() const -Index: kconfig-5.36.0/src/core/kdesktopfile.h +Index: kconfig-5.39.0/src/core/kdesktopfile.h =================================================================== ---- kconfig-5.36.0.orig/src/core/kdesktopfile.h -+++ kconfig-5.36.0/src/core/kdesktopfile.h +--- kconfig-5.39.0.orig/src/core/kdesktopfile.h ++++ kconfig-5.39.0/src/core/kdesktopfile.h @@ -250,6 +250,8 @@ protected: // virtual void virtual_hook( int id, void* data ); private:
