Hello community, here is the log from the commit of package kxmlgui for openSUSE:Factory checked in at 2020-08-12 12:25:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kxmlgui (Old) and /work/SRC/openSUSE:Factory/.kxmlgui.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kxmlgui" Wed Aug 12 12:25:46 2020 rev:84 rq:825114 version:5.73.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kxmlgui/kxmlgui.changes 2020-07-14 07:56:27.049238131 +0200 +++ /work/SRC/openSUSE:Factory/.kxmlgui.new.3399/kxmlgui.changes 2020-08-12 12:29:23.720179666 +0200 @@ -1,0 +2,11 @@ +Sun Aug 2 07:13:53 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.73.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.73.0 +- Changes since 5.72.0: + * Use KF-standardized Qt logging categories + * Make KXmlGuiVersionHandler::findVersionNumber public in KXMLGUIClient + +------------------------------------------------------------------- Old: ---- kxmlgui-5.72.0.tar.xz kxmlgui-5.72.0.tar.xz.sig New: ---- kxmlgui-5.73.0.tar.xz kxmlgui-5.73.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kxmlgui.spec ++++++ --- /var/tmp/diff_new_pack.59wE8x/_old 2020-08-12 12:29:24.196179921 +0200 +++ /var/tmp/diff_new_pack.59wE8x/_new 2020-08-12 12:29:24.200179923 +0200 @@ -17,14 +17,14 @@ %define lname libKF5XmlGui5 -%define _tar_path 5.72 +%define _tar_path 5.73 # 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.72.0 +Version: 5.73.0 Release: 0 Summary: Framework for managing menu and toolbar actions License: LGPL-2.1-or-later AND GPL-2.0-or-later @@ -134,6 +134,7 @@ %{_kf5_libexecdir}/ksendbugmail %dir %{_kf5_sharedir}/kxmlgui5/ %{_kf5_debugdir}/kxmlgui.categories +%{_kf5_debugdir}/*.renamecategories %files devel %{_kf5_libdir}/libKF5XmlGui.so ++++++ kxmlgui-5.72.0.tar.xz -> kxmlgui-5.73.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.72.0/CMakeLists.txt new/kxmlgui-5.73.0/CMakeLists.txt --- old/kxmlgui-5.72.0/CMakeLists.txt 2020-07-04 15:24:39.000000000 +0200 +++ new/kxmlgui-5.73.0/CMakeLists.txt 2020-08-01 21:58:30.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.72.0") # handled by release scripts -set(KF5_DEP_VERSION "5.72.0") # handled by release scripts +set(KF5_VERSION "5.73.0") # handled by release scripts +set(KF5_DEP_VERSION "5.73.0") # handled by release scripts project(KXmlGui VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.72.0 NO_MODULE) +find_package(ECM 5.73.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/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/kxmlgui-5.72.0/autotests/kxmlgui_unittest.cpp new/kxmlgui-5.73.0/autotests/kxmlgui_unittest.cpp --- old/kxmlgui-5.72.0/autotests/kxmlgui_unittest.cpp 2020-07-04 15:24:39.000000000 +0200 +++ new/kxmlgui-5.73.0/autotests/kxmlgui_unittest.cpp 2020-08-01 21:58:30.000000000 +0200 @@ -148,7 +148,7 @@ { QFETCH(QString, xml); QFETCH(QString, version); - QCOMPARE(KXmlGuiVersionHandler::findVersionNumber(xml), version); + QCOMPARE(KXMLGUIClient::findVersionNumber(xml), version); } void KXmlGui_UnitTest::testVersionHandlerSameVersion() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.72.0/po/az/kxmlgui5.po new/kxmlgui-5.73.0/po/az/kxmlgui5.po --- old/kxmlgui-5.72.0/po/az/kxmlgui5.po 2020-07-04 15:24:39.000000000 +0200 +++ new/kxmlgui-5.73.0/po/az/kxmlgui5.po 2020-08-01 21:58:30.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kxmlgui\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-30 02:01+0200\n" -"PO-Revision-Date: 2020-06-30 09:46+0400\n" +"PO-Revision-Date: 2020-07-29 17:04+0400\n" "Last-Translator: Xəyyam Qocayev <[email protected]>\n" "Language-Team: Azerbaijani <[email protected]>\n" "Language: az\n" @@ -15,7 +15,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 20.04.2\n" +"X-Generator: Lokalize 20.04.3\n" #: kaboutapplicationdialog.cpp:70 kaboutplugindialog.cpp:75 #, kde-format @@ -228,8 +228,8 @@ msgstr "" "<html>KDE Proqaram Təminatının hazırlanmasında iştirak etmək üçün sizin " "proqramçı olmanız vacib deyil.Məsələn KDE-nin doğma dilimizə tərcüməsində, " -"sənədlərin mükəmməlləşdirilməsindəmiştirak edə, həmçinin qrafik vasitlər, " -"müvzular (temalar) səslər yarada və ya bu kimi başqa faydalı işlər görə " +"sənədlərin mükəmməlləşdirilməsində iştirak edə, həmçinin qrafik vasitlər, " +"mövzular (temalar) səslər yarada və ya bu kimi başqa faydalı işlər görə " "bilərsiniz Qərar verdiyiniz halda <br /><br />bu <a href=\"%1\">%1</a> " "ünvanına daxil olmaqla sizə bu iş üçün lazım olan məlumatları əldə edə " "bilərsiniz.<br /><br /> Daha çox məumat və sənədlər üçün <a href=\"%2\">%2</" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.72.0/po/ca/kxmlgui5.po new/kxmlgui-5.73.0/po/ca/kxmlgui5.po --- old/kxmlgui-5.72.0/po/ca/kxmlgui5.po 2020-07-04 15:24:39.000000000 +0200 +++ new/kxmlgui-5.73.0/po/ca/kxmlgui5.po 2020-08-01 21:58:30.000000000 +0200 @@ -4,7 +4,7 @@ # version 3 or later versions approved by the membership of KDE e.V. # # Sebastià Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. -# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014, 2015, 2016, 2017. +# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2020. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. # Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020. # Robert Millan <[email protected]>, 2009. @@ -14,14 +14,14 @@ "Project-Id-Version: kxmlgui5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-30 02:01+0200\n" -"PO-Revision-Date: 2020-06-20 11:33+0100\n" -"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" +"PO-Revision-Date: 2020-07-27 14:58+0200\n" +"Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 20.04.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" @@ -196,10 +196,10 @@ "d'escriptori Plasma, centenars d'aplicacions, i moltes biblioteques de " "programari que les fan funcionar.<br /><br />KDE és una iniciativa " "cooperativa: cap entitat individual controla la seva direcció ni els seus " -"productes. Altrament, treballem conjuntament per aconseguir l'objectiu comú " -"de crear el programari lliure més refinat del món. Donem la benvinguda a " -"tothom a <a href=\"%2\">afegir-se i col·laborar</a> amb el KDE, incloent-vos." -"<br /><br />Visiteu <a href=\"%3\">%3</a> per a més informació sobre la " +"productes. Altrament, treballem conjuntament per a aconseguir l'objectiu " +"comú de crear el programari lliure més refinat del món. Donem la benvinguda " +"a tothom a <a href=\"%2\">afegir-se i col·laborar</a> amb el KDE, incloent-" +"vos.<br /><br />Visiteu <a href=\"%3\">%3</a> per a més informació sobre la " "comunitat KDE i el programari que produïm.</html>" #: kaboutkdedialog_p.cpp:76 @@ -258,14 +258,14 @@ "advance for your support.</html>" msgstr "" "<html>El KDE és i sempre serà disponible sense càrrecs, però la seva creació " -"no és de franc.<br /><br />Per donar suport al desenvolupament, la comunitat " -"KDE va formar la KDE e.V., una organització sense ànim de lucre, fundada " -"legalment a Alemanya. La KDE e.V. representa la comunitat KDE en qüestions " -"legals i financeres. Consulteu a <a href=\"%1\">%1</a> la informació quant a " -"la KDE e.V.<br /><br />El KDE es beneficia de molts tipus de " -"col·laboracions, inclosa la financera. Els fons obtinguts s'usen per a " +"no és de franc.<br /><br />Per a donar suport al desenvolupament, la " +"comunitat KDE va formar la KDE e.V., una organització sense ànim de lucre, " +"fundada legalment a Alemanya. La KDE e.V. representa la comunitat KDE en " +"qüestions legals i financeres. Consulteu a <a href=\"%1\">%1</a> la " +"informació quant a la KDE e.V.<br /><br />El KDE es beneficia de molts tipus " +"de col·laboracions, inclosa la financera. Els fons obtinguts s'usen per a " "tornar als seus membres i altres persones les despeses incorregudes a " -"col·laborar amb el KDE. Altres fons s'usen per al suport legal i per " +"col·laborar amb el KDE. Altres fons s'usen per al suport legal i per a " "organitzar conferències i reunions.<br /><br />Us animem a ajudar al KDE " "mitjançant donacions monetàries, usant un dels mitjans descrits a <a href=" "\"%2\">%2</a>.<br /><br />Moltes gràcies per endavant per la vostra ajuda.</" @@ -497,10 +497,10 @@ "where you will find a form to fill in. The information displayed above will " "be transferred to that server.</qt>" msgstr "" -"<qt>Per enviar un informe d'error, cliqueu al botó de sota. Això obrirà una " -"finestra del navegador web a <a href=\"https://bugs.kde.org\";>https://bugs."; -"kde.org</a> on trobareu un formulari per omplir. La informació que es mostra " -"més amunt s'enviarà a aquest servidor.</qt>" +"<qt>Per a enviar un informe d'error, cliqueu al botó de sota. Això obrirà " +"una finestra del navegador web a <a href=\"https://bugs.kde.org\";>https://"; +"bugs.kde.org</a> on trobareu un formulari a omplir. La informació que es " +"mostra més amunt s'enviarà a aquest servidor.</qt>" #: kbugreport.cpp:279 #, kde-format @@ -508,8 +508,8 @@ "<qt>To submit a bug report, click on the button below. This will open a web " "browser window on <a href=\"%1\">%2</a>.</qt>" msgstr "" -"<qt>Per enviar un informe d'error, cliqueu al botó de sota. Això obrirà una " -"finestra del navegador web a <a href=\"%1\">%2</a>.</qt>" +"<qt>Per a enviar un informe d'error, cliqueu al botó de sota. Això obrirà " +"una finestra del navegador web a <a href=\"%1\">%2</a>.</qt>" #: kbugreport.cpp:295 #, kde-format @@ -543,9 +543,9 @@ "<p>Does the bug you are reporting cause any of the above damage? If it does " "not, please select a lower severity. Thank you.</p>" msgstr "" -"<p>Heu triat la severitat <b>Crítica</b> (Critical). Tingueu present que " +"<p>Heu triat la severitat <b>Crítica</b> (Critical). Cal tenir present que " "aquesta severitat només està pensada per a errors que:</p><ul><li>fan que " -"programes del sistema sense cap relació (o tot el sistema) no funcionin</" +"els programes del sistema sense cap relació (o tot el sistema) no funcionin</" "li><li>causen una pèrdua greu de dades</li><li>introdueixen un forat de " "seguretat en el sistema on s'instal·la el paquet afectat</li></ul>\n" "<p>L'error del qual esteu informant causa algun dels danys esmentats? Si no " @@ -562,7 +562,7 @@ "<p>Does the bug you are reporting cause any of the above damage? If it does " "not, please select a lower severity. Thank you.</p>" msgstr "" -"<p>Heu triat la severitat <b>Greu</b> (Grave). Tingueu present que aquesta " +"<p>Heu triat la severitat <b>Greu</b> (Grave). Cal tenir present que aquesta " "severitat només està pensada per a errors que:</p><ul><li>fan que el paquet " "en qüestió no es pugui usar en la pràctica</li><li>causen una pèrdua de " "dades</li><li>introdueixen un forat de seguretat que permet l'accés als " @@ -584,7 +584,7 @@ #: kbugreport.cpp:434 #, kde-format msgid "Bug report sent, thank you for your input." -msgstr "S'ha enviat l'informe d'error, gràcies per la vostra informació." +msgstr "S'ha enviat l'informe d'error, gràcies per la vostra aportació." #: kbugreport.cpp:443 #, kde-format @@ -879,7 +879,7 @@ msgstr "" "Cliqueu en el botó, llavors introduïu la drecera com ho faríeu en el " "programa.\n" -"Exemple per Ctrl+A: premeu la tecla Ctrl mentre premeu la «A»." +"Exemple per a Ctrl+A: manteniu premuda la tecla Ctrl mentre premeu la «A»." #: kkeysequencewidget.cpp:467 #, kde-format @@ -1093,7 +1093,7 @@ "Note that this will not remove any system wide shortcut schemes." msgstr "" "Esteu segur que voleu suprimir l'esquema %1?\n" -"Tingueu en compte que això no eliminarà cap esquema de dreceres global del " +"Cal tenir en compte que això no eliminarà cap esquema de dreceres global del " "sistema." #: kshortcutschemeseditor.cpp:185 @@ -1160,9 +1160,9 @@ "(e.g. 'Copy') shown in the left column and keys or combination of keys (e.g. " "Ctrl+V) shown in the right column." msgstr "" -"Aquí podeu veure una llista de les vinculacions de tecles, associacions " -"entre accions (p. ex. «Copia») mostrades a la columna de l'esquerra i tecles " -"o combinacions de tecles (p. ex. Ctrl-V) mostrades a la columna de la dreta." +"Aquí podeu veure una llista dels lligams de tecla, associacions entre " +"accions (p. ex. «Copia») mostrades a la columna de l'esquerra i tecles o " +"combinacions de tecles (p. ex. Ctrl-V) mostrades a la columna de la dreta." #. i18n: ectx: property (text), widget (QTreeWidget, list) #: kshortcutsdialog.ui:33 @@ -1288,8 +1288,8 @@ "The language for this application has been changed. The change will take " "effect the next time the application is started." msgstr "" -"S'ha canviat l'idioma per aquesta aplicació. El canvi serà efectiu a partir " -"del següent inici de l'aplicació." +"S'ha canviat l'idioma per a aquesta aplicació. El canvi serà efectiu a " +"partir del següent inici de l'aplicació." #: kswitchlanguagedialog_p.cpp:289 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.72.0/po/da/kxmlgui5.po new/kxmlgui-5.73.0/po/da/kxmlgui5.po --- old/kxmlgui-5.72.0/po/da/kxmlgui5.po 2020-07-04 15:24:39.000000000 +0200 +++ new/kxmlgui-5.73.0/po/da/kxmlgui5.po 2020-08-01 21:58:30.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-30 02:01+0200\n" -"PO-Revision-Date: 2020-01-30 19:51+0100\n" +"PO-Revision-Date: 2020-07-27 18:27+0200\n" "Last-Translator: Martin Schlander <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" "Language: da\n" @@ -17,7 +17,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 18.12.3\n" +"X-Generator: Lokalize 20.04.2\n" #: kaboutapplicationdialog.cpp:70 kaboutplugindialog.cpp:75 #, kde-format @@ -1240,11 +1240,10 @@ msgstr "%1" #: kswitchlanguagedialog_p.cpp:159 -#, fuzzy, kde-format -#| msgid "Configure" +#, kde-format msgctxt "@title:window" msgid "Configure Language" -msgstr "Indstil" +msgstr "Indstil sprog" #: kswitchlanguagedialog_p.cpp:164 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.72.0/po/es/kxmlgui5.po new/kxmlgui-5.73.0/po/es/kxmlgui5.po --- old/kxmlgui-5.72.0/po/es/kxmlgui5.po 2020-07-04 15:24:39.000000000 +0200 +++ new/kxmlgui-5.73.0/po/es/kxmlgui5.po 2020-08-01 21:58:30.000000000 +0200 @@ -15,7 +15,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-30 02:01+0200\n" -"PO-Revision-Date: 2020-01-10 01:09+0100\n" +"PO-Revision-Date: 2020-07-18 18:29+0200\n" "Last-Translator: Eloy Cuadra <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" "Language: es\n" @@ -23,7 +23,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "First-Translator: Boris Wesslowski <[email protected]>\n" -"X-Generator: Lokalize 19.12.0\n" +"X-Generator: Lokalize 20.04.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: kaboutapplicationdialog.cpp:70 kaboutplugindialog.cpp:75 @@ -1266,11 +1266,10 @@ msgstr "%1" #: kswitchlanguagedialog_p.cpp:159 -#, fuzzy, kde-format -#| msgid "Configure" +#, kde-format msgctxt "@title:window" msgid "Configure Language" -msgstr "Configurar" +msgstr "Configurar idioma" #: kswitchlanguagedialog_p.cpp:164 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.72.0/po/sl/kxmlgui5.po new/kxmlgui-5.73.0/po/sl/kxmlgui5.po --- old/kxmlgui-5.72.0/po/sl/kxmlgui5.po 2020-07-04 15:24:39.000000000 +0200 +++ new/kxmlgui-5.73.0/po/sl/kxmlgui5.po 2020-08-01 21:58:30.000000000 +0200 @@ -18,7 +18,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-30 02:01+0200\n" -"PO-Revision-Date: 2020-05-19 10:45+0200\n" +"PO-Revision-Date: 2020-07-08 09:20+0200\n" "Last-Translator: Matjaž Jeran <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" "Language: sl\n" @@ -26,7 +26,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Translator: Andrej Mernik <[email protected]>\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Lokalize 19.12.2\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" @@ -223,10 +223,10 @@ "pripravljena storiti. Vendar nam morate vi – uporabniki – povedati, če kaj " "ne dela kot je pričakovano ali pa bi lahko bilo narejeno bolje.<br /><br /" ">KDE ima sistem sledenja hroščev. Obiščite <a href=\"%1\">%1</a> ali " -"uporabite pogovorno okno »Poročaj o hrošču ...« iz menija »Pomoč« za " +"uporabite pogovorno okno \"Poročaj o hrošču...\" iz menija \"Pomoč\" za " "poročanje o hroščih.<br /><br />Če imate predloge za izboljšanje, ste " "vabljeni, da v sistem sledenja hroščev vnesete svojo željo. Pazite le, da " -"boste uporabili raven resnosti »Želja«.</html>" +"boste uporabili raven resnosti \"Seznam želja\".</html>" #: kaboutkdedialog_p.cpp:94 #, kde-format @@ -408,7 +408,7 @@ "please use the Report Bug menu item of the correct application" msgstr "" "Program, za katerega želite poslati poročilo o hrošču. Če ni pravi, " -"uporabite predmet menija »Poročaj o hrošču« v pravilnem programu" +"uporabite predmet menija \"Poročaj o hrošču\" v pravilnem programu" #: kbugreport.cpp:180 #, kde-format @@ -490,7 +490,8 @@ msgstr "" "Vnesite besedilo (po možnosti v angleščini), ki ga želite poslati kot " "poročilo o hrošču.\n" -"Če pritisnete »Pošlji«, boste poslali sporočilo vzdrževalcu tega programa.\n" +"Če pritisnete \"Pošlji\", boste poslali sporočilo vzdrževalcu tega " +"programa.\n" #: kbugreport.cpp:274 #, kde-format @@ -791,7 +792,7 @@ #: kkeysequencewidget.cpp:129 #, kde-format msgid "Shortcut '%1' in Application %2 for action %3\n" -msgstr "Bližnjica »%1« v programu %2 za dejanje %3\n" +msgstr "Bližnjica '%1' v programu %2 za dejanje %3\n" #: kkeysequencewidget.cpp:139 #, kde-format @@ -801,10 +802,10 @@ 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] "Bližnjica »%2« je v sporu z naslednjo kombinacijo tipk:\n" -msgstr[1] "Bližnjica »%2« je v sporu z naslednjima kombinacijama tipk:\n" -msgstr[2] "Bližnjica »%2« je v sporu z naslednjimi kombinacijami tipk:\n" -msgstr[3] "Bližnjica »%2« je v sporu z naslednjimi kombinacijami tipk:\n" +msgstr[0] "Bližnjica '%2' je v sporu z naslednjo kombinacijo tipk:\n" +msgstr[1] "Bližnjica '%2' je v sporu z naslednjima kombinacijama tipk:\n" +msgstr[2] "Bližnjica '%2' je v sporu z naslednjimi kombinacijami tipk:\n" +msgstr[3] "Bližnjica '%2' je v sporu z naslednjimi kombinacijami tipk:\n" #: kkeysequencewidget.cpp:145 #, kde-format @@ -836,7 +837,7 @@ #: kkeysequencewidget.cpp:220 #, kde-format msgid "Shortcut '%1' for action '%2'\n" -msgstr "Bližnjica »%1« za dejanje »%2«\n" +msgstr "Bližnjica '%1' za dejanje '%2'\n" #: kkeysequencewidget.cpp:225 #, kde-format @@ -850,19 +851,19 @@ "Do you want to assign an empty shortcut to these actions?\n" "%3" msgstr[0] "" -"Bližnjica »%2« se prekriva z naslednjo bližnjico.\n" +"Bližnjica \"%2\" se prekriva z naslednjo bližnjico.\n" "Ali želite temu dejanju dodeliti prazno bližnjico?\n" "%3" msgstr[1] "" -"Bližnjica »%2« se prekriva z naslednjima bližnjicama.\n" +"Bližnjica \"%2\" se prekriva z naslednjima bližnjicama.\n" "Ali želite tema dejanjema dodeliti prazni bližnjici?\n" "%3" msgstr[2] "" -"Bližnjica »%2« se prekriva z naslednjimi bližnjicami.\n" +"Bližnjica \"%2\" se prekriva z naslednjimi bližnjicami.\n" "Ali želite tem dejanjem dodeliti prazne bližnjice?\n" "%3" msgstr[3] "" -"Bližnjica »%2« se prekriva z naslednjimi bližnjicami.\n" +"Bližnjica \"%2\" se prekriva z naslednjimi bližnjicami.\n" "Ali želite tem dejanjem dodeliti prazne bližnjice?\n" "%3" @@ -878,7 +879,7 @@ "<qt>The '%1' key combination is already used by the <b>%2</b> action." "<br>Please select a different one.</qt>" msgstr "" -"<qt>Zaporedje tipk »%1« se že uporablja za dejanje <b>%2</b>.<br>Izberite " +"<qt>Zaporedje tipk '%1' se že uporablja za dejanje <b>%2</b>.<br>Izberite " "drugačno.</qt>" #: kkeysequencewidget.cpp:275 @@ -920,7 +921,7 @@ "some applications use.\n" "Do you really want to use it as a global shortcut as well?" msgstr "" -"Zaporedje tipk »%1« se uporablja tudi pri standardnemu dejanju »%2«, ki \n" +"Zaporedje tipk '%1' se uporablja tudi pri standardnemu dejanju \"%2\", ki \n" "ga uporabljajo nekateri programi.\n" "Ali ga res želite uporabiti tudi za splošno bližnjico?" @@ -1003,7 +1004,7 @@ #: ksendbugmail/main.cpp:57 #, kde-format msgid "Server said: \"%1\"" -msgstr "Strežnik pravi: »%1«" +msgstr "Strežnik pravi: \"%1\"" #: ksendbugmail/main.cpp:88 #, kde-format @@ -1176,7 +1177,7 @@ "Ctrl+V) shown in the right column." msgstr "" "Tu lahko vidite seznam tipkovnih bližnjic, t.j. povezav med dejanji (npr. " -"»Kpiraj«), prikazanimi v levem stolpcu, in tipkami ali kombinacijami tipk " +"'Kopiraj'), prikazanimi v levem stolpcu, in tipkami ali kombinacijami tipk " "(npr. CTRL-C), prikazanimi v desnem stolpcu." #. i18n: ectx: property (text), widget (QTreeWidget, list) @@ -1271,11 +1272,10 @@ msgstr "%1" #: kswitchlanguagedialog_p.cpp:159 -#, fuzzy, kde-format -#| msgid "Configure" +#, kde-format msgctxt "@title:window" msgid "Configure Language" -msgstr "Nastavi" +msgstr "Nastavi jezik" #: kswitchlanguagedialog_p.cpp:164 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.72.0/po/zh_CN/kxmlgui5.po new/kxmlgui-5.73.0/po/zh_CN/kxmlgui5.po --- old/kxmlgui-5.72.0/po/zh_CN/kxmlgui5.po 2020-07-04 15:24:39.000000000 +0200 +++ new/kxmlgui-5.73.0/po/zh_CN/kxmlgui5.po 2020-08-01 21:58:30.000000000 +0200 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-30 02:01+0200\n" -"PO-Revision-Date: 2020-06-24 08:01\n" +"PO-Revision-Date: 2020-07-31 15:01\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.72.0/src/CMakeLists.txt new/kxmlgui-5.73.0/src/CMakeLists.txt --- old/kxmlgui-5.72.0/src/CMakeLists.txt 2020-07-04 15:24:39.000000000 +0200 +++ new/kxmlgui-5.73.0/src/CMakeLists.txt 2020-08-01 21:58:30.000000000 +0200 @@ -67,7 +67,8 @@ ecm_qt_declare_logging_category(kxmlgui_SRCS HEADER debug.h IDENTIFIER DEBUG_KXMLGUI - CATEGORY_NAME kf5.kxmlgui + CATEGORY_NAME kf.xmlgui + OLD_CATEGORY_NAMES kf5.kxmlgui DESCRIPTION "KXmlGui" EXPORT KXMLGUI ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.72.0/src/kxmlguiclient.cpp new/kxmlgui-5.73.0/src/kxmlguiclient.cpp --- old/kxmlgui-5.72.0/src/kxmlguiclient.cpp 2020-07-04 15:24:39.000000000 +0200 +++ new/kxmlgui-5.73.0/src/kxmlguiclient.cpp 2020-08-01 21:58:30.000000000 +0200 @@ -806,3 +806,77 @@ { /*BASE::virtual_hook( id, data );*/ } + +QString KXMLGUIClient::findVersionNumber(const QString &xml) +{ + enum { ST_START, ST_AFTER_OPEN, ST_AFTER_GUI, + ST_EXPECT_VERSION, ST_VERSION_NUM + } state = ST_START; + const int length = xml.length(); + for (int pos = 0; pos < length; pos++) { + switch (state) { + case ST_START: + if (xml[pos] == QLatin1Char('<')) { + state = ST_AFTER_OPEN; + } + break; + case ST_AFTER_OPEN: { + //Jump to gui.. + const int guipos = xml.indexOf(QLatin1String("gui"), pos, Qt::CaseInsensitive); + if (guipos == -1) { + return QString(); //Reject + } + + pos = guipos + 2; //Position at i, so we're moved ahead to the next character by the ++; + state = ST_AFTER_GUI; + break; + } + case ST_AFTER_GUI: + state = ST_EXPECT_VERSION; + break; + case ST_EXPECT_VERSION: { + const int verpos = xml.indexOf(QLatin1String("version"), pos, Qt::CaseInsensitive); + if (verpos == -1) { + return QString(); //Reject + } + pos = verpos + 7; // strlen("version") is 7 + while (xml.at(pos).isSpace()) { + ++pos; + } + if (xml.at(pos++) != QLatin1Char('=')) { + return QString(); //Reject + } + while (xml.at(pos).isSpace()) { + ++pos; + } + + state = ST_VERSION_NUM; + break; + } + case ST_VERSION_NUM: { + int endpos; + for (endpos = pos; endpos < length; endpos++) { + const ushort ch = xml[endpos].unicode(); + if (ch >= QLatin1Char('0') && ch <= QLatin1Char('9')) { + continue; //Number.. + } + if (ch == QLatin1Char('"')) { //End of parameter + break; + } else { //This shouldn't be here.. + endpos = length; + } + } + + if (endpos != pos && endpos < length) { + const QString matchCandidate = xml.mid(pos, endpos - pos); //Don't include " ". + return matchCandidate; + } + + state = ST_EXPECT_VERSION; //Try to match a well-formed version.. + break; + } //case.. + } //switch + } //for + + return QString(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.72.0/src/kxmlguiclient.h new/kxmlgui-5.73.0/src/kxmlguiclient.h --- old/kxmlgui-5.72.0/src/kxmlguiclient.h 2020-07-04 15:24:39.000000000 +0200 +++ new/kxmlgui-5.73.0/src/kxmlguiclient.h 2020-08-01 21:58:30.000000000 +0200 @@ -298,6 +298,13 @@ */ void replaceXMLFile(const QString &xmlfile, const QString &localxmlfile, bool merge = false); + /** + * Returns the version number of the given xml data (belonging to an xml rc file) + * + * @since 5.73 + */ + static QString findVersionNumber(const QString &xml); + protected: /** * Sets the component name for this part. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.72.0/src/kxmlguiversionhandler.cpp new/kxmlgui-5.73.0/src/kxmlguiversionhandler.cpp --- old/kxmlgui-5.72.0/src/kxmlguiversionhandler.cpp 2020-07-04 15:24:39.000000000 +0200 +++ new/kxmlgui-5.73.0/src/kxmlguiversionhandler.cpp 2020-08-01 21:58:30.000000000 +0200 @@ -21,6 +21,7 @@ #include "kxmlguiversionhandler_p.h" +#include "kxmlguiclient.h" #include "kxmlguifactory.h" #include <QFile> @@ -169,80 +170,6 @@ } } -QString KXmlGuiVersionHandler::findVersionNumber(const QString &xml) -{ - enum { ST_START, ST_AFTER_OPEN, ST_AFTER_GUI, - ST_EXPECT_VERSION, ST_VERSION_NUM - } state = ST_START; - const int length = xml.length(); - for (int pos = 0; pos < length; pos++) { - switch (state) { - case ST_START: - if (xml[pos] == QLatin1Char('<')) { - state = ST_AFTER_OPEN; - } - break; - case ST_AFTER_OPEN: { - //Jump to gui.. - const int guipos = xml.indexOf(QLatin1String("gui"), pos, Qt::CaseInsensitive); - if (guipos == -1) { - return QString(); //Reject - } - - pos = guipos + 2; //Position at i, so we're moved ahead to the next character by the ++; - state = ST_AFTER_GUI; - break; - } - case ST_AFTER_GUI: - state = ST_EXPECT_VERSION; - break; - case ST_EXPECT_VERSION: { - const int verpos = xml.indexOf(QLatin1String("version"), pos, Qt::CaseInsensitive); - if (verpos == -1) { - return QString(); //Reject - } - pos = verpos + 7; // strlen("version") is 7 - while (xml.at(pos).isSpace()) { - ++pos; - } - if (xml.at(pos++) != QLatin1Char('=')) { - return QString(); //Reject - } - while (xml.at(pos).isSpace()) { - ++pos; - } - - state = ST_VERSION_NUM; - break; - } - case ST_VERSION_NUM: { - int endpos; - for (endpos = pos; endpos < length; endpos++) { - const ushort ch = xml[endpos].unicode(); - if (ch >= QLatin1Char('0') && ch <= QLatin1Char('9')) { - continue; //Number.. - } - if (ch == QLatin1Char('"')) { //End of parameter - break; - } else { //This shouldn't be here.. - endpos = length; - } - } - - if (endpos != pos && endpos < length) { - const QString matchCandidate = xml.mid(pos, endpos - pos); //Don't include " ". - return matchCandidate; - } - - state = ST_EXPECT_VERSION; //Try to match a well-formed version.. - break; - } //case.. - } //switch - } //for - - return QString(); -} - KXmlGuiVersionHandler::KXmlGuiVersionHandler(const QStringList &files) { Q_ASSERT(!files.isEmpty()); @@ -269,7 +196,7 @@ QList<DocStruct>::iterator docIt = allDocuments.begin(); const QList<DocStruct>::iterator docEnd = allDocuments.end(); for (; docIt != docEnd; ++docIt) { - const QString versionStr = findVersionNumber((*docIt).data); + const QString versionStr = KXMLGUIClient::findVersionNumber((*docIt).data); if (versionStr.isEmpty()) { //qCDebug(DEBUG_KXMLGUI) << "found no version in" << (*docIt).file; continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.72.0/src/kxmlguiversionhandler_p.h new/kxmlgui-5.73.0/src/kxmlguiversionhandler_p.h --- old/kxmlgui-5.72.0/src/kxmlguiversionhandler_p.h 2020-07-04 15:24:39.000000000 +0200 +++ new/kxmlgui-5.73.0/src/kxmlguiversionhandler_p.h 2020-08-01 21:58:30.000000000 +0200 @@ -49,8 +49,6 @@ return m_doc; } - static QString findVersionNumber(const QString &xml); // used by the unit test - private: QString m_file; QString m_doc;
