Hello community, here is the log from the commit of package kxmlgui for openSUSE:Factory checked in at 2019-03-21 09:48:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kxmlgui (Old) and /work/SRC/openSUSE:Factory/.kxmlgui.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kxmlgui" Thu Mar 21 09:48:58 2019 rev:67 rq:686774 version:5.56.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kxmlgui/kxmlgui.changes 2019-02-28 21:32:45.445746735 +0100 +++ /work/SRC/openSUSE:Factory/.kxmlgui.new.28833/kxmlgui.changes 2019-03-21 09:49:01.754858153 +0100 @@ -1,0 +2,14 @@ +Sun Mar 10 20:15:37 UTC 2019 - [email protected] + +- Update to 5.56.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.56.0.php +- Changes since 5.55.0: + * Windows: fix the fix for... etc. Can't use a switch here. + * Fix the fix for Windows compilation + * Fix compile on windows + * [kxmlgui] remove deprecated method + * Port deprecated methods + +------------------------------------------------------------------- Old: ---- kxmlgui-5.55.0.tar.xz New: ---- kxmlgui-5.56.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kxmlgui.spec ++++++ --- /var/tmp/diff_new_pack.qHJBLh/_old 2019-03-21 09:49:02.534857942 +0100 +++ /var/tmp/diff_new_pack.qHJBLh/_new 2019-03-21 09:49:02.538857941 +0100 @@ -17,14 +17,14 @@ %define lname libKF5XmlGui5 -%define _tar_path 5.55 +%define _tar_path 5.56 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kxmlgui -Version: 5.55.0 +Version: 5.56.0 Release: 0 Summary: Framework for managing menu and toolbar actions License: LGPL-2.1-or-later AND GPL-2.0-or-later ++++++ kxmlgui-5.55.0.tar.xz -> kxmlgui-5.56.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/CMakeLists.txt new/kxmlgui-5.56.0/CMakeLists.txt --- old/kxmlgui-5.55.0/CMakeLists.txt 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/CMakeLists.txt 2019-03-02 14:50:23.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.55.0") # handled by release scripts -set(KF5_DEP_VERSION "5.55.0") # handled by release scripts +set(KF5_VERSION "5.56.0") # handled by release scripts +set(KF5_DEP_VERSION "5.56.0") # handled by release scripts project(KXmlGui VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.55.0 NO_MODULE) +find_package(ECM 5.56.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) @@ -62,7 +62,7 @@ find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED) endif() set (HAVE_GLOBALACCEL ${KF5GlobalAccel_FOUND}) - +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050c00) # Subdirectories add_definitions(-DTRANSLATION_DOMAIN=\"kxmlgui5\") if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/autotests/kmainwindow_unittest.cpp new/kxmlgui-5.56.0/autotests/kmainwindow_unittest.cpp --- old/kxmlgui-5.55.0/autotests/kmainwindow_unittest.cpp 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/autotests/kmainwindow_unittest.cpp 2019-03-02 14:50:23.000000000 +0100 @@ -32,7 +32,7 @@ void KMainWindow_UnitTest::initTestCase() { - QStandardPaths::enableTestMode(true); + QStandardPaths::setTestModeEnabled(true); QFile::remove(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + QLatin1Char('/') + KSharedConfig::openConfig()->name()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/autotests/ktoolbar_unittest.cpp new/kxmlgui-5.56.0/autotests/ktoolbar_unittest.cpp --- old/kxmlgui-5.55.0/autotests/ktoolbar_unittest.cpp 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/autotests/ktoolbar_unittest.cpp 2019-03-02 14:50:23.000000000 +0100 @@ -43,7 +43,7 @@ Q_DECLARE_METATYPE(Qt::KeyboardModifiers) // Ensure everything uses test paths, including stuff run before main, such as the KdePlatformThemePlugin -void enableTestMode() { QStandardPaths::enableTestMode(true); } +void enableTestMode() { QStandardPaths::setTestModeEnabled(true); } Q_CONSTRUCTOR_FUNCTION(enableTestMode) class tst_KToolBar : public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/autotests/kxmlgui_unittest.cpp new/kxmlgui-5.56.0/autotests/kxmlgui_unittest.cpp --- old/kxmlgui-5.55.0/autotests/kxmlgui_unittest.cpp 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/autotests/kxmlgui_unittest.cpp 2019-03-02 14:50:23.000000000 +0100 @@ -109,7 +109,7 @@ void KXmlGui_UnitTest::initTestCase() { - QStandardPaths::enableTestMode(true); + QStandardPaths::setTestModeEnabled(true); // Leftover configuration breaks testAutoSaveSettings const QString configFile = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, KSharedConfig::openConfig()->name()); if (!configFile.isEmpty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/po/da/kxmlgui5.po new/kxmlgui-5.56.0/po/da/kxmlgui5.po --- old/kxmlgui-5.55.0/po/da/kxmlgui5.po 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/po/da/kxmlgui5.po 2019-03-02 14:50:23.000000000 +0100 @@ -2,8 +2,6 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Martin Schlander, 2008. -# Martin Schlander <[email protected]>, 2008. # Martin Schlander <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017. # Keld Simonsen <[email protected]>, 2010. msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/po/gl/kxmlgui5.po new/kxmlgui-5.56.0/po/gl/kxmlgui5.po --- old/kxmlgui-5.55.0/po/gl/kxmlgui5.po 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/po/gl/kxmlgui5.po 2019-03-02 14:50:23.000000000 +0100 @@ -16,7 +16,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2019-01-26 03:04+0100\n" -"PO-Revision-Date: 2019-01-01 15:32+0100\n" +"PO-Revision-Date: 2019-03-02 12:37+0100\n" "Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" "Language: gl\n" @@ -24,7 +24,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.2\n" "X-Environment: kde, development\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -75,7 +75,7 @@ #: kaboutapplicationdialog.cpp:192 #, kde-format msgid "Please report bugs to <a href=\"%1\">%2</a>.\n" -msgstr "Informe de fallos a <a href=\"%1\">%2</a>.\n" +msgstr "Informe dos fallo a <a href=\"%1\">%2</a>.\n" #: kaboutapplicationdialog.cpp:218 #, kde-format @@ -482,10 +482,10 @@ "where you will find a form to fill in. The information displayed above will " "be transferred to that server.</qt>" msgstr "" -"<qt>Para enviar un informe do fallo, prema a ligazón de baixo. Isto abrirá " -"unha xanela do navegador web en <a href=\"https://bugs.kde.org\";>https://"; -"bugs.kde.org</a> na que poderá atopar un formulario para preencher. A " -"información mostrada enriba transferirase a ese servidor.</qt>" +"<qt>Para enviar un informe do fallo prema o seguinte botón. Isto abrirá unha " +"xanela do navegador web en <a href=\"https://bugs.kde.org\";>https://bugs.kde."; +"org</a> na que poderá atopar un formulario para preencher. A información " +"mostrada enriba transferirase a ese servidor.</qt>" #: kbugreport.cpp:299 #, kde-format @@ -912,9 +912,9 @@ "some applications use.\n" "Do you really want to use it as a global shortcut as well?" msgstr "" -"A combinación de teclas «%1» tamén está asignada á acción estándar «%2», que " -"é usada por algúns aplicativos.\n" -"Seguro que quere empregala tamén como atallo global?" +"A combinación de teclas «%1» tamén se usa para a acción estándar «%2» que " +"usan algúns aplicativos.\n" +"Seguro que quere usala tamén como atallo global?" #: kkeysequencewidget.cpp:668 #, kde-format @@ -1208,7 +1208,7 @@ "The '%1' rocker gesture has already been allocated to the \"%2\" action.\n" "Do you want to reassign it from that action to the current one?" msgstr "" -"O aceno cos botóns «%1» xa se asignou á acción «%2».\n" +"O aceno «%1» xa se asignou á acción «%2».\n" "Quere cambiar a asignación á nova acción?" #: kshortcutseditor.cpp:696 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/po/id/kxmlgui5.po new/kxmlgui-5.56.0/po/id/kxmlgui5.po --- old/kxmlgui-5.55.0/po/id/kxmlgui5.po 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/po/id/kxmlgui5.po 2019-03-02 14:50:23.000000000 +0100 @@ -9,15 +9,15 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2019-01-26 03:04+0100\n" -"PO-Revision-Date: 2019-01-27 10:27+0700\n" -"Last-Translator: Wantoyo <[email protected]>\n" +"PO-Revision-Date: 2019-02-24 11:09+0700\n" +"Last-Translator: wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 18.12.0\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 18.12.1\n" #: kaboutapplicationdialog.cpp:81 khelpmenu.cpp:283 #, kde-format @@ -316,7 +316,7 @@ "from the 'Settings' menu to solve the ambiguity.\n" "No action will be triggered." msgstr "" -"Sekuensi kunci '%1' ambigu. Gunakan 'Konfigurasi Pintasan'\n" +"Sekuensi kunci '%1' ambigu. Gunakan 'Konfigurasikan Pintasan'\n" "dari menu 'Setelan' untuk memecahkan ambiguitas.\n" "Tak ada aksi yang akan dipicu." @@ -335,7 +335,7 @@ msgid "" "Your email address. If incorrect, use the Configure Email button to change it" msgstr "" -"Alamat email anda. Jika salah, gunakan tombol Konfigurasi Email untuk " +"Alamat email anda. Jika salah, gunakan tombol Konfigurasikan Email untuk " "mengubahnya" #: kbugreport.cpp:145 @@ -347,7 +347,7 @@ #: kbugreport.cpp:153 #, kde-format msgid "Configure Email..." -msgstr "Konfigurasi Email..." +msgstr "Konfigurasikan Email..." #: kbugreport.cpp:160 #, kde-format @@ -644,7 +644,7 @@ #: kedittoolbar.cpp:603 #, kde-format msgid "Configure Toolbars" -msgstr "Konfigurasi Bilah Alat" +msgstr "Konfigurasikan Bilah Alat" #: kedittoolbar.cpp:666 #, kde-format @@ -713,7 +713,7 @@ msgid "" "This element will be replaced with all the elements of an embedded component." msgstr "" -"Elemen ini akan diganti dengan semua elemen dari sebuah komponen terbenam." +"Elemen ini akan diganti dengan semua elemen dari sebuah komponen tertanam." #: kedittoolbar.cpp:1223 #, kde-format @@ -801,14 +801,16 @@ msgid "The shortcut '%2' conflicts with the following key combination:\n" msgid_plural "" "The shortcut '%2' conflicts with the following key combinations:\n" -msgstr[0] "Pintasan '%2' konflik dengan kombinasi tombol berikut:\n" +msgstr[0] "Pintasan '%2' bentrok dengan kombinasi tuts berikut ini:\n" +msgstr[1] "Pintasan '%2' bentrok dengan kombinasi tuts berikut ini:\n" #: kkeysequencewidget.cpp:144 #, kde-format msgctxt "%1 is the number of shortcuts with which there is a conflict" msgid "Conflict with Registered Global Shortcut" msgid_plural "Conflict with Registered Global Shortcuts" -msgstr[0] "Konflik dengan Pintasan Global Terdaftar" +msgstr[0] "Bentrok dengan Pintasan Global Terdaftar" +msgstr[1] "Bentrok dengan Pintasan-pintasan Global Terdaftar" #: kkeysequencewidget.cpp:146 kkeysequencewidget.cpp:234 #: kkeysequencewidget.cpp:625 kshortcutseditor.cpp:635 kshortcutseditor.cpp:653 @@ -821,7 +823,8 @@ msgctxt "%1 is the number of conflicts" msgid "Shortcut Conflict" msgid_plural "Shortcut Conflicts" -msgstr[0] "Konflik Pintasan" +msgstr[0] "Bentrok Pintasan" +msgstr[1] "Bentrokan Pintasan" #: kkeysequencewidget.cpp:219 #, kde-format @@ -840,8 +843,12 @@ "Do you want to assign an empty shortcut to these actions?\n" "%3" msgstr[0] "" -"Pintasan \"%2\" ambigu dengan jalan pintas berikut.\n" -"Anda ingin menugaskan jalan pintas kosong untuk aksi ini?\n" +"Pintasan \"%2\" ambigu dengan pintasan berikut.\n" +"Apakah kamu ingin menugaskan sebuah pintasan kosong untuk aksi ini?\n" +"%3" +msgstr[1] "" +"Pintasan \"%2\" ambigu dengan pintasan berikut\n" +"Apakah kamu ingin menugaskan sebuah pintasan kosong untuk aksi tersebut?\n" "%3" #: kkeysequencewidget.cpp:243 @@ -943,7 +950,7 @@ #: kmenumenuhandler_p.cpp:233 #, kde-format msgid "Configure Shortcut..." -msgstr "Konfigurasi Pintasan..." +msgstr "Konfigurasikan Pintasan..." #: ksendbugmail/main.cpp:45 #, kde-format @@ -1106,7 +1113,7 @@ #: kshortcutsdialog.cpp:154 #, kde-format msgid "Configure Shortcuts" -msgstr "Konfigurasi Pintasan" +msgstr "Konfigurasikan Pintasan" #. i18n: ectx: property (whatsThis), widget (KTreeWidgetSearchLineWidget, searchFilter) #: kshortcutsdialog.ui:16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/po/pa/kxmlgui5.po new/kxmlgui-5.56.0/po/pa/kxmlgui5.po --- old/kxmlgui-5.55.0/po/pa/kxmlgui5.po 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/po/pa/kxmlgui5.po 2019-03-02 14:50:23.000000000 +0100 @@ -4,7 +4,7 @@ # # Amanpreet Singh Alam <[email protected]>, 2004. # Amanpreet Singh Alam <[email protected]>, 2004. -# A S Alam <[email protected]>, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012. +# A S Alam <[email protected]>, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2019. # ASB <[email protected]>, 2007. # Amanpreet Singh Alam <[email protected]>, 2008. # Amanpreet Singh <[email protected]>, 2008. @@ -14,14 +14,14 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2019-01-26 03:04+0100\n" -"PO-Revision-Date: 2014-07-08 14:49-0500\n" -"Last-Translator: A S Alam <[email protected]>\n" -"Language-Team: Punjabi/Panjabi <[email protected]>\n" +"PO-Revision-Date: 2019-02-10 11:12-0800\n" +"Last-Translator: A S Alam <[email protected]>\n" +"Language-Team: Punjabi <[email protected]>\n" "Language: pa\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" #: kaboutapplicationdialog.cpp:81 khelpmenu.cpp:283 @@ -251,7 +251,7 @@ "<html>ਸਾਫਟਵੇਅਰ ਹਮੇਸ਼ਾ ਸੁਧਾਰਿਆ ਜਾ ਸਕਦਾ ਹੈ ਤੇ KDE ਟੀਮ ਇਸਤਰਾਂ ਕਰਨ ਲਈ ਹਮੇਸ਼ਾ ਤਿਆਰ ਰਹਿੰਦੀ " "ਹੈ। ਜੇਕਰ ਤੁਸੀਂ - ਯੂਜ਼ਰ - ਸਾਨੂੰ ਇਹ ਦੱਸੋ ਕਿ ਕਦੋਂ ਕੀਤਾ ਕੰਮ ਉਮੀਦ ਮੁਤਾਬਕ ਨਹੀ ਹੈ ਜਾਂ ਵਧੀਆ ਕੀਤਾ ਜਾ " "ਸਕਦਾ ਹੈ।<br /><br /> KDE ਦਾ ਇੱਕ ਬੱਗ ਜਾਂਚ ਸਿਸਟਮ ਹੈ, <a href=\"%1\">%1</a> ਵੇਖੋ ਜਾਂ ਬੱਗ " -"ਜਾਣਕਾਰੀ ਦੇਣ ਲਈ \"ਮੱਦਦ\" ਮੇਨੂ ਵਿੱਚੋਂ \"ਬੱਗ ਜਾਣਕਾਰੀ\" ਡਾਈਲਾਗ ਵਰਤੋਂ।<br /><br />ਜੇਕਰ ਤੁਹਾਡੇ " +"ਜਾਣਕਾਰੀ ਦੇਣ ਲਈ \"ਮਦਦ\" ਮੇਨੂ ਵਿੱਚੋਂ \"ਬੱਗ ਜਾਣਕਾਰੀ\" ਡਾਈਲਾਗ ਵਰਤੋਂ।<br /><br />ਜੇਕਰ ਤੁਹਾਡੇ " "ਕੋਲ ਸੁਧਾਰ ਲਈ ਸੁਝਾਅ ਹਨ, ਤਾਂ ਆਪਣਾ ਸੁਝਾਅ ਰਜਿਸਟਰ ਕਰਵਾਉਣ ਲਈ ਬੱਗ ਜਾਂਚ ਸਿਸਟਮ ਤੇ ਸਵਾਗਤ ਹੈ। ਇਹ " "ਜਾਂਚ ਲਵੋ ਕਿ ਤੁਸੀ ਤੀਬਰਤਾ \"Wishlist\" ਵਰਤਦੇ ਹੋਵੋ।</html>" @@ -291,11 +291,11 @@ "<html>KDE ਅੱਜ ਮੁਫ਼ਤ ਹੈ ਤੇ ਭਲਕੇ ਮੁਫ਼ਤ ਹੀ ਉਪਲੱਬਧ ਰਹੇਗਾ, ਪਰ ਇਸ ਦਾ ਨਿਰਮਾਣ ਮੁਫ਼ਤ ਨਹੀ ਹੈ।<br /" "><br /> KDE ਕਮਿਊਨਟੀ ਦੇ ਵਿਕਾਸ ਲਈ KDE e.V. ਸੰਗਠਨ ਬਣਾਇਆ ਗਿਆ ਹੈ, ਜੋ ਕਿ ਤੂਬੀਇੰਗਨ, ਜਰਮਨੀ " "ਵਿੱਚ ਹੈ, ਜੋ ਕੇਡੀਈ ਕਮਿਊਨਟੀ ਲਈ ਕਾਨੂੰਨੀ ਤੇ ਵਿੱਤੀ ਮਾਮਲਿਆਂ ਲਈ ਅਗਵਾਈ ਕਰਦੀ ਹੈ। KDE e.V. ਬਾਰੇ " -"ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ <a href=\"%1\">%1</a> ਵੇਖੋ।<br /><br /> KDE ਟੀਮ ਨੂੰ ਮਾਲੀ ਮੱਦਦ ਦੀ ਲੋੜ " -"ਹੈ, ਆਮ ਕਰਕੇ ਮੈਂਬਰਾਂ ਲਈ ਤੇ ਹੋਰਾਂ ਲਈ, ਜੋ ਕਿ ਉਹ ਆਪਣਾ ਯੋਗਦਾਨ ਪਾਉਦੇ ਹਨ। ਫੰਡਾਂ ਨੂੰ ਕਾਨੂੰਨੀ ਮੱਦਦ ਤੇ " +"ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ <a href=\"%1\">%1</a> ਵੇਖੋ।<br /><br /> KDE ਟੀਮ ਨੂੰ ਮਾਲੀ ਮਦਦ ਦੀ ਲੋੜ " +"ਹੈ, ਆਮ ਕਰਕੇ ਮੈਂਬਰਾਂ ਲਈ ਤੇ ਹੋਰਾਂ ਲਈ, ਜੋ ਕਿ ਉਹ ਆਪਣਾ ਯੋਗਦਾਨ ਪਾਉਦੇ ਹਨ। ਫੰਡਾਂ ਨੂੰ ਕਾਨੂੰਨੀ ਮਦਦ ਤੇ " "ਕਨਫਰੰਸ ਤੇ ਮੀਟਿੰਗ ਕਰਨ ਵਾਸਤੇ ਸੱਦਣ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ।<br /> <br /> ਅਸੀਂ ਤੁਹਾਨੂੰ ਸਾਡੇ ਜਤਨਾਂ ਨੂੰ " "ਵਿੱਤੀ ਦਾਨ ਦੇ ਕੇ ਸਹਾਇਤਾ ਕਰਨ ਦੀ ਅਪੀਲ ਕਰਦੇ ਹਾਂ, ਜਿਸ ਬਾਰੇ ਜਾਣਕਾਰੀ <a href=\"%2\">%2</" -"a> ਤੇ ਉਪਲੱਬਧ ਹਨ।<br /><br />ਤੁਹਾਡੀ ਮੱਦਦ ਲਈ ਪਹਿਲਾਂ ਹੀ ਧੰਨਵਾਦ।</html>" +"a> ਤੇ ਉਪਲੱਬਧ ਹਨ।<br /><br />ਤੁਹਾਡੀ ਮਦਦ ਲਈ ਪਹਿਲਾਂ ਹੀ ਧੰਨਵਾਦ।</html>" #: kaboutkdedialog_p.cpp:135 #, kde-format @@ -316,7 +316,7 @@ #: kaboutkdedialog_p.cpp:138 #, kde-format msgid "&Support KDE" -msgstr "KDE ਮੱਦਦ(&S)" +msgstr "KDE ਮਦਦ(&S)" #: kactionconflictdetector.cpp:50 #, kde-format @@ -795,7 +795,7 @@ #: khelpmenu.cpp:175 ui_standards.rc:177 #, kde-format msgid "&Help" -msgstr "ਮੱਦਦ(&H)" +msgstr "ਮਦਦ(&H)" #: kkeysequencewidget.cpp:128 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/po/zh_CN/kxmlgui5.po new/kxmlgui-5.56.0/po/zh_CN/kxmlgui5.po --- old/kxmlgui-5.55.0/po/zh_CN/kxmlgui5.po 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/po/zh_CN/kxmlgui5.po 2019-03-02 14:50:23.000000000 +0100 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2019-01-26 03:04+0100\n" -"PO-Revision-Date: 2019-01-27 22:57\n" +"PO-Revision-Date: 2019-02-20 23:16\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/src/kaboutapplicationdialog.cpp new/kxmlgui-5.56.0/src/kaboutapplicationdialog.cpp --- old/kxmlgui-5.55.0/src/kaboutapplicationdialog.cpp 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/src/kaboutapplicationdialog.cpp 2019-03-02 14:50:23.000000000 +0100 @@ -174,7 +174,7 @@ if (authorCount) { QWidget *authorWidget = new QWidget(q); QVBoxLayout *authorLayout = new QVBoxLayout(authorWidget); - authorLayout->setMargin(0); + authorLayout->setContentsMargins(0, 0, 0, 0); if (!aboutData.customAuthorTextEnabled() || !aboutData.customAuthorRichText().isEmpty()) { QLabel *bugsLabel = new QLabel(authorWidget); @@ -224,7 +224,7 @@ if (creditsCount) { QWidget *creditWidget = new QWidget(q); QVBoxLayout *creditLayout = new QVBoxLayout(creditWidget); - creditLayout->setMargin(0); + creditLayout->setContentsMargins(0, 0, 0, 0); KDEPrivate::KAboutApplicationPersonModel *creditModel = new KDEPrivate::KAboutApplicationPersonModel(aboutData.credits(), @@ -251,7 +251,7 @@ if (translatorsCount) { QWidget *translatorWidget = new QWidget(q); QVBoxLayout *translatorLayout = new QVBoxLayout(translatorWidget); - translatorLayout->setMargin(0); + translatorLayout->setContentsMargins(0, 0, 0, 0); KDEPrivate::KAboutApplicationPersonModel *translatorModel = new KDEPrivate::KAboutApplicationPersonModel(aboutData.translators(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/src/kedittoolbar.cpp new/kxmlgui-5.56.0/src/kedittoolbar.cpp --- old/kxmlgui-5.55.0/src/kedittoolbar.cpp 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/src/kedittoolbar.cpp 2019-03-02 14:50:23.000000000 +0100 @@ -337,7 +337,7 @@ setLayout(layout); QGridLayout *grid = new QGridLayout; - grid->setMargin(0); + grid->setContentsMargins(0, 0, 0, 0); m_lineEdit = new QLineEdit(this); m_lineEdit->setClearButtonEnabled(true); @@ -1082,7 +1082,7 @@ // now start with our layouts QVBoxLayout *top_layout = new QVBoxLayout(m_widget); - top_layout->setMargin(0); + top_layout->setContentsMargins(0, 0, 0, 0); QVBoxLayout *name_layout = new QVBoxLayout(); QHBoxLayout *list_layout = new QHBoxLayout(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/src/kkeysequencewidget.cpp new/kxmlgui-5.56.0/src/kkeysequencewidget.cpp --- old/kxmlgui-5.55.0/src/kkeysequencewidget.cpp 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/src/kkeysequencewidget.cpp 2019-03-02 14:50:23.000000000 +0100 @@ -266,7 +266,7 @@ void KKeySequenceWidgetPrivate::init() { layout = new QHBoxLayout(q); - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); keyButton = new KKeySequenceButton(this, q); keyButton->setFocusPolicy(Qt::StrongFocus); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/src/kshortcutseditor.cpp new/kxmlgui-5.56.0/src/kshortcutseditor.cpp --- old/kxmlgui-5.55.0/src/kshortcutseditor.cpp 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/src/kshortcutseditor.cpp 2019-03-02 14:50:23.000000000 +0100 @@ -290,7 +290,7 @@ actionTypes = types; ui.setupUi(q); - q->layout()->setMargin(0); + q->layout()->setContentsMargins(0, 0, 0, 0); ui.searchFilter->searchLine()->setTreeWidget(ui.list); // Plug into search line ui.list->header()->setSectionResizeMode(QHeaderView::ResizeToContents); ui.list->header()->hideSection(ShapeGesture); //mouse gestures didn't make it in time... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/src/ktoolbar.cpp new/kxmlgui-5.56.0/src/ktoolbar.cpp --- old/kxmlgui-5.55.0/src/ktoolbar.cpp 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/src/ktoolbar.cpp 2019-03-02 14:50:23.000000000 +0100 @@ -352,7 +352,7 @@ avSizes = theme->querySizes(isMainToolBar ? KIconLoader::MainToolbar : KIconLoader::Toolbar); } - qSort(avSizes); + std::sort(avSizes.begin(), avSizes.end()); if (avSizes.count() < 10) { // Fixed or threshold type icons diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.55.0/src/systeminformation_p.h new/kxmlgui-5.56.0/src/systeminformation_p.h --- old/kxmlgui-5.55.0/src/systeminformation_p.h 2019-02-03 01:04:35.000000000 +0100 +++ new/kxmlgui-5.56.0/src/systeminformation_p.h 2019-03-02 14:50:23.000000000 +0100 @@ -46,7 +46,7 @@ QStringLiteral("release ") + QString::fromUtf8(unameBuf.release); } #else -#include <QSysInfo> +#include <QOperatingSystemVersion> #include <qt_windows.h> #define SECURITY_WIN32 #include <security.h> @@ -63,15 +63,18 @@ } static inline QString windowsVersionString() { - switch (QSysInfo::windowsVersion()) { - case QSysInfo::WV_XP: return QStringLiteral("Windows XP"); - case QSysInfo::WV_2003: return QStringLiteral("Windows 2003"); - case QSysInfo::WV_VISTA: return QStringLiteral("Windows Vista"); - case QSysInfo::WV_WINDOWS7: return QStringLiteral("Windows 7"); - case QSysInfo::WV_WINDOWS8: return QStringLiteral("Windows 8"); - case QSysInfo::WV_WINDOWS8_1: return QStringLiteral("Windows 8.1"); - default: return QStringLiteral("Unknown Windows"); - } + const auto version = QOperatingSystemVersion::current(); + // We're comparing with class instances, can't use a switch + // There's not even an operator== anyway. + if (version >= QOperatingSystemVersion::Windows10) + return QStringLiteral("Windows 10"); + if (version >= QOperatingSystemVersion::Windows8_1) + return QStringLiteral("Windows 8.1"); + if (version >= QOperatingSystemVersion::Windows8) + return QStringLiteral("Windows 8"); + if (version >= QOperatingSystemVersion::Windows7) + return QStringLiteral("Windows 7"); + return QStringLiteral("Unknown Windows"); } inline QString SystemInformation::operatingSystemVersion()
