Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2016-05-19 12:06:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2016-04-12 19:12:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kconfig.new/kconfig.changes 2016-05-19 12:06:27.000000000 +0200 @@ -1,0 +2,7 @@ +Sat May 7 18:30:23 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 5.22.0 (boo#980066) + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.22.0.php + +------------------------------------------------------------------- Old: ---- kconfig-5.21.0.tar.xz New: ---- kconfig-5.22.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.r7HrVj/_old 2016-05-19 12:06:28.000000000 +0200 +++ /var/tmp/diff_new_pack.r7HrVj/_new 2016-05-19 12:06:28.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.21 +%define _tar_path 5.22 Name: kconfig -Version: 5.21.0 +Version: 5.22.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kconfig-5.21.0.tar.xz -> kconfig-5.22.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/CMakeLists.txt new/kconfig-5.22.0/CMakeLists.txt --- old/kconfig-5.21.0/CMakeLists.txt 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/CMakeLists.txt 2016-05-07 17:07:22.000000000 +0200 @@ -3,7 +3,7 @@ project(KConfig) include(FeatureSummary) -find_package(ECM 5.21.0 NO_MODULE) +find_package(ECM 5.22.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) @@ -23,7 +23,7 @@ include(ECMMarkNonGuiExecutable) include(ECMPoQmTools) -set(KF5_VERSION "5.21.0") # handled by release scripts +set(KF5_VERSION "5.22.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCONFIG VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kconfig_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp new/kconfig-5.22.0/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp --- old/kconfig-5.21.0/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp 2016-05-07 17:07:22.000000000 +0200 @@ -93,7 +93,7 @@ std::function<void(const QString&)> setter; }; -Q_DECLARE_METATYPE(TestSettersArg); // so that QFETCH works +Q_DECLARE_METATYPE(TestSettersArg) // so that QFETCH works void KConfigCompiler_Test_Signals::testSetters_data() { @@ -151,7 +151,7 @@ QCOMPARE(args[0].value<QString>(), defaultValue); } -Q_DECLARE_METATYPE(KCoreConfigSkeleton*); +Q_DECLARE_METATYPE(KCoreConfigSkeleton*) void KConfigCompiler_Test_Signals::testSetProperty_data() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/af/kconfig5_qt.po new/kconfig-5.22.0/po/af/kconfig5_qt.po --- old/kconfig-5.21.0/po/af/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/af/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -17,7 +17,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ar/kconfig5_qt.po new/kconfig-5.22.0/po/ar/kconfig5_qt.po --- old/kconfig-5.21.0/po/ar/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ar/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -16,7 +16,7 @@ "X-Generator: Lokalize 1.5\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "فضلًا راسل مدير النظام." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ast/kconfig5_qt.po new/kconfig-5.22.0/po/ast/kconfig5_qt.po --- old/kconfig-5.21.0/po/ast/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ast/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "X-Qt-Contexts: true\n" "X-Generator: Lokalize 2.0\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Contauta col to alministrador de sistemes, por favor." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/be/kconfig5_qt.po new/kconfig-5.22.0/po/be/kconfig5_qt.po --- old/kconfig-5.21.0/po/be/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/be/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/be@latin/kconfig5_qt.po new/kconfig-5.22.0/po/be@latin/kconfig5_qt.po --- old/kconfig-5.21.0/po/be@latin/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/be@latin/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -20,7 +20,7 @@ "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/bg/kconfig5_qt.po new/kconfig-5.22.0/po/bg/kconfig5_qt.po --- old/kconfig-5.21.0/po/bg/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/bg/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -2,7 +2,7 @@ # Bulgarian translation of KDE. # This file is licensed under the GPL. # -# $Id: kconfig5_qt.po 1456119 2016-03-29 11:01:17Z scripty $ +# $Id: kconfig5_qt.po 1458661 2016-04-28 09:37:03Z scripty $ # # Zlatko Popov <zlatkopo...@fsa-bg.org>, 2007, 2008. msgid "" @@ -21,7 +21,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/bn/kconfig5_qt.po new/kconfig-5.22.0/po/bn/kconfig5_qt.po --- old/kconfig-5.21.0/po/bn/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/bn/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -16,7 +16,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/bn_IN/kconfig5_qt.po new/kconfig-5.22.0/po/bn_IN/kconfig5_qt.po --- old/kconfig-5.21.0/po/bn_IN/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/bn_IN/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/br/kconfig5_qt.po new/kconfig-5.22.0/po/br/kconfig5_qt.po --- old/kconfig-5.21.0/po/br/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/br/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -15,7 +15,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/bs/kconfig5_qt.po new/kconfig-5.22.0/po/bs/kconfig5_qt.po --- old/kconfig-5.21.0/po/bs/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/bs/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -13,7 +13,7 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Obratite se sistem-administratoru." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ca/kconfig5_qt.po new/kconfig-5.22.0/po/ca/kconfig5_qt.po --- old/kconfig-5.21.0/po/ca/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ca/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -23,7 +23,7 @@ "X-Accelerator-Marker: &\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Si us plau, contacteu amb l'administrador del sistema." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ca@valencia/kconfig5_qt.po new/kconfig-5.22.0/po/ca@valencia/kconfig5_qt.po --- old/kconfig-5.21.0/po/ca@valencia/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ca@valencia/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -23,7 +23,7 @@ "X-Accelerator-Marker: &\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Per favor, contacteu amb l'administrador del sistema." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/cs/kconfig5_qt.po new/kconfig-5.22.0/po/cs/kconfig5_qt.po --- old/kconfig-5.21.0/po/cs/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/cs/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -17,7 +17,7 @@ "X-Source-Language: en_US\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Prosím kontaktujte svého správce systému." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/csb/kconfig5_qt.po new/kconfig-5.22.0/po/csb/kconfig5_qt.po --- old/kconfig-5.21.0/po/csb/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/csb/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "|| n%100>=20) ? 1 : 2)\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/cy/kconfig5_qt.po new/kconfig-5.22.0/po/cy/kconfig5_qt.po --- old/kconfig-5.21.0/po/cy/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/cy/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/da/kconfig5_qt.po new/kconfig-5.22.0/po/da/kconfig5_qt.po --- old/kconfig-5.21.0/po/da/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/da/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -21,7 +21,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Kontakt venligst din systemadministrator." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/de/kconfig5_qt.po new/kconfig-5.22.0/po/de/kconfig5_qt.po --- old/kconfig-5.21.0/po/de/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/de/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "X-Qt-Contexts: true\n" "X-Generator: Lokalize 2.0\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Bitte nehmen Sie Kontakt zu Ihrer Systemverwaltung auf." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/el/kconfig5_qt.po new/kconfig-5.22.0/po/el/kconfig5_qt.po --- old/kconfig-5.21.0/po/el/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/el/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -21,7 +21,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Παρακαλώ επικοινωνήστε με τον διαχειριστή του συστήματός σας." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/en_GB/kconfig5_qt.po new/kconfig-5.22.0/po/en_GB/kconfig5_qt.po --- old/kconfig-5.21.0/po/en_GB/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/en_GB/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -20,7 +20,7 @@ "X-Generator: Lokalize 1.5\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Please contact your system administrator." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/eo/kconfig5_qt.po new/kconfig-5.22.0/po/eo/kconfig5_qt.po --- old/kconfig-5.21.0/po/eo/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/eo/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "X-Poedit-Language: Esperanto\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/es/kconfig5_qt.po new/kconfig-5.22.0/po/es/kconfig5_qt.po --- old/kconfig-5.21.0/po/es/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/es/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -23,7 +23,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Póngase en contacto con el administrador de su sistema." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/et/kconfig5_qt.po new/kconfig-5.22.0/po/et/kconfig5_qt.po --- old/kconfig-5.21.0/po/et/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/et/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/eu/kconfig5_qt.po new/kconfig-5.22.0/po/eu/kconfig5_qt.po --- old/kconfig-5.21.0/po/eu/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/eu/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -21,7 +21,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/fa/kconfig5_qt.po new/kconfig-5.22.0/po/fa/kconfig5_qt.po --- old/kconfig-5.21.0/po/fa/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/fa/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/fi/kconfig5_qt.po new/kconfig-5.22.0/po/fi/kconfig5_qt.po --- old/kconfig-5.21.0/po/fi/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/fi/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -15,7 +15,7 @@ "X-Generator: Lokalize 2.0\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Ota yhteyttä järjestelmän ylläpitäjääsi." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/fr/kconfig5_qt.po new/kconfig-5.22.0/po/fr/kconfig5_qt.po --- old/kconfig-5.21.0/po/fr/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/fr/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -29,7 +29,7 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Veuillez contacter l'administrateur du système." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/fy/kconfig5_qt.po new/kconfig-5.22.0/po/fy/kconfig5_qt.po --- old/kconfig-5.21.0/po/fy/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/fy/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -17,7 +17,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ga/kconfig5_qt.po new/kconfig-5.22.0/po/ga/kconfig5_qt.po --- old/kconfig-5.21.0/po/ga/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ga/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "3 : 4\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/gd/kconfig5_qt.po new/kconfig-5.22.0/po/gd/kconfig5_qt.po --- old/kconfig-5.21.0/po/gd/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/gd/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -15,7 +15,7 @@ "X-Generator: Poedit 1.8.4\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Cuir fios gu rianaire an t-siostaim agad." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/gl/kconfig5_qt.po new/kconfig-5.22.0/po/gl/kconfig5_qt.po --- old/kconfig-5.21.0/po/gl/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/gl/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -26,7 +26,7 @@ "X-Text-Markup: kde4\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Por favor, contacte co administrador do sistema." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/gu/kconfig5_qt.po new/kconfig-5.22.0/po/gu/kconfig5_qt.po --- old/kconfig-5.21.0/po/gu/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/gu/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/he/kconfig5_qt.po new/kconfig-5.22.0/po/he/kconfig5_qt.po --- old/kconfig-5.21.0/po/he/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/he/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -21,7 +21,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/hi/kconfig5_qt.po new/kconfig-5.22.0/po/hi/kconfig5_qt.po --- old/kconfig-5.21.0/po/hi/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/hi/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -20,7 +20,7 @@ "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/hne/kconfig5_qt.po new/kconfig-5.22.0/po/hne/kconfig5_qt.po --- old/kconfig-5.21.0/po/hne/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/hne/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -20,7 +20,7 @@ "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/hr/kconfig5_qt.po new/kconfig-5.22.0/po/hr/kconfig5_qt.po --- old/kconfig-5.21.0/po/hr/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/hr/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -21,7 +21,7 @@ "X-Text-Markup: kde4\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/hsb/kconfig5_qt.po new/kconfig-5.22.0/po/hsb/kconfig5_qt.po --- old/kconfig-5.21.0/po/hsb/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/hsb/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "%100==4 ? 2 : 3;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/hu/kconfig5_qt.po new/kconfig-5.22.0/po/hu/kconfig5_qt.po --- old/kconfig-5.21.0/po/hu/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/hu/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "X-Generator: Lokalize 1.5\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Lépjen kapcsolatba a rendszergazdával." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ia/kconfig5_qt.po new/kconfig-5.22.0/po/ia/kconfig5_qt.po --- old/kconfig-5.21.0/po/ia/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ia/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Pro favor, tu continge tu administrator de systema" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/id/kconfig5_qt.po new/kconfig-5.22.0/po/id/kconfig5_qt.po --- old/kconfig-5.21.0/po/id/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/id/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -21,7 +21,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Silakan kontak administrator sistem anda." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/is/kconfig5_qt.po new/kconfig-5.22.0/po/is/kconfig5_qt.po --- old/kconfig-5.21.0/po/is/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/is/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "X-Generator: KBabel 1.11.4\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/it/kconfig5_qt.po new/kconfig-5.22.0/po/it/kconfig5_qt.po --- old/kconfig-5.21.0/po/it/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/it/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -21,7 +21,7 @@ "X-Generator: Lokalize 2.0\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Contatta il tuo amministratore di sistema." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ja/kconfig5_qt.po new/kconfig-5.22.0/po/ja/kconfig5_qt.po --- old/kconfig-5.21.0/po/ja/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ja/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -15,7 +15,7 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/kk/kconfig5_qt.po new/kconfig-5.22.0/po/kk/kconfig5_qt.po --- old/kconfig-5.21.0/po/kk/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/kk/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -17,7 +17,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/km/kconfig5_qt.po new/kconfig-5.22.0/po/km/kconfig5_qt.po --- old/kconfig-5.21.0/po/km/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/km/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "X-Generator: KBabel 1.11.4\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/kn/kconfig5_qt.po new/kconfig-5.22.0/po/kn/kconfig5_qt.po --- old/kconfig-5.21.0/po/kn/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/kn/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ko/kconfig5_qt.po new/kconfig-5.22.0/po/ko/kconfig5_qt.po --- old/kconfig-5.21.0/po/ko/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ko/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "X-Generator: Lokalize 2.0\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "시스템 관리자에게 연락하십시오." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ku/kconfig5_qt.po new/kconfig-5.22.0/po/ku/kconfig5_qt.po --- old/kconfig-5.21.0/po/ku/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ku/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -21,7 +21,7 @@ "X-Poedit-SourceCharset: utf8\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/lb/kconfig5_qt.po new/kconfig-5.22.0/po/lb/kconfig5_qt.po --- old/kconfig-5.21.0/po/lb/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/lb/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -16,7 +16,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/lt/kconfig5_qt.po new/kconfig-5.22.0/po/lt/kconfig5_qt.po --- old/kconfig-5.21.0/po/lt/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/lt/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "X-Qt-Contexts: true\n" "X-Generator: Lokalize 1.5\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Prašome susisiekti su sistemos administratoriumi." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/lv/kconfig5_qt.po new/kconfig-5.22.0/po/lv/kconfig5_qt.po --- old/kconfig-5.21.0/po/lv/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/lv/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -21,7 +21,7 @@ "2);\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/mai/kconfig5_qt.po new/kconfig-5.22.0/po/mai/kconfig5_qt.po --- old/kconfig-5.21.0/po/mai/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/mai/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/mk/kconfig5_qt.po new/kconfig-5.22.0/po/mk/kconfig5_qt.po --- old/kconfig-5.21.0/po/mk/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/mk/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "2;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ml/kconfig5_qt.po new/kconfig-5.22.0/po/ml/kconfig5_qt.po --- old/kconfig-5.21.0/po/ml/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ml/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -21,7 +21,7 @@ "X-Generator: Lokalize 0.3\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/mr/kconfig5_qt.po new/kconfig-5.22.0/po/mr/kconfig5_qt.po --- old/kconfig-5.21.0/po/mr/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/mr/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -20,7 +20,7 @@ "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ms/kconfig5_qt.po new/kconfig-5.22.0/po/ms/kconfig5_qt.po --- old/kconfig-5.21.0/po/ms/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ms/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=2; plural=1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/nb/kconfig5_qt.po new/kconfig-5.22.0/po/nb/kconfig5_qt.po --- old/kconfig-5.21.0/po/nb/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/nb/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -22,7 +22,7 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:909 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Kontakt systemadministratoren din." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/nds/kconfig5_qt.po new/kconfig-5.22.0/po/nds/kconfig5_qt.po --- old/kconfig-5.21.0/po/nds/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/nds/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -15,7 +15,7 @@ "X-Generator: Lokalize 1.5\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Snack bitte Dien Systeempleger an." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ne/kconfig5_qt.po new/kconfig-5.22.0/po/ne/kconfig5_qt.po --- old/kconfig-5.21.0/po/ne/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ne/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "X-Generator: KBabel 1.11.4\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/nl/kconfig5_qt.po new/kconfig-5.22.0/po/nl/kconfig5_qt.po --- old/kconfig-5.21.0/po/nl/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/nl/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -13,7 +13,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Neem contact op met uw systeembeheerder." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/nn/kconfig5_qt.po new/kconfig-5.22.0/po/nn/kconfig5_qt.po --- old/kconfig-5.21.0/po/nn/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/nn/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -22,7 +22,7 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:909 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Ta kontakt med systemansvarleg." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/or/kconfig5_qt.po new/kconfig-5.22.0/po/or/kconfig5_qt.po --- old/kconfig-5.21.0/po/or/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/or/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/pa/kconfig5_qt.po new/kconfig-5.22.0/po/pa/kconfig5_qt.po --- old/kconfig-5.21.0/po/pa/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/pa/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "ਆਪਣੇ ਸਿਸਟਮ ਐਡਮਿਨਸਟੇਟਰ ਨਾਲ ਸੰਪਰਕ ਕਰੋ ਜੀ।" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/pl/kconfig5_qt.po new/kconfig-5.22.0/po/pl/kconfig5_qt.po --- old/kconfig-5.21.0/po/pl/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/pl/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -20,7 +20,7 @@ "|| n%100>=20) ? 1 : 2);\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Proszę skontaktować się z administratorem systemu." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/pt/kconfig5_qt.po new/kconfig-5.22.0/po/pt/kconfig5_qt.po --- old/kconfig-5.21.0/po/pt/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/pt/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -15,7 +15,7 @@ "X-POFile-SpellExtra: kreadconfig Hat Red Inc\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Contacte por favor o seu administrador do sistema." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/pt_BR/kconfig5_qt.po new/kconfig-5.22.0/po/pt_BR/kconfig5_qt.po --- old/kconfig-5.21.0/po/pt_BR/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/pt_BR/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -23,7 +23,7 @@ "X-Generator: Lokalize 1.5\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Por favor, contate o administrador do seu sistema." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ro/kconfig5_qt.po new/kconfig-5.22.0/po/ro/kconfig5_qt.po --- old/kconfig-5.21.0/po/ro/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ro/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -23,7 +23,7 @@ "20)) ? 1 : 2;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ru/kconfig5_qt.po new/kconfig-5.22.0/po/ru/kconfig5_qt.po --- old/kconfig-5.21.0/po/ru/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ru/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -24,7 +24,7 @@ "X-Text-Markup: kde4\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Обратитесь к системному администратору." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/se/kconfig5_qt.po new/kconfig-5.22.0/po/se/kconfig5_qt.po --- old/kconfig-5.21.0/po/se/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/se/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -20,7 +20,7 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:909 +#: core/kconfig.cpp:917 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/si/kconfig5_qt.po new/kconfig-5.22.0/po/si/kconfig5_qt.po --- old/kconfig-5.21.0/po/si/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/si/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/sk/kconfig5_qt.po new/kconfig-5.22.0/po/sk/kconfig5_qt.po --- old/kconfig-5.21.0/po/sk/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/sk/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -17,7 +17,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Prosím, kontaktujte svojho správcu systému." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/sl/kconfig5_qt.po new/kconfig-5.22.0/po/sl/kconfig5_qt.po --- old/kconfig-5.21.0/po/sl/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/sl/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -22,7 +22,7 @@ "%100==4 ? 3 : 0);\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Obvestite vašega sistemskega skrbnika." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/sq/kconfig5_qt.po new/kconfig-5.22.0/po/sq/kconfig5_qt.po --- old/kconfig-5.21.0/po/sq/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/sq/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -20,7 +20,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/sr/kconfig5_qt.po new/kconfig-5.22.0/po/sr/kconfig5_qt.po --- old/kconfig-5.21.0/po/sr/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/sr/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "X-Qt-Contexts: true\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Обратите се систем-администратору." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/sr@ijekavian/kconfig5_qt.po new/kconfig-5.22.0/po/sr@ijekavian/kconfig5_qt.po --- old/kconfig-5.21.0/po/sr@ijekavian/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/sr@ijekavian/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "X-Qt-Contexts: true\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Обратите се систем-администратору." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/sr@ijekavianlatin/kconfig5_qt.po new/kconfig-5.22.0/po/sr@ijekavianlatin/kconfig5_qt.po --- old/kconfig-5.21.0/po/sr@ijekavianlatin/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/sr@ijekavianlatin/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "X-Qt-Contexts: true\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Obratite se sistem-administratoru." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/sr@latin/kconfig5_qt.po new/kconfig-5.22.0/po/sr@latin/kconfig5_qt.po --- old/kconfig-5.21.0/po/sr@latin/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/sr@latin/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "X-Qt-Contexts: true\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Obratite se sistem-administratoru." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/sv/kconfig5_qt.po new/kconfig-5.22.0/po/sv/kconfig5_qt.po --- old/kconfig-5.21.0/po/sv/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/sv/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -20,7 +20,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Kontakta systemadministratören." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ta/kconfig5_qt.po new/kconfig-5.22.0/po/ta/kconfig5_qt.po --- old/kconfig-5.21.0/po/ta/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ta/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/te/kconfig5_qt.po new/kconfig-5.22.0/po/te/kconfig5_qt.po --- old/kconfig-5.21.0/po/te/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/te/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -20,7 +20,7 @@ "4;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/tg/kconfig5_qt.po new/kconfig-5.22.0/po/tg/kconfig5_qt.po --- old/kconfig-5.21.0/po/tg/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/tg/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/th/kconfig5_qt.po new/kconfig-5.22.0/po/th/kconfig5_qt.po --- old/kconfig-5.21.0/po/th/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/th/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -20,7 +20,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/tr/kconfig5_qt.po new/kconfig-5.22.0/po/tr/kconfig5_qt.po --- old/kconfig-5.21.0/po/tr/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/tr/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -22,7 +22,7 @@ "X-Generator: Lokalize 1.4\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Lütfen sistem yöneticinize başvurun." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/ug/kconfig5_qt.po new/kconfig-5.22.0/po/ug/kconfig5_qt.po --- old/kconfig-5.21.0/po/ug/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/ug/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/uk/kconfig5_qt.po new/kconfig-5.22.0/po/uk/kconfig5_qt.po --- old/kconfig-5.21.0/po/uk/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/uk/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "Будь ласка, зверніться до системного адміністратора." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/uz/kconfig5_qt.po new/kconfig-5.22.0/po/uz/kconfig5_qt.po --- old/kconfig-5.21.0/po/uz/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/uz/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/uz@cyrillic/kconfig5_qt.po new/kconfig-5.22.0/po/uz@cyrillic/kconfig5_qt.po --- old/kconfig-5.21.0/po/uz@cyrillic/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/uz@cyrillic/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/vi/kconfig5_qt.po new/kconfig-5.22.0/po/vi/kconfig5_qt.po --- old/kconfig-5.21.0/po/vi/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/vi/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/wa/kconfig5_qt.po new/kconfig-5.22.0/po/wa/kconfig5_qt.po --- old/kconfig-5.21.0/po/wa/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/wa/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/xh/kconfig5_qt.po new/kconfig-5.22.0/po/xh/kconfig5_qt.po --- old/kconfig-5.21.0/po/xh/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/xh/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -20,7 +20,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/zh_CN/kconfig5_qt.po new/kconfig-5.22.0/po/zh_CN/kconfig5_qt.po --- old/kconfig-5.21.0/po/zh_CN/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/zh_CN/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -19,7 +19,7 @@ "X-Generator: Lokalize 2.0\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "请联系您的系统管理员。" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/po/zh_TW/kconfig5_qt.po new/kconfig-5.22.0/po/zh_TW/kconfig5_qt.po --- old/kconfig-5.21.0/po/zh_TW/kconfig5_qt.po 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/po/zh_TW/kconfig5_qt.po 2016-05-07 17:07:22.000000000 +0200 @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Qt-Contexts: true\n" -#: core/kconfig.cpp:917 +#: core/kconfig.cpp:911 msgctxt "KConfig|" msgid "Please contact your system administrator." msgstr "請聯絡您的系統管理者。" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/src/core/kconfig.cpp new/kconfig-5.22.0/src/core/kconfig.cpp --- old/kconfig-5.21.0/src/core/kconfig.cpp 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/src/core/kconfig.cpp 2016-05-07 17:07:22.000000000 +0200 @@ -58,6 +58,13 @@ Q_GLOBAL_STATIC(QStringList, s_globalFiles) // For caching purposes. static QBasicMutex s_globalFilesMutex; +Q_GLOBAL_STATIC_WITH_ARGS(QString, sGlobalFileName, (QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1String("/kdeglobals"))) + +#ifndef Q_OS_WIN +static const Qt::CaseSensitivity sPathCaseSensitivity = Qt::CaseSensitive; +#else +static const Qt::CaseSensitivity sPathCaseSensitivity = Qt::CaseInsensitive; +#endif KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags, QStandardPaths::StandardLocation resourceType) @@ -66,8 +73,6 @@ bFileImmutable(false), bForceGlobal(false), bSuppressGlobal(false), configState(KConfigBase::NoAccess) { - sGlobalFileName = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1String("/kdeglobals"); - static QBasicAtomicInt use_etc_kderc = Q_BASIC_ATOMIC_INITIALIZER(-1); if (use_etc_kderc.load() < 0) { use_etc_kderc.store( !qEnvironmentVariableIsSet("KDE_SKIP_KDERC")); // for unit tests @@ -450,7 +455,7 @@ d->bDirty = false; // will revert to true if a config write fails if (d->wantGlobals() && writeGlobals) { - QExplicitlySharedDataPointer<KConfigBackend> tmp = KConfigBackend::create(d->sGlobalFileName); + QExplicitlySharedDataPointer<KConfigBackend> tmp = KConfigBackend::create(*sGlobalFileName); if (d->configState == ReadWrite && !tmp->lock()) { qWarning() << "couldn't lock global file"; @@ -592,7 +597,7 @@ } else if (wantGlobals()) { // accessing "kdeglobals" by specifying no filename and NoCascade - XXX used anywhere? resourceType = QStandardPaths::GenericConfigLocation; fileName = QStringLiteral("kdeglobals"); - file = sGlobalFileName; + file = *sGlobalFileName; } else { // anonymous config openFlags = KConfig::SimpleConfig; @@ -610,11 +615,7 @@ Q_ASSERT(!file.isEmpty()); -#ifndef Q_OS_WIN - bSuppressGlobal = (file == sGlobalFileName); -#else - bSuppressGlobal = (file.compare(sGlobalFileName, Qt::CaseInsensitive) == 0); -#endif + bSuppressGlobal = (file.compare(*sGlobalFileName, sPathCaseSensitivity) == 0); if (bDynamicBackend || !mBackend) { // allow dynamic changing of backend mBackend = KConfigBackend::create(file); @@ -689,11 +690,8 @@ const QByteArray utf8Locale = locale.toUtf8(); Q_FOREACH (const QString &file, globalFiles) { KConfigBackend::ParseOptions parseOpts = KConfigBackend::ParseGlobal | KConfigBackend::ParseExpansions; -#ifndef Q_OS_WIN - if (file != sGlobalFileName) -#else - if (file.compare(sGlobalFileName, Qt::CaseInsensitive) != 0) -#endif + + if (file.compare(*sGlobalFileName, sPathCaseSensitivity) != 0) parseOpts |= KConfigBackend::ParseDefaults; QExplicitlySharedDataPointer<KConfigBackend> backend = KConfigBackend::create(file); @@ -740,11 +738,7 @@ const QByteArray utf8Locale = locale.toUtf8(); foreach (const QString &file, files) { -#ifndef Q_OS_WIN - if (file == mBackend->filePath()) { -#else - if (file.compare(mBackend->filePath(), Qt::CaseInsensitive) == 0) { -#endif + if (file.compare(mBackend->filePath(), sPathCaseSensitivity) == 0) { switch (mBackend->parseConfig(utf8Locale, entryMap, KConfigBackend::ParseExpansions)) { case KConfigBackend::ParseOk: break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/src/core/kconfig_p.h new/kconfig-5.22.0/src/core/kconfig_p.h --- old/kconfig-5.21.0/src/core/kconfig_p.h 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/src/core/kconfig_p.h 2016-05-07 17:07:22.000000000 +0200 @@ -80,7 +80,6 @@ bool bForceGlobal: 1; bool bSuppressGlobal: 1; - QString sGlobalFileName; static bool mappingsRegistered; KEntryMap entryMap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/src/core/kconfigbackend.cpp new/kconfig-5.22.0/src/core/kconfigbackend.cpp --- old/kconfig-5.21.0/src/core/kconfigbackend.cpp 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/src/core/kconfigbackend.cpp 2016-05-07 17:07:22.000000000 +0200 @@ -55,10 +55,10 @@ BackendPtr KConfigBackend::create(const QString &file, const QString &sys) { //qDebug() << "creating a backend for file" << file << "with system" << sys; - const QString system = (sys.isEmpty() ? KConfigBackendPrivate::whatSystem(file) : sys); KConfigBackend *backend = Q_NULLPTR; #if 0 // TODO port to Qt5 plugin loading + const QString system = (sys.isEmpty() ? KConfigBackendPrivate::whatSystem(file) : sys); if (system.compare(QLatin1String("INI"), Qt::CaseInsensitive) != 0) { const QString constraint = QString::fromLatin1("[X-KDE-PluginInfo-Name] ~~ '%1'").arg(system); KService::List offers = KServiceTypeTrader::self()->query(QLatin1String("KConfigBackend"), constraint); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.21.0/src/core/ksharedconfig.cpp new/kconfig-5.22.0/src/core/ksharedconfig.cpp --- old/kconfig-5.21.0/src/core/ksharedconfig.cpp 2016-04-03 22:46:30.000000000 +0200 +++ new/kconfig-5.22.0/src/core/ksharedconfig.cpp 2016-05-07 17:07:22.000000000 +0200 @@ -60,7 +60,7 @@ s_storage.setLocalData(new T); } return s_storage.localData(); -}; +} // Q_GLOBAL_STATIC(GlobalSharedConfigList, globalSharedConfigList), but per thread: static GlobalSharedConfigList *globalSharedConfigList() { return perThreadGlobalStatic<GlobalSharedConfigList>(); }
