Hello community, here is the log from the commit of package kxmlgui for openSUSE:Factory checked in at 2017-06-01 16:21:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kxmlgui (Old) and /work/SRC/openSUSE:Factory/.kxmlgui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kxmlgui" Thu Jun 1 16:21:55 2017 rev:44 rq:495074 version:5.34.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kxmlgui/kxmlgui.changes 2017-04-30 21:21:51.833907014 +0200 +++ /work/SRC/openSUSE:Factory/.kxmlgui.new/kxmlgui.changes 2017-06-01 16:21:56.206475495 +0200 @@ -1,0 +2,15 @@ +Mon May 15 13:53:16 CEST 2017 - [email protected] + +- Update to 5.34.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.34.0.php +- Changes since 5.33.0: + * kcm_useraccount is dead, long live user_manager + * Reproducible builds: drop version from XMLGUI_COMPILING_OS + * Fix: DOCTYPE name must match root element type + * Fix wrong usage of ANY in kpartgui.dtd + * Use non-deprecated <gui> root element + * API dox fixes: replace 0 with nullptr or remove where not applied + +------------------------------------------------------------------- Old: ---- kxmlgui-5.33.0.tar.xz New: ---- kxmlgui-5.34.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kxmlgui.spec ++++++ --- /var/tmp/diff_new_pack.E2ArBk/_old 2017-06-01 16:21:56.842385825 +0200 +++ /var/tmp/diff_new_pack.E2ArBk/_new 2017-06-01 16:21:56.846385261 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5XmlGui5 -%define _tar_path 5.33 +%define _tar_path 5.34 Name: kxmlgui -Version: 5.33.0 +Version: 5.34.0 Release: 0 %define kf5_version %{version} BuildRequires: attica-qt5-devel >= %{_tar_path} ++++++ kxmlgui-5.33.0.tar.xz -> kxmlgui-5.34.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/CMakeLists.txt new/kxmlgui-5.34.0/CMakeLists.txt --- old/kxmlgui-5.33.0/CMakeLists.txt 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/CMakeLists.txt 2017-05-06 14:02:38.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.33.0") # handled by release scripts -set(KF5_DEP_VERSION "5.33.0") # handled by release scripts +set(KF5_VERSION "5.34.0") # handled by release scripts +set(KF5_DEP_VERSION "5.34.0") # handled by release scripts project(KXmlGui VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.33.0 NO_MODULE) +find_package(ECM 5.34.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/autotests/kxmlgui_unittest.cpp new/kxmlgui-5.34.0/autotests/kxmlgui_unittest.cpp --- old/kxmlgui-5.33.0/autotests/kxmlgui_unittest.cpp 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/autotests/kxmlgui_unittest.cpp 2017-05-06 14:02:38.000000000 +0200 @@ -53,7 +53,7 @@ { const QByteArray xml = "<?xml version = '1.0'?>\n" - "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n" + "<!DOCTYPE " + toplevelTag + " SYSTEM \"kpartgui.dtd\">\n" "<" + toplevelTag + " version=\"" + QByteArray::number(version) + "\" name=\"foo\" >\n" "<MenuBar>\n"; file.write(xml); @@ -129,7 +129,7 @@ "<gui version=\"3\" name=\"foo\"/>\n" << "3"; QTest::newRow("two digits") << "<?xml version = '1.0'?>\n" - "<kpartgui version=\"42\" name=\"foo\"/>\n" << "42"; + "<gui version=\"42\" name=\"foo\"/>\n" << "42"; QTest::newRow("with spaces") << // as found in dirfilterplugin.rc for instance "<?xml version = '1.0'?>\n" "<gui version = \"1\" name=\"foo\"/>\n" << "1"; @@ -137,10 +137,10 @@ "<?xml version = '1.0'?>\n" "<gui version = \"0.2\" name=\"foo\"/>\n" << QString() /*error*/; QTest::newRow("with a comment") << // as found in kmail.rc - "<!DOCTYPE kpartgui>\n" + "<!DOCTYPE gui>\n" "<!-- This file should be synchronized with kmail_part.rc to provide\n" "the same menu entries at the same place in KMail and Kontact -->\n" - "<kpartgui version=\"452\" name=\"kmmainwin\">\n" << "452"; + "<gui version=\"452\" name=\"kmmainwin\">\n" << "452"; } void KXmlGui_UnitTest::testFindVersionNumber() @@ -377,8 +377,8 @@ qDebug() << "Now merging the part"; const QByteArray partXml = - "<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n" - "<kpartgui version=\"1\" name=\"part\" >\n" + "<!DOCTYPE gui SYSTEM \"kpartgui.dtd\">\n" + "<gui version=\"1\" name=\"part\" >\n" "<MenuBar>\n" " <Menu name=\"go\"><text>&Go</text>\n" " <Action name=\"go_previous\" group=\"before_merge\"/>\n" @@ -397,7 +397,7 @@ " <Action name=\"other_file_action\"/>\n" " </Menu>\n" "</MenuBar>\n" - "</kpartgui>\n"; + "</gui>\n"; TestGuiClient partClient(partXml); partClient.createActions(QStringList() << QStringLiteral("go_previous") << QStringLiteral("go_next") << QStringLiteral("first_page") << diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/po/bg/kxmlgui5.po new/kxmlgui-5.34.0/po/bg/kxmlgui5.po --- old/kxmlgui-5.33.0/po/bg/kxmlgui5.po 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/po/bg/kxmlgui5.po 2017-05-06 14:02:38.000000000 +0200 @@ -1,8 +1,5 @@ -# translation of kdelibs4.po to Bulgarian -# Bulgarian translation of KDE. -# This file is licensed under the GPL. -# -# $Id:$ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. # # Zlatko Popov <[email protected]>, 2006, 2007, 2008, 2009. # Yasen Pramatarov <[email protected]>, 2009, 2010, 2011, 2012, 2013. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/po/de/kxmlgui5.po new/kxmlgui-5.34.0/po/de/kxmlgui5.po --- old/kxmlgui-5.33.0/po/de/kxmlgui5.po 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/po/de/kxmlgui5.po 2017-05-06 14:02:38.000000000 +0200 @@ -14,7 +14,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-09 03:53+0100\n" -"PO-Revision-Date: 2017-01-08 21:31+0100\n" +"PO-Revision-Date: 2017-04-18 15:08+0100\n" "Last-Translator: Burkhard Lück <[email protected]>\n" "Language-Team: German <[email protected]>\n" "Language: de\n" @@ -68,10 +68,9 @@ "für Problemberichte.\n" #: kaboutapplicationdialog.cpp:192 -#, fuzzy, kde-format -#| msgid "Please report bugs to <a href=\"mailto:%1\";>%2</a>.\n" +#, kde-format msgid "Please report bugs to <a href=\"%1\">%2</a>.\n" -msgstr "Melden Sie Problemberichte an <a href=\"mailto:%1\";>%2</a>.\n" +msgstr "Melden Sie Problemberichte an <a href=\":%1\">%2</a>.\n" #: kaboutapplicationdialog.cpp:218 #, kde-format @@ -511,10 +510,9 @@ msgstr "Assistenten zum Berichten von &Fehlern und Wünschen starten" #: kbugreport.cpp:318 -#, fuzzy, kde-format -#| msgid "Submit Bug Report" +#, kde-format msgid "&Submit Bug Report" -msgstr "Problembericht einschicken" +msgstr "Problembericht ein&schicken" #: kbugreport.cpp:382 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/po/ia/kxmlgui5.po new/kxmlgui-5.34.0/po/ia/kxmlgui5.po --- old/kxmlgui-5.33.0/po/ia/kxmlgui5.po 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/po/ia/kxmlgui5.po 2017-05-06 14:02:38.000000000 +0200 @@ -1,22 +1,22 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# g.sora <[email protected]>, 2010, 2011, 2012, 2013, 2014. +# g.sora <[email protected]>, 2010, 2011, 2012, 2013, 2014, 2017. # Giovanni Sora <[email protected]>, 2014, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-09 03:53+0100\n" -"PO-Revision-Date: 2016-11-29 13:50+0100\n" -"Last-Translator: Giovanni Sora <[email protected]>\n" -"Language-Team: Interlingua <[email protected]>\n" +"PO-Revision-Date: 2017-04-14 23:14+0100\n" +"Last-Translator: giovanni <[email protected]>\n" +"Language-Team: Interlingua <[email protected]>\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #: kaboutapplicationdialog.cpp:81 khelpmenu.cpp:290 #, kde-format @@ -24,12 +24,9 @@ msgstr "A proposito de %1" #: kaboutapplicationdialog.cpp:98 -#, fuzzy, kde-format -#| msgid "" -#| "<html><font size=\"5\">%1</font><br /><b>Version %2</b><br /> </html>" +#, kde-format msgid "<html><font size=\"5\">%1</font><br />Version %2</html>" -msgstr "" -"<html><font size=\"5\">%1</font><br/><b>Version %2</b><br/> :</html>" +msgstr "<html><font size=\"5\">%1</font><br />Version %2</html>" #: kaboutapplicationdialog.cpp:136 #, kde-format @@ -47,12 +44,13 @@ "<ul><li>KDE Frameworks %1</li><li>Qt %2 (built against %3)</li><li>The <em>" "%4</em> windowing system</li></ul>" msgstr "" +"<ul><li>KDE Frameworks %1</li><li>Qt %2 (construite contra %3)</li><li>Le " +"<em>%4</em> systema de fenestras</li></ul>" #: kaboutapplicationdialog.cpp:165 -#, fuzzy, kde-format -#| msgid "Libraries" +#, kde-format msgid "&Libraries" -msgstr "Librerias" +msgstr "Bib&liothecas" #: kaboutapplicationdialog.cpp:186 #, kde-format @@ -64,10 +62,9 @@ "reportar bugs.\n" #: kaboutapplicationdialog.cpp:192 -#, fuzzy, kde-format -#| msgid "Please report bugs to <a href=\"mailto:%1\";>%2</a>.\n" +#, kde-format msgid "Please report bugs to <a href=\"%1\">%2</a>.\n" -msgstr "Pro favor tu reporta bugs a <a href=\"mailto:%1\";>%2</a>.\n" +msgstr "Pro favor tu reporta bugs a <a href=\"%1\">%2</a>.\n" #: kaboutapplicationdialog.cpp:218 #, kde-format @@ -186,17 +183,12 @@ #: kaboutkdedialog_p.cpp:43 #, kde-format msgid "About KDE" -msgstr "A proposio de KDE" +msgstr "A proposito de KDE" #: kaboutkdedialog_p.cpp:46 -#, fuzzy, kde-format -#| msgid "" -#| "<html><font size=\"5\">KDE - Be Free!</font><br /><b>Frameworks Version " -#| "%1</b></html>" +#, kde-format msgid "<html><font size=\"5\">KDE - Be Free!</font></html>" -msgstr "" -"<html><font size=\"5\">KDE- Vos Sia Libere!</font><br /><b>Version de " -"Frameworks %1</b></html>" +msgstr "<html><font size=\"5\">KDE- Vos Sia Libere!</font></html>" #: kaboutkdedialog_p.cpp:55 #, kde-format @@ -484,20 +476,13 @@ "information monstrate se supra essera transferite a ille server. </qt>" #: kbugreport.cpp:299 -#, fuzzy, kde-format -#| msgid "" -#| "<qt>To submit a bug report, click on the button below. This will open a " -#| "web browser window on <a href=\"http://bugs.kde.org\";>http://bugs.kde."; -#| "org</a> where you will find a form to fill in. The information displayed " -#| "above will be transferred to that server.</qt>" +#, kde-format msgid "" "<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>Pro submitter un reporto de bug, tu pressa sur le button a basso. Isto " -"aperira un fenestra del navigator web sur <a href=\"http://bugs.kde.org"; -"\">http://bugs.kde.org</a> ubi tu trovara un formato de rediger. Le " -"information monstrate se supra essera transferite a ille server. </qt>" +"aperira un fenestra del navigator web sur <a href=\"%1\">%2</a>.</qt>" #: kbugreport.cpp:316 #, kde-format @@ -505,10 +490,9 @@ msgstr "&Lancea le Assistente del Reporto de Bug" #: kbugreport.cpp:318 -#, fuzzy, kde-format -#| msgid "Submit Bug Report" +#, kde-format msgid "&Submit Bug Report" -msgstr "Submitte reporto de bug" +msgstr "&Submitte reporto de bug" #: kbugreport.cpp:382 #, kde-format @@ -1041,10 +1025,9 @@ msgstr "Altere actiones" #: kshortcutschemeseditor.cpp:91 -#, fuzzy, kde-format -#| msgid "Shortcut Schemes" +#, kde-format msgid "Save shortcuts to scheme" -msgstr "Schemas de Via Breve" +msgstr "Salveguarda vias breve a schemas" #: kshortcutschemeseditor.cpp:93 #, kde-format @@ -1052,8 +1035,7 @@ msgstr "Exporta Schema ..." #: kshortcutschemeseditor.cpp:95 -#, fuzzy, kde-format -#| msgid "Export Scheme..." +#, kde-format msgid "Import Scheme..." msgstr "Importa schema..." @@ -1087,34 +1069,29 @@ "Tu nota che isto non removera alcun schema de via breve de tote le systema" #: kshortcutschemeseditor.cpp:178 -#, fuzzy, kde-format -#| msgid "Shortcuts" +#, kde-format msgid "Export Shortcuts" -msgstr "Vias breve" +msgstr "Exporta vias breve" #: kshortcutschemeseditor.cpp:178 kshortcutschemeseditor.cpp:189 -#, fuzzy, kde-format -#| msgctxt "header for an applications shortcut list" -#| msgid "Shortcuts for %1" +#, kde-format msgid "Shortcuts (*.shortcuts)" -msgstr "Vias Breve per %1" +msgstr "Vias Breve (*.shortcuts)" #: kshortcutschemeseditor.cpp:189 -#, fuzzy, kde-format -#| msgid "Shortcuts" +#, kde-format msgid "Import Shortcuts" -msgstr "Vias breve" +msgstr "Importa vias breve" #: kshortcutschemeseditor.cpp:200 -#, fuzzy, kde-format -#| msgid "Content successfully uploaded" +#, kde-format msgid "Shortcut scheme successfully saved." -msgstr "Contento cargate con successo" +msgstr "Schema de vias breve salveguardate con successo." #: kshortcutschemeseditor.cpp:203 #, kde-format msgid "Error saving the shortcut scheme." -msgstr "" +msgstr "Error quando salveguardava le schema de via breve." #: kshortcutsdialog.cpp:85 #, kde-format @@ -1126,10 +1103,9 @@ "a lo nove?" #: kshortcutsdialog.cpp:135 -#, fuzzy, kde-format -#| msgid "New Scheme" +#, kde-format msgid "Manage &Schemes" -msgstr "Nove Schema" +msgstr "Administra &Schemas" #: kshortcutsdialog.cpp:154 #, kde-format @@ -1247,10 +1223,9 @@ msgstr "Global:" #: kshortcutseditor.cpp:717 -#, fuzzy, kde-format -#| msgid "Global Alternate" +#, kde-format msgid "Global alternate:" -msgstr "Alternate Global" +msgstr "Alternate Global:" #: kshortcutseditor.cpp:732 #, kde-format @@ -1487,12 +1462,14 @@ "is most probably a bug. Please report it in <a href='https://bugs.kde."; "org'>bugs.kde.org</a>" msgstr "" +"Il ha duo actiones (%1, %2) que voleusar le mesme via breve (%3). Istoes " +"plus probabilemente un bug. Pro favor reporta lo a <a href='https://bugs.kde."; +"org'>bugs.kde.org</a>" #: kxmlguiwindow.cpp:430 -#, fuzzy, kde-format -#| msgid "Ambiguous shortcut detected" +#, kde-format msgid "Ambiguous Shortcuts" -msgstr "Relevate via breve ambigue" +msgstr "Vias breve ambigue" #. i18n: ectx: Menu (file) #: ui_standards.rc:5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/po/ja/kxmlgui5.po new/kxmlgui-5.34.0/po/ja/kxmlgui5.po --- old/kxmlgui-5.33.0/po/ja/kxmlgui5.po 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/po/ja/kxmlgui5.po 2017-05-06 14:02:38.000000000 +0200 @@ -8,15 +8,16 @@ # Shinichi Tsunoda <[email protected]>, 2005. # Yukiko Bando <[email protected]>, 2006, 2007, 2008, 2009, 2010. # Fumiaki Okushi <[email protected]>, 2006, 2007, 2008, 2010, 2011. +# Fuminobu Takeyama <[email protected]>, 2017. # msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-09 03:53+0100\n" -"PO-Revision-Date: 2011-08-27 14:05-0700\n" -"Last-Translator: Fumiaki Okushi <[email protected]>\n" -"Language-Team: Japanese <[email protected]>\n" +"PO-Revision-Date: 2017-03-31 23:05+0900\n" +"Last-Translator: Fuminobu Takeyama <[email protected]>\n" +"Language-Team: Japanese <[email protected]>\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -"X-Generator: Lokalize 1.1\n" +"X-Generator: Lokalize 2.0\n" #: kaboutapplicationdialog.cpp:81 khelpmenu.cpp:290 #, kde-format @@ -206,17 +207,7 @@ "ジョン %1</b></html>" #: kaboutkdedialog_p.cpp:55 -#, fuzzy, kde-format -#| msgid "" -#| "<html><b>KDE</b> is a world-wide network of software engineers, artists, " -#| "writers, translators and facilitators who are committed to <a href=" -#| "\"%1\">Free Software</a> development. This community has created hundreds " -#| "of Free Software applications as part of the KDE Development Platform and " -#| "KDE Software Distribution.<br /><br />KDE is a cooperative enterprise in " -#| "which no single entity controls the efforts or products of KDE to the " -#| "exclusion of others. Everyone is welcome to join and contribute to KDE, " -#| "including you.<br /><br />Visit <a href=\"%2\">%2</a> for more " -#| "information about the KDE community and the software we produce.</html>" +#, kde-format msgid "" "<html><b>KDE</b> is a world-wide network of software engineers, artists, " "writers, translators and facilitators who are committed to <a href=" @@ -230,12 +221,12 @@ msgstr "" "<html><b>KDE</b> は<a href=\"%1\">フリーソフトウェア</a> の開発に熱心な世界中" "のソフトウェア開発者、アーティスト、ライター、翻訳者、ファシリテーターのネッ" -"トワークです。このコミュニティは KDE 開発プラットフォーム、KDE ソフトウエアの" -"一部として数百のフリーソフトウェアアプリケーションを提供しています。<br /" -"><br />KDE は特定のグループや企業、組織がコントロールしているのではありませ" -"ん。どなたでも自由に KDE の開発に参加していただけます。<br /><br />KDE コミュ" -"ニティとソフトウェアの詳細については <a href=\"%2\">%2</a> をご覧ください。</" -"html>" +"トワークです。このコミュニティは KDE フレームワーク、ワークスペース、そしてア" +"プリケーションの一部として数百のフリーソフトウェアアプリケーションを提供して" +"います。<br /><br />KDE は特定のグループや企業、組織がコントロールしているの" +"ではありません。どなたでも自由に KDE の開発に参加していただけます。<br /" +"><br />KDE コミュニティとソフトウェアの詳細については <a href=\"%2\">%2</a> " +"をご覧ください。</html>" #: kaboutkdedialog_p.cpp:74 #, kde-format @@ -723,7 +714,7 @@ #, kde-format msgctxt "@item:intable Action name in toolbar editor" msgid "%1" -msgstr "%1|/|$[~getForm %1 ~full]" +msgstr "%1" #: kedittoolbar.cpp:1237 #, kde-format @@ -759,7 +750,7 @@ #, kde-format msgctxt "@label Action tooltip in toolbar editor, below the action list" msgid "%1" -msgstr "%1|/|$[~getForm %1 ~full]" +msgstr "%1" #: kedittoolbar.cpp:1602 #, kde-format @@ -807,12 +798,7 @@ #: kkeysequencewidget.cpp:135 #, kde-format msgid "Shortcut '%1' in Application %2 for action %3\n" -msgstr "" -"アプリケーション <application>%2</application> のアクション<interface>%3</" -"interface>のショートカット <shortcut>%1</shortcut>\n" -"|/|アプリケーション <application>%2</application> のアクション<interface>" -"$[~stripAccel $[~getForm %3 ~full]]</interface>のショートカット <shortcut>" -"%1</shortcut>\n" +msgstr "アプリケーション %2 のアクション%3のショートカット '%1'\n" #: kkeysequencewidget.cpp:145 #, kde-format @@ -854,10 +840,7 @@ #: kkeysequencewidget.cpp:226 #, kde-format msgid "Shortcut '%1' for action '%2'\n" -msgstr "" -"アクション<interface>%2</interface>のショートカット <shortcut>%1</shortcut>\n" -"|/|アクション<interface>$[~getForm %2 ~full]</interface>のショートカット " -"<shortcut>%1</shortcut>\n" +msgstr "アクション '%2' のショートカット '%1'\n" #: kkeysequencewidget.cpp:231 #, kde-format @@ -890,11 +873,8 @@ "<qt>The '%1' key combination is already used by the <b>%2</b> action." "<br>Please select a different one.</qt>" msgstr "" -"<qt>キーの組み合わせ <shortcut>%1</shortcut> はアクション<interface>%2</" -"interface>に割り当てられています。<br/>他の組み合わせを選択してください。</" -"qt>|/|<qt>キーの組み合わせ <shortcut>%1</shortcut> はアクション<interface>" -"$[~stripAccel $[~getForm %2 ~full]]</interface>に割り当てられています。<br/>" -"他の組み合わせを選択してください。</qt>" +"<qt>キーの組み合わせ '%1' はアクション <b>%2</b> に割り当てられています。 " +"<br>他の組み合わせを選択してください。</qt>" #: kkeysequencewidget.cpp:281 #, kde-format @@ -931,12 +911,8 @@ "some applications use.\n" "Do you really want to use it as a global shortcut as well?" msgstr "" -"キーの組み合わせ <shortcut>%1</shortcut> は、複数のアプリケーションが使用する" -"標準アクション<interface>%2</interface>に割り当てられています。\n" -"本当にこれをグローバルショートカットとしても使いますか？|/|キーの組み合わせ " -"<shortcut>%1</shortcut> は、複数のアプリケーションが使用する標準アクション" -"<interface>$[~stripAccel $[~getForm %2 ~full]]</interface>に割り当てられてい" -"ます。\n" +"キーの組み合わせ '%1' は、複数のアプリケーションが使用する標準アクション " +"'%2' に割り当てられています。\n" "本当にこれをグローバルショートカットとしても使いますか？" #: kkeysequencewidget.cpp:672 @@ -1238,11 +1214,7 @@ "The '%1' shape gesture has already been allocated to the \"%2\" action.\n" "Do you want to reassign it from that action to the current one?" msgstr "" -"シェイプジェスチャー “%1” はアクション<interface>%2</interface>に割り当て済み" -"です。\n" -"現在のアクションに割り当て直しますか？|/|シェイプジェスチャー “%1” はアクショ" -"ン<interface>$[~stripAccel $[~getForm %2 ~full]]</interface>に割り当て済みで" -"す。\n" +"シェイプジェスチャー '%1' はアクション \"%2\" に割り当て済みです。\n" "現在のアクションに割り当て直しますか？" #: kshortcutseditor.cpp:649 @@ -1251,11 +1223,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 "" -"ボタンジェスチャー “%1” はアクション<interface>%2</interface>に割り当て済みで" -"す。\n" -"現在のアクションに割り当て直しますか？|/|ボタンジェスチャー “%1” はアクション" -"<interface>$[~stripAccel $[~getForm %2 ~full]]</interface>に割り当て済みで" -"す。\n" +"ロッカージェスチャー '%1' はアクション \"%2\" に割り当て済みです。\n" "現在のアクションに割り当て直しますか？" #: kshortcutseditor.cpp:696 @@ -1306,7 +1274,7 @@ #, kde-format msgctxt "@item:intable Action name in shortcuts configuration" msgid "%1" -msgstr "%1|/|$[~getForm %1 ~full]" +msgstr "%1" #: kswitchlanguagedialog_p.cpp:152 #, kde-format @@ -1481,13 +1449,13 @@ #, kde-format msgctxt "@action:intoolbar Text label of toolbar button" msgid "%1" -msgstr "%1|/|$[~getForm %1 ~label]" +msgstr "%1" #: ktoolbar.cpp:1360 #, kde-format msgctxt "@info:tooltip Tooltip of toolbar button" msgid "%1" -msgstr "%1|/|$[~getForm %1 ~full]" +msgstr "%1" #: ktoolbarhandler.cpp:101 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/po/lt/kxmlgui5.po new/kxmlgui-5.34.0/po/lt/kxmlgui5.po --- old/kxmlgui-5.33.0/po/lt/kxmlgui5.po 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/po/lt/kxmlgui5.po 2017-05-06 14:02:38.000000000 +0200 @@ -2,7 +2,7 @@ # Ričardas Čepas <[email protected]>, 2002-2004. # Donatas Glodenis <[email protected]>, 2004-2009. # Gintautas Miselis <[email protected]>, 2008. -# Andrius Štikonas <[email protected]>, 2009. +# Andrius Štikonas <[email protected]>, 2009-2017. # Tomas Straupis <[email protected]>, 2011. # Remigijus Jarmalavičius <[email protected]>, 2011. # Liudas Ališauskas <[email protected]>, 2011, 2012, 2013, 2014. @@ -48,21 +48,18 @@ msgstr "&Apie" #: kaboutapplicationdialog.cpp:155 -#, fuzzy, kde-format -#| msgid "" -#| "Using:<ul><li>KDE Frameworks %1</li><li>Qt %2 (built against %3)</" -#| "li><li>The <em>%4</em> windowing system</li></ul>" +#, kde-format msgid "" "<ul><li>KDE Frameworks %1</li><li>Qt %2 (built against %3)</li><li>The <em>" "%4</em> windowing system</li></ul>" msgstr "" -"Naudojama:<ul><li>KDE Frameworks %1</li><li>Qt %2 (sukompiliuota su %3)</" -"li><li><em>%4</em> langų sistemą</li></ul>" +"<ul><li>KDE Frameworks %1</li><li>Qt %2 (sukompiliuota su %3)</li><li><em>" +"%4</em> langų sistema</li></ul>" #: kaboutapplicationdialog.cpp:165 #, kde-format msgid "&Libraries" -msgstr "" +msgstr "&Bibliotekos" #: kaboutapplicationdialog.cpp:186 #, kde-format @@ -74,12 +71,10 @@ "\">http://bugs.kde.org</a>.\n" #: kaboutapplicationdialog.cpp:192 -#, fuzzy, kde-format -#| msgid "Please report bugs to <a href=\"mailto:%1\";>%2</a>.\n" +#, kde-format msgid "Please report bugs to <a href=\"%1\">%2</a>.\n" msgstr "" -"Prašome pranešti apie programos klaidas adresu <a href=\"mailto:%1\";>%2</" -"a>.\n" +"Prašome pranešti apie programos klaidas adresu <a href=\"%1\">%2</a>.\n" #: kaboutapplicationdialog.cpp:218 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/po/pl/kxmlgui5.po new/kxmlgui-5.34.0/po/pl/kxmlgui5.po --- old/kxmlgui-5.33.0/po/pl/kxmlgui5.po 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/po/pl/kxmlgui5.po 2017-05-06 14:02:38.000000000 +0200 @@ -17,7 +17,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-09 03:53+0100\n" -"PO-Revision-Date: 2017-01-22 08:40+0100\n" +"PO-Revision-Date: 2017-04-29 07:51+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -1555,7 +1555,7 @@ "is most probably a bug. Please report it in <a href='https://bugs.kde."; "org'>bugs.kde.org</a>" msgstr "" -"Istnieją dwa dziaania (%1, %2) które chcą używać tego samego skrótu (%3). " +"Istnieją dwa działania (%1, %2) które chcą używać tego samego skrótu (%3). " "Najprawdopodobniej jest to błąd. Zgłoś go na <a href='https://bugs.kde."; "org'>bugs.kde.org</a>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/src/config-xmlgui.h.cmake new/kxmlgui-5.34.0/src/config-xmlgui.h.cmake --- old/kxmlgui-5.33.0/src/config-xmlgui.h.cmake 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/src/config-xmlgui.h.cmake 2017-05-06 14:02:38.000000000 +0200 @@ -1,5 +1,5 @@ #define XMLGUI_DISTRIBUTION_TEXT "${XMLGUI_DISTRIBUTION_TEXT}" -#define XMLGUI_COMPILING_OS "${CMAKE_SYSTEM}" +#define XMLGUI_COMPILING_OS "${CMAKE_SYSTEM_NAME}" #define XMLGUI_COMPILER_VERSION "${XMLGUI_COMPILER_VERSION}" #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/src/kactioncollection.h new/kxmlgui-5.34.0/src/kactioncollection.h --- old/kxmlgui-5.33.0/src/kactioncollection.h 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/src/kactioncollection.h 2017-05-06 14:02:38.000000000 +0200 @@ -366,9 +366,9 @@ * KStandardAction::stdName. * * @param actionType The standard action type of the action to create. - * @param receiver The QObject to connect the triggered(bool) signal to. Leave 0 if no + * @param receiver The QObject to connect the triggered(bool) signal to. Leave nullptr if no * connection is desired. - * @param member The SLOT to connect the triggered(bool) signal to. Leave 0 if no + * @param member The SLOT to connect the triggered(bool) signal to. Leave nullptr if no * connection is desired. * @return new action of the given type ActionType. */ @@ -386,9 +386,9 @@ * * @param actionType The standard action type of the action to create. * @param name The name by which the action be retrieved again from the collection. - * @param receiver The QObject to connect the triggered(bool) signal to. Leave 0 if no + * @param receiver The QObject to connect the triggered(bool) signal to. Leave nullptr if no * connection is desired. - * @param member The SLOT to connect the triggered(bool) signal to. Leave 0 if no + * @param member The SLOT to connect the triggered(bool) signal to. Leave nullptr if no * connection is desired. * @return new action of the given type ActionType. */ @@ -411,9 +411,9 @@ * the other action in the collection. * * @param name The name by which the action be retrieved again from the collection. - * @param receiver The QObject to connect the triggered(bool) signal to. Leave 0 if no + * @param receiver The QObject to connect the triggered(bool) signal to. Leave nullptr if no * connection is desired. - * @param member The SLOT to connect the triggered(bool) signal to. Leave 0 if no + * @param member The SLOT to connect the triggered(bool) signal to. Leave nullptr if no * connection is desired. * @return new action of the given type ActionType. */ @@ -429,9 +429,9 @@ * signal. * * @param name The internal name of the action (e.g. "file-open"). - * @param receiver The QObject to connect the triggered(bool) signal to. Leave 0 if no + * @param receiver The QObject to connect the triggered(bool) signal to. Leave nullptr if no * connection is desired. - * @param member The SLOT to connect the triggered(bool) signal to. Leave 0 if no + * @param member The SLOT to connect the triggered(bool) signal to. Leave nullptr if no * connection is desired. * @return new action of the given type ActionType. * @@ -449,8 +449,8 @@ } /** - * This is the same as add(const QString &name, const QObject *receiver = 0, const char *member = 0) using - * new style connect syntax + * This is the same as add(const QString &name, const QObject *receiver, const char *member) using + * new style connect syntax. * * @param name The internal name of the action (e.g. "file-open"). * @param receiver The QObject to connect the triggered(bool) signal to. @@ -471,8 +471,8 @@ } /** - * This is the same as addAction(const QString &name, const QObject *receiver = 0, const char *member = 0) using - * new style connect syntax + * This is the same as addAction(const QString &name, const QObject *receiver, const char *member) using + * new style connect syntax. * * @param name The internal name of the action (e.g. "file-open"). * @param receiver The QObject to connect the triggered(bool) signal to. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/src/kbugreport.cpp new/kxmlgui-5.34.0/src/kbugreport.cpp --- old/kxmlgui-5.33.0/src/kbugreport.cpp 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/src/kbugreport.cpp 2017-05-06 14:02:38.000000000 +0200 @@ -400,7 +400,7 @@ } m_process = new QProcess; QObject::connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), q, SLOT(_k_slotSetFrom())); - m_process->start(QStringLiteral("kcmshell5"), QStringList() << QStringLiteral("kcm_useraccount")); + m_process->start(QStringLiteral("kcmshell5"), QStringList() << QStringLiteral("user_manager")); if (!m_process->waitForStarted()) { //qDebug() << "Couldn't start kcmshell5.."; delete m_process; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/src/kpartgui.dtd new/kxmlgui-5.34.0/src/kpartgui.dtd --- old/kxmlgui-5.33.0/src/kpartgui.dtd 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/src/kpartgui.dtd 2017-05-06 14:02:38.000000000 +0200 @@ -8,6 +8,10 @@ SYSTEM "kpartgui.dtd" This DTD should be included at the head of an xmlguibuilder XML file like this: + <!DOCTYPE gui SYSTEM "kpartgui.dtd"> + + When using the old deprecated root element <kpartgui>, + the respective doctype name must be used, like this: <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> --> @@ -154,10 +158,10 @@ > <!-- Not explicitly defined or in widely used yet. --> -<!ELEMENT MainWindow (ANY)> +<!ELEMENT MainWindow ANY> <!-- Not explicitly defined or in widely used yet. --> -<!ELEMENT StatusBar (ANY)> +<!ELEMENT StatusBar ANY> <!-- Specifies the entry index for merging in a gui client --> <!ELEMENT Merge EMPTY> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/src/kshortcutschemeseditor.cpp new/kxmlgui-5.34.0/src/kshortcutschemeseditor.cpp --- old/kxmlgui-5.33.0/src/kshortcutschemeseditor.cpp 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/src/kshortcutschemeseditor.cpp 2017-05-06 14:02:38.000000000 +0200 @@ -128,7 +128,7 @@ } QDomDocument doc; - QDomElement docElem = doc.createElement(QStringLiteral("kpartgui")); + QDomElement docElem = doc.createElement(QStringLiteral("gui")); doc.appendChild(docElem); QDomElement elem = doc.createElement(QStringLiteral("ActionProperties")); docElem.appendChild(elem); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/src/kshortcutschemeshelper.cpp new/kxmlgui-5.34.0/src/kshortcutschemeshelper.cpp --- old/kxmlgui-5.33.0/src/kshortcutschemeshelper.cpp 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/src/kshortcutschemeshelper.cpp 2017-05-06 14:02:38.000000000 +0200 @@ -61,7 +61,7 @@ qCDebug(DEBUG_KXMLGUI) << "Considering component" << componentName; QDomDocument doc; - QDomElement docElem = doc.createElement(QStringLiteral("kpartgui")); + QDomElement docElem = doc.createElement(QStringLiteral("gui")); docElem.setAttribute(QStringLiteral("version"), QStringLiteral("1")); docElem.setAttribute(QStringLiteral("name"), componentName); doc.appendChild(docElem); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/src/ktoolbarhandler.cpp new/kxmlgui-5.34.0/src/ktoolbarhandler.cpp --- old/kxmlgui-5.33.0/src/ktoolbarhandler.cpp 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/src/ktoolbarhandler.cpp 2017-05-06 14:02:38.000000000 +0200 @@ -37,13 +37,13 @@ const char actionListName[] = "show_menu_and_toolbar_actionlist"; const char guiDescription[] = "" - "<!DOCTYPE kpartgui><kpartgui name=\"StandardToolBarMenuHandler\">" + "<!DOCTYPE gui><gui name=\"StandardToolBarMenuHandler\">" "<MenuBar>" " <Menu name=\"settings\">" " <ActionList name=\"%1\" />" " </Menu>" "</MenuBar>" - "</kpartgui>"; + "</gui>"; class BarActionBuilder { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/src/ui_standards.rc new/kxmlgui-5.34.0/src/ui_standards.rc --- old/kxmlgui-5.33.0/src/ui_standards.rc 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/src/ui_standards.rc 2017-05-06 14:02:38.000000000 +0200 @@ -1,5 +1,5 @@ -<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="standard_containers" version="18" translationDomain="kxmlgui5"> +<!DOCTYPE gui SYSTEM "kpartgui.dtd"> +<gui name="standard_containers" version="18" translationDomain="kxmlgui5"> <MenuBar> <MergeLocal name="first_menu"/> <Menu name="file"><text>&File</text> @@ -218,4 +218,4 @@ <Action name="help"/> </ToolBar> <StatusBar/> -</kpartgui> +</gui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/tests/krichtexteditor/krichtexteditorui.rc new/kxmlgui-5.34.0/tests/krichtexteditor/krichtexteditorui.rc --- old/kxmlgui-5.33.0/tests/krichtexteditor/krichtexteditorui.rc 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/tests/krichtexteditor/krichtexteditorui.rc 2017-05-06 14:02:38.000000000 +0200 @@ -1,5 +1,5 @@ -<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="krichtexteditor" version="13"> +<!DOCTYPE gui SYSTEM "kpartgui.dtd"> +<gui name="krichtexteditor" version="13"> <MenuBar> <Menu noMerge="1" name="format"><text>F&ormat</text> @@ -59,4 +59,4 @@ <Action name="action_to_plain_text"/> </ToolBar> -</kpartgui> +</gui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/tests/kwindowtest.rc new/kxmlgui-5.34.0/tests/kwindowtest.rc --- old/kxmlgui-5.33.0/tests/kwindowtest.rc 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/tests/kwindowtest.rc 2017-05-06 14:02:38.000000000 +0200 @@ -1,5 +1,5 @@ -<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="windowtest" version="1"> +<!DOCTYPE gui SYSTEM "kpartgui.dtd"> +<gui name="windowtest" version="1"> <MenuBar> <Menu name="file" noMerge="1"> @@ -56,4 +56,4 @@ <Action name="radioButton4" /> </ToolBar> -</kpartgui> +</gui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/tests/kxmlguitest_part.rc new/kxmlgui-5.34.0/tests/kxmlguitest_part.rc --- old/kxmlgui-5.33.0/tests/kxmlguitest_part.rc 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/tests/kxmlguitest_part.rc 2017-05-06 14:02:38.000000000 +0200 @@ -1,8 +1,8 @@ -<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="khtmlpart" version="7"> +<!DOCTYPE gui SYSTEM "kpartgui.dtd"> +<gui name="khtmlpart" version="7"> <ToolBar name="mainToolBar"><text>Main Toolbar</text> <Action name="decFontSizes" /> <Separator /> <Action name="security" /> </ToolBar> -</kpartgui> +</gui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/tests/kxmlguitest_shell.rc new/kxmlgui-5.34.0/tests/kxmlguitest_shell.rc --- old/kxmlgui-5.33.0/tests/kxmlguitest_shell.rc 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/tests/kxmlguitest_shell.rc 2017-05-06 14:02:38.000000000 +0200 @@ -1,7 +1,8 @@ -<!DOCTYPE kpartgui ><kpartgui version="31" name="Konqueror" > +<!DOCTYPE gui SYSTEM "kpartgui.dtd"> +<gui version="31" name="Konqueror" > <ToolBar newline="true" name="mainToolBar"> <text>Main Toolbar</text> <Merge/> <Action name="splitviewh" /> </ToolBar> -</kpartgui> +</gui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.33.0/tests/kxmlguiwindowtestui.rc new/kxmlgui-5.34.0/tests/kxmlguiwindowtestui.rc --- old/kxmlgui-5.33.0/tests/kxmlguiwindowtestui.rc 2017-04-01 21:43:37.000000000 +0200 +++ new/kxmlgui-5.34.0/tests/kxmlguiwindowtestui.rc 2017-05-06 14:02:38.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE kpartgui SYSTEM 'kpartgui.dtd'> +<!DOCTYPE gui SYSTEM 'kpartgui.dtd'> <gui name="kxmlguiwindowtest" version="1"> <ToolBar name="mainToolBar"> <text>Main Toolbar</text>
