Hello community, here is the log from the commit of package kxmlgui for openSUSE:Factory checked in at 2018-01-22 16:03:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kxmlgui (Old) and /work/SRC/openSUSE:Factory/.kxmlgui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kxmlgui" Mon Jan 22 16:03:53 2018 rev:52 rq:566714 version:5.42.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kxmlgui/kxmlgui.changes 2018-01-09 14:45:12.802250902 +0100 +++ /work/SRC/openSUSE:Factory/.kxmlgui.new/kxmlgui.changes 2018-01-22 16:03:54.710935814 +0100 @@ -1,0 +2,13 @@ +Tue Jan 16 22:50:21 CET 2018 - [email protected] + +- Update to 5.42.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.42.0.php +- Changes since 5.41.0: + * Remove obsolete reviewboardrc file + * KMainWindow_UnitTest: fix path used for wiping the config file + * API dox: make doxygen cover session related macros & functions again + * Disconnect shortcutedit slot on widget destruction (kde#387307) + +------------------------------------------------------------------- Old: ---- kxmlgui-5.41.0.tar.xz New: ---- kxmlgui-5.42.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kxmlgui.spec ++++++ --- /var/tmp/diff_new_pack.kNDOmE/_old 2018-01-22 16:03:55.394903809 +0100 +++ /var/tmp/diff_new_pack.kNDOmE/_new 2018-01-22 16:03:55.394903809 +0100 @@ -1,7 +1,7 @@ # # spec file for package kxmlgui # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5XmlGui5 -%define _tar_path 5.41 +%define _tar_path 5.42 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kxmlgui -Version: 5.41.0 +Version: 5.42.0 Release: 0 BuildRequires: attica-qt5-devel >= %{_kf5_bugfix_version} BuildRequires: cmake >= 3.0 ++++++ kxmlgui-5.41.0.tar.xz -> kxmlgui-5.42.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.41.0/.reviewboardrc new/kxmlgui-5.42.0/.reviewboardrc --- old/kxmlgui-5.41.0/.reviewboardrc 2017-12-02 21:09:39.000000000 +0100 +++ new/kxmlgui-5.42.0/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; -REPOSITORY = 'git://anongit.kde.org/kxmlgui' -BRANCH = 'master' -TARGET_GROUPS = 'kdeframeworks' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.41.0/CMakeLists.txt new/kxmlgui-5.42.0/CMakeLists.txt --- old/kxmlgui-5.41.0/CMakeLists.txt 2017-12-02 21:09:39.000000000 +0100 +++ new/kxmlgui-5.42.0/CMakeLists.txt 2018-01-07 17:22:13.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.41.0") # handled by release scripts -set(KF5_DEP_VERSION "5.41.0") # handled by release scripts +set(KF5_VERSION "5.42.0") # handled by release scripts +set(KF5_DEP_VERSION "5.42.0") # handled by release scripts project(KXmlGui VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.41.0 NO_MODULE) +find_package(ECM 5.42.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.41.0/autotests/kmainwindow_unittest.cpp new/kxmlgui-5.42.0/autotests/kmainwindow_unittest.cpp --- old/kxmlgui-5.41.0/autotests/kmainwindow_unittest.cpp 2017-12-02 21:09:39.000000000 +0100 +++ new/kxmlgui-5.42.0/autotests/kmainwindow_unittest.cpp 2018-01-07 17:22:13.000000000 +0100 @@ -32,12 +32,12 @@ void KMainWindow_UnitTest::initTestCase() { QStandardPaths::enableTestMode(true); - QFile::remove(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + KSharedConfig::openConfig()->name()); + QFile::remove(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + QLatin1Char('/') + KSharedConfig::openConfig()->name()); } void KMainWindow_UnitTest::cleanupTestCase() { - QFile::remove(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + KSharedConfig::openConfig()->name()); + QFile::remove(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + QLatin1Char('/') + KSharedConfig::openConfig()->name()); } void KMainWindow_UnitTest::testDefaultName() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.41.0/po/fi/kxmlgui5.po new/kxmlgui-5.42.0/po/fi/kxmlgui5.po --- old/kxmlgui-5.41.0/po/fi/kxmlgui5.po 2017-12-02 21:09:39.000000000 +0100 +++ new/kxmlgui-5.42.0/po/fi/kxmlgui5.po 2018-01-07 17:22:13.000000000 +0100 @@ -27,8 +27,8 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-13 03:08+0100\n" -"PO-Revision-Date: 2017-05-29 22:15+0200\n" -"Last-Translator: Tommi Nieminen <[email protected]>\n" +"PO-Revision-Date: 2017-12-03 21:01+0900\n" +"Last-Translator: Lasse Liehu <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -73,15 +73,12 @@ msgstr "K&irjastot" #: kaboutapplicationdialog.cpp:186 -#, fuzzy, kde-format -#| msgid "" -#| "Please use <a href=\"http://bugs.kde.org\";>http://bugs.kde.org</a> to " -#| "report bugs.\n" +#, kde-format msgid "" "Please use <a href=\"https://bugs.kde.org\";>https://bugs.kde.org</a> to " "report bugs.\n" msgstr "" -"Ilmoita vioista osoitteessa <a href=\"http://bugs.kde.org\";>bugs.kde.org</" +"Ilmoita vioista osoitteessa <a href=\"https://bugs.kde.org\";>bugs.kde.org</" "a>.\n" #: kaboutapplicationdialog.cpp:192 @@ -481,12 +478,7 @@ "Jos painat Lähetä, viesti lähetetään ohjelmiston ylläpitäjälle.\n" #: kbugreport.cpp:294 -#, 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=\"https://bugs.kde.org\";>https://bugs.kde.org</a> " @@ -494,9 +486,9 @@ "be transferred to that server.</qt>" msgstr "" "<qt>Lähetä vikailmoitus napsauttamalla alla olevaa painiketta. Tämä avaa " -"verkkoselaimen osoitteeseen <a href=\"http://bugs.kde.org\";>http://bugs.kde."; -"org</a>, josta löydät täytettävän lomakkeen. Yllä olevat tiedot siirretään " -"vikailmoituspalvelimelle.</qt>" +"verkkoselaimen osoitteeseen <a href=\"https://bugs.kde.org\";>https://bugs."; +"kde.org</a>, josta löydät täytettävän lomakkeen. Yllä olevat tiedot " +"siirretään vikailmoituspalvelimelle.</qt>" #: kbugreport.cpp:299 #, kde-format @@ -570,11 +562,7 @@ "tärkeysastetta. Kiitos!</p>" #: kbugreport.cpp:476 -#, fuzzy, kde-format -#| msgid "" -#| "Unable to send the bug report.\n" -#| "Please submit a bug report manually....\n" -#| "See http://bugs.kde.org/ for instructions." +#, kde-format msgid "" "Unable to send the bug report.\n" "Please submit a bug report manually....\n" @@ -582,7 +570,7 @@ msgstr "" "Vikailmoitusta ei voitu lähettää.\n" "Lähetä vikailmoitus manuaalisesti….\n" -"Katso http://bugs.kde.org/ osoitetta saadaksesi lisää ohjeita." +"Katso https://bugs.kde.org/ osoitetta saadaksesi lisää ohjeita." #: kbugreport.cpp:484 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.41.0/po/id/kxmlgui5.po new/kxmlgui-5.42.0/po/id/kxmlgui5.po --- old/kxmlgui-5.41.0/po/id/kxmlgui5.po 2017-12-02 21:09:39.000000000 +0100 +++ new/kxmlgui-5.42.0/po/id/kxmlgui5.po 2018-01-07 17:22:13.000000000 +0100 @@ -2,20 +2,22 @@ # Copyright (C) 2010 This_file_is_part_of_KDE # This file is distributed under the same license as the kdelibs4 package. # Andhika Padmawan <[email protected]>, 2010-2014. +# Wantoyo <[email protected]>, 2017. # msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-13 03:08+0100\n" -"PO-Revision-Date: 2014-06-26 19:35+0700\n" -"Last-Translator: Andhika Padmawan <[email protected]>\n" +"PO-Revision-Date: 2017-12-27 22:10+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 2.0\n" #: kaboutapplicationdialog.cpp:81 khelpmenu.cpp:288 #, kde-format @@ -323,8 +325,8 @@ "from the 'Settings' menu to solve the ambiguity.\n" "No action will be triggered." msgstr "" -"Sekuensi kunci '%1' ambigu. Gunakan 'Atur Jalan Pintas'\n" -"dari menu 'Pengaturan' untuk memecahkan ambiguitas.\n" +"Sekuensi kunci '%1' ambigu. Gunakan 'Konfigurasi Jalan Pintas'\n" +"dari menu 'Setelan' untuk memecahkan ambiguitas.\n" "Tak ada aksi yang akan dipicu." #: kactionconflictdetector.cpp:53 @@ -342,7 +344,8 @@ msgid "" "Your email address. If incorrect, use the Configure Email button to change it" msgstr "" -"Alamat email anda. Jika salah, gunakan tombol Atur Email untuk mengubahnya" +"Alamat email anda. Jika salah, gunakan tombol Konfigurasi Email untuk " +"mengubahnya" #: kbugreport.cpp:145 #, kde-format @@ -353,7 +356,7 @@ #: kbugreport.cpp:153 #, kde-format msgid "Configure Email..." -msgstr "Atur Email..." +msgstr "Konfigurasi Email..." #: kbugreport.cpp:160 #, kde-format @@ -663,12 +666,12 @@ #: kedittoolbar.cpp:349 #, kde-format msgid "&Hide text when toolbar shows text alongside icons" -msgstr "&Sembunyikan teks ketika batang alat menunjukkan teks di samping ikon" +msgstr "&Sembunyikan teks ketika bilah alat menunjukkan teks di samping ikon" #: kedittoolbar.cpp:602 #, kde-format msgid "Configure Toolbars" -msgstr "Atur Batang Alat" +msgstr "Konfigurasi Batang Alat" #: kedittoolbar.cpp:665 #, kde-format @@ -676,8 +679,8 @@ "Do you really want to reset all toolbars of this application to their " "default? The changes will be applied immediately." msgstr "" -"Anda yakin ingin mengembalikan semua batang alat dari aplikasi ini ke " -"standar mereka? Perubahan akan langsung diterapkan." +"Anda yakin ingin mengembalikan semua bilah alat dari aplikasi ini ke standar " +"mereka? Perubahan akan langsung diterapkan." #: kedittoolbar.cpp:665 #, kde-format @@ -967,7 +970,7 @@ #: kmenumenuhandler_p.cpp:227 #, kde-format msgid "Configure Shortcut..." -msgstr "Atur Jalan Pintas..." +msgstr "Konfigurasi Jalan Pintas..." #: ksendbugmail/main.cpp:45 #, kde-format @@ -1137,7 +1140,7 @@ #: kshortcutsdialog.cpp:154 #, kde-format msgid "Configure Shortcuts" -msgstr "Atur Jalan Pintas" +msgstr "Konfigurasi Jalan Pintas" #. i18n: ectx: property (whatsThis), widget (KTreeWidgetSearchLineWidget, searchFilter) #: kshortcutsdialog.ui:16 @@ -1357,7 +1360,7 @@ #, kde-format msgctxt "@title:menu" msgid "Toolbar Settings" -msgstr "Pengaturan Batang Alat" +msgstr "Setelan Batang Alat" #: ktoolbar.cpp:312 #, kde-format @@ -1537,7 +1540,7 @@ #: ui_standards.rc:148 #, kde-format msgid "&Settings" -msgstr "Pen&gaturan" +msgstr "&Setelan" #. i18n: ectx: ToolBar (mainToolBar) #: ui_standards.rc:196 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.41.0/po/is/kxmlgui5.po new/kxmlgui-5.42.0/po/is/kxmlgui5.po --- old/kxmlgui-5.41.0/po/is/kxmlgui5.po 2017-12-02 21:09:39.000000000 +0100 +++ new/kxmlgui-5.42.0/po/is/kxmlgui5.po 2018-01-07 17:22:13.000000000 +0100 @@ -6,13 +6,13 @@ # Richard Allen <[email protected]>, 1998-2004. # Pjetur G. Hjaltason <[email protected]>, 2003. # Arnar Leósson <[email protected]>, 2003, 2005. -# Sveinn í Felli <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2016. +# Sveinn í Felli <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2016, 2018. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-13 03:08+0100\n" -"PO-Revision-Date: 2016-04-08 22:57+0000\n" +"PO-Revision-Date: 2018-01-05 10:59+0000\n" "Last-Translator: Sveinn í Felli <[email protected]>\n" "Language-Team: Icelandic <[email protected]>\n" "Language: is\n" @@ -34,22 +34,19 @@ msgstr "Um %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>Útgáfa %2</b><br /> </html>" +msgstr "<html><font size=\"5\">%1</font><br />Útgáfa %2</html>" #: kaboutapplicationdialog.cpp:136 #, kde-format msgid "License: %1" -msgstr "Leyfi: %1" +msgstr "Notkunarleyfi: %1" #: kaboutapplicationdialog.cpp:148 #, kde-format msgid "&About" -msgstr "&Um" +msgstr "&Um hugbúnaðinn" #: kaboutapplicationdialog.cpp:155 #, kde-format @@ -57,30 +54,27 @@ "<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 stoðkerfið %1</li><li>Qt %2 (byggt með %3)</" +"li><li><em>%4</em> gluggakerfi</li></ul>" #: kaboutapplicationdialog.cpp:165 -#, fuzzy, kde-format -#| msgid "Libraries" +#, kde-format msgid "&Libraries" -msgstr "Söfn" +msgstr "Að&gerðasöfn" #: kaboutapplicationdialog.cpp:186 -#, fuzzy, kde-format -#| msgid "" -#| "Please use <a href=\"http://bugs.kde.org\";>http://bugs.kde.org</a> to " -#| "report bugs.\n" +#, kde-format msgid "" "Please use <a href=\"https://bugs.kde.org\";>https://bugs.kde.org</a> to " "report bugs.\n" msgstr "" -"Vinsamlega notaðu <a href=\"http://bugs.kde.org\";>http://bugs.kde.org</a> " -"til að senda inn villuskýrslur.\n" +"Endilega notaðu <a href=\"http://bugs.kde.org\";>http://bugs.kde.org</a> til " +"að senda inn villuskýrslur.\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 "Vinsamlega sendu villuskýrslur til <a href=\"mailto:%1\";>%2</a>.\n" +msgstr "Sendu villuskýrslur til <a href=\"%1\">%2</a>.\n" #: kaboutapplicationdialog.cpp:218 #, kde-format @@ -105,18 +99,18 @@ #: kaboutapplicationdialog.cpp:316 #, kde-format msgid "License Agreement" -msgstr "Notandaleyfi" +msgstr "Notkunarleyfi" #: kaboutapplicationpersonlistdelegate_p.cpp:61 #, kde-format msgctxt "Action to send an email to a contributor" msgid "Email contributor" -msgstr "Þáttakandi með tölvupósti" +msgstr "Senda þátttakanda tölvupóst" #: kaboutapplicationpersonlistdelegate_p.cpp:66 #, kde-format msgid "Visit contributor's homepage" -msgstr "Fara á heimasíðu þáttakandans" +msgstr "Fara á heimasíðu þátttakandans" #: kaboutapplicationpersonlistdelegate_p.cpp:127 #, kde-format @@ -125,7 +119,7 @@ "Email contributor\n" "%1" msgstr "" -"Þáttakandi með tölvupósti\n" +"Senda þátttakanda tölvupóst\n" "%1" #: kaboutapplicationpersonlistdelegate_p.cpp:133 @@ -135,7 +129,7 @@ "Visit contributor's homepage\n" "%1" msgstr "" -"Fara á heimasíðu þáttakandans\n" +"Fara á heimasíðu þátttakandans\n" "%1" #: kaboutapplicationpersonlistdelegate_p.cpp:140 @@ -145,7 +139,7 @@ "Visit contributor's profile on %1\n" "%2" msgstr "" -"Skoða kynningarsnið þáttakandans á %1\n" +"Skoða kynningarsnið þátttakandans á %1\n" "%2" #: kaboutapplicationpersonlistdelegate_p.cpp:163 @@ -154,7 +148,7 @@ "Visit contributor's page\n" "%1" msgstr "" -"Fara á síðu þáttakandans\n" +"Fara á síðu þátttakandans\n" "%1" #: kaboutapplicationpersonlistdelegate_p.cpp:166 @@ -163,7 +157,7 @@ "Visit contributor's blog\n" "%1" msgstr "" -"Fara á bloggsíðu þáttakandans\n" +"Fara á bloggsíðu þátttakandans\n" "%1" #: kaboutapplicationpersonlistdelegate_p.cpp:264 @@ -202,27 +196,12 @@ msgstr "Um KDE" #: kaboutkdedialog_p.cpp:46 -#, fuzzy, kde-format -#| msgid "" -#| "<html><font size=\"5\">KDE - Be Free!</font><br /><b>Platform Version %1</" -#| "b></html>" +#, kde-format msgid "<html><font size=\"5\">KDE - Be Free!</font></html>" -msgstr "" -"<html><font size=\"5\">KDE - Vertu frjáls!</font><br /><b>Stýrikerfisútgáfa " -"%1</b></html>" +msgstr "<html><font size=\"5\">KDE - Vertu frjáls!</font></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=" @@ -242,7 +221,7 @@ "ræður frumtextanum að KDE forritunum. Öllum er velkomið að leggja verkefninu " "lið. <br /><br />Nánari upplýsingar um KDE verkefnið fást á <a href=\"%2\">" "%2</a>.<br /><br />Upplýsingar um KDE á íslensku og íslenskun á KDE fást á " -"<A HREF=\"http://www.is.kde.org\";>http://www.is.kde.org</A></html>" +"<a href=\"http://www.is.kde.org\";>http://www.is.kde.org</a></html>" #: kaboutkdedialog_p.cpp:74 #, kde-format @@ -490,40 +469,26 @@ "Ef þú ýtir á \"Senda\" verður umsjónarmanni forritsins sendur tölvupóstur.\n" #: kbugreport.cpp:294 -#, 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=\"https://bugs.kde.org\";>https://bugs.kde.org</a> " "where you will find a form to fill in. The information displayed above will " "be transferred to that server.</qt>" msgstr "" -"<qt>Ef þú vilt senda inn villuskýrslu, smelltu þá á hlekkinn hér fyrir " -"neðan.\n" -"Þá opnast nýr gluggi í vafranum á síðunni <a href=\"http://bugs.kde.org"; -"\">http://bugs.kde.org</a> þar sem er eyðublað fyrir villuskýrslur.\n" -"Upplýsingarnar hér að ofan verða sendar þangað.</qt>" +"<qt>Ef þú vilt senda inn villuskýrslu, smelltu þá á hnappinn hér fyrir " +"neðan. Þá opnast nýr gluggi í vafranum á síðunni <a href=\"https://bugs.kde."; +"org\">https://bugs.kde.org</a> þar sem er eyðublað fyrir villuskýrslur.\n" +"Upplýsingarnar hér að ofan verða sendar inn á þann þjón.</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>Ef þú vilt senda inn villuskýrslu, smelltu þá á hlekkinn hér fyrir " -"neðan.\n" -"Þá opnast nýr gluggi í vafranum á síðunni <a href=\"http://bugs.kde.org"; -"\">http://bugs.kde.org</a> þar sem er eyðublað fyrir villuskýrslur.\n" -"Upplýsingarnar hér að ofan verða sendar þangað.</qt>" +"<qt>Ef þú vilt senda inn villuskýrslu, smelltu þá á hnappinn hér fyrir " +"neðan. Þá opnast nýr gluggi í vafra á <a href=\"%1\">%2</a>.</qt>" #: kbugreport.cpp:316 #, kde-format @@ -531,10 +496,9 @@ msgstr "&Ræsa villuskýrslu álf" #: kbugreport.cpp:318 -#, fuzzy, kde-format -#| msgid "Submit Bug Report" +#, kde-format msgid "&Submit Bug Report" -msgstr "Senda villuskýrslu" +msgstr "&Senda villuskýrslu" #: kbugreport.cpp:382 #, kde-format @@ -590,11 +554,7 @@ "svo er ekki, veldu þá minni alvarleika. Þakka þér fyrir.</p>" #: kbugreport.cpp:476 -#, fuzzy, kde-format -#| msgid "" -#| "Unable to send the bug report.\n" -#| "Please submit a bug report manually....\n" -#| "See http://bugs.kde.org/ for instructions." +#, kde-format msgid "" "Unable to send the bug report.\n" "Please submit a bug report manually....\n" @@ -602,7 +562,7 @@ msgstr "" "Ekki tókst að senda villuskýrsluna.\n" "Þú verður að gera það handvirkt...\n" -"Leiðbeiningar finnast á http://bugs.kde.org/ ." +"Leiðbeiningar finnast á https://bugs.kde.org/ ." #: kbugreport.cpp:484 #, kde-format @@ -641,17 +601,14 @@ msgstr "<h2>Flýtilyklum breytt</h2>" #: kcheckaccelerators.cpp:283 kcheckaccelerators.cpp:294 -#, fuzzy, kde-format -#| msgid "Find Text" +#, kde-format msgid "Old Text" -msgstr "Finna texta" +msgstr "Eldri texti" #: kcheckaccelerators.cpp:285 kcheckaccelerators.cpp:303 -#, fuzzy, kde-format -#| msgctxt "@title:menu" -#| msgid "Show Text" +#, kde-format msgid "New Text" -msgstr "Birta texta" +msgstr "Nýr texti" #: kcheckaccelerators.cpp:292 #, kde-format @@ -909,18 +866,14 @@ "<br>Veldu ótvíræða samsetningu.</qt>" #: kkeysequencewidget.cpp:274 -#, fuzzy, kde-format -#| msgid "" -#| "Click on the button, then enter the shortcut like you would in the " -#| "program.\n" -#| "Example for Ctrl+a: hold the Ctrl key and press a." +#, kde-format msgid "" "Click on the button, then enter the shortcut like you would in the program.\n" "Example for Ctrl+A: hold the Ctrl key and press A." msgstr "" "Smelltu á hnappinn, settu síðan inn flýtilykilinn sem þú vilt nota í " "forritinu.\n" -"Til dæmis Ctrl+a: halda niðri 'Ctrl' lyklinum og ýta á 'a'." +"Til dæmis Ctrl+A: halda niðri 'Ctrl' lyklinum og ýta á 'A'." #: kkeysequencewidget.cpp:466 #, kde-format @@ -1004,51 +957,44 @@ msgstr "Stilla flýtilykil..." #: ksendbugmail/main.cpp:45 -#, fuzzy, kde-format -#| msgid "Create content on server" +#, kde-format msgid "Error connecting to server." -msgstr "Búa til efni á miðlara" +msgstr "Villa við tengingu við miðlara." #: ksendbugmail/main.cpp:48 -#, fuzzy, kde-format -#| msgid "Not found" +#, kde-format msgid "Not connected." -msgstr "Fannst ekki" +msgstr "Ekki tengt." #: ksendbugmail/main.cpp:51 -#, fuzzy, kde-format -#| msgid "Connection timed out" +#, kde-format msgid "Connection timed out." -msgstr "Tilraun til að tengjast féll á tíma" +msgstr "Tenging féll á tíma." #: ksendbugmail/main.cpp:54 #, kde-format msgid "Time out waiting for server interaction." -msgstr "" +msgstr "Tíminn rann út meðan beðið var svara frá þjóninum." #: ksendbugmail/main.cpp:58 -#, fuzzy, kde-format -#| msgid "Server: %1" +#, kde-format msgid "Server said: \"%1\"" -msgstr "Þjónn: %1" +msgstr "Miðlari sagði: \"%1\"" #: ksendbugmail/main.cpp:89 -#, fuzzy, kde-format -#| msgid "Send bug report." +#, kde-format msgid "Sends a bug report by email." -msgstr "Senda villuskýrslu." +msgstr "Sendir villuskýrslu í tölvupósti." #: ksendbugmail/main.cpp:91 -#, fuzzy, kde-format -#| msgid "The size of the dialog" +#, kde-format msgid "The subject line of the email." -msgstr "Stærð samskiptaglugga" +msgstr "Efnislína tölvupóstsins." #: ksendbugmail/main.cpp:92 -#, fuzzy, kde-format -#| msgid "The email address this bug report is sent to." +#, kde-format msgid "The email address to send the bug report to." -msgstr "Netfangið sem þessi villulýsing verður send á." +msgstr "Tölvupóstfangið sem þessi villulýsing verður send á." #: kshortcuteditwidget.cpp:65 #, kde-format @@ -1086,10 +1032,9 @@ msgstr "Fleiri aðgerðir" #: kshortcutschemeseditor.cpp:91 -#, fuzzy, kde-format -#| msgid "Shortcut Schemes" +#, kde-format msgid "Save shortcuts to scheme" -msgstr "Flýtilyklaskemu" +msgstr "Vista flýtilykla í skema" #: kshortcutschemeseditor.cpp:93 #, kde-format @@ -1097,10 +1042,9 @@ msgstr "Flytja út skema..." #: kshortcutschemeseditor.cpp:95 -#, fuzzy, kde-format -#| msgid "Export Scheme..." +#, kde-format msgid "Import Scheme..." -msgstr "Flytja út skema..." +msgstr "Flytja inn skema..." #: kshortcutschemeseditor.cpp:111 #, kde-format @@ -1132,34 +1076,29 @@ "Athugaðu að það mun ekki eyða neinu af kerfislægu flýtilyklaskemunum." #: kshortcutschemeseditor.cpp:178 -#, fuzzy, kde-format -#| msgid "Shortcuts" +#, kde-format msgid "Export Shortcuts" -msgstr "Flýtihnappar" +msgstr "Flytja út flýtilykla" #: 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 "Flýtihnappar fyrir %1" +msgstr "Flýtilyklar (*.shortcuts)" #: kshortcutschemeseditor.cpp:189 -#, fuzzy, kde-format -#| msgid "Shortcuts" +#, kde-format msgid "Import Shortcuts" -msgstr "Flýtihnappar" +msgstr "Flytja inn flýtilykla" #: kshortcutschemeseditor.cpp:200 -#, fuzzy, kde-format -#| msgid "The removal request was successfully registered." +#, kde-format msgid "Shortcut scheme successfully saved." -msgstr "Fyrirspurn um fjarlægingu var rétt skráð." +msgstr "Tókst að vista flýtilyklaskema." #: kshortcutschemeseditor.cpp:203 #, kde-format msgid "Error saving the shortcut scheme." -msgstr "" +msgstr "Villa kom upp við að vista flýtilyklaskemað." #: kshortcutsdialog.cpp:85 #, kde-format @@ -1171,10 +1110,9 @@ "verður í núja skemað?" #: kshortcutsdialog.cpp:135 -#, fuzzy, kde-format -#| msgid "New Scheme" +#, kde-format msgid "Manage &Schemes" -msgstr "Nýtt skema" +msgstr "&Sýsla með flýtilyklaskemu" #: kshortcutsdialog.cpp:154 #, kde-format @@ -1292,10 +1230,9 @@ msgstr "Víðvært:" #: kshortcutseditor.cpp:717 -#, fuzzy, kde-format -#| msgid "Global Alternate" +#, kde-format msgid "Global alternate:" -msgstr "Víðvær varaleið" +msgstr "Víðvær varaleið:" #: kshortcutseditor.cpp:732 #, kde-format @@ -1517,12 +1454,14 @@ "is most probably a bug. Please report it in <a href='https://bugs.kde."; "org'>bugs.kde.org</a>" msgstr "" +"Tvær aðgerðir (%1, %2) eru stilltar á að nota sama flýtilykilinn (%3). Þetta " +"er líklega galli í forritinu. Endilega tilkynntu þetta á <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 "Gölluð flýtilyklasamsetning fannst" +msgstr "Gallaðar flýtilyklasamsetningar" #. i18n: ectx: Menu (file) #: ui_standards.rc:5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.41.0/po/ko/kxmlgui5.po new/kxmlgui-5.42.0/po/ko/kxmlgui5.po --- old/kxmlgui-5.41.0/po/ko/kxmlgui5.po 2017-12-02 21:09:39.000000000 +0100 +++ new/kxmlgui-5.42.0/po/ko/kxmlgui5.po 2018-01-07 17:22:13.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-13 03:08+0100\n" -"PO-Revision-Date: 2017-01-22 19:46+0100\n" +"PO-Revision-Date: 2017-12-02 22:47+0100\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" @@ -54,16 +54,13 @@ msgstr "라이브러리(&L)" #: kaboutapplicationdialog.cpp:186 -#, fuzzy, kde-format -#| msgid "" -#| "Please use <a href=\"http://bugs.kde.org\";>http://bugs.kde.org</a> to " -#| "report bugs.\n" +#, kde-format msgid "" "Please use <a href=\"https://bugs.kde.org\";>https://bugs.kde.org</a> to " "report bugs.\n" msgstr "" -"<a href=\"http://bugs.kde.org\";>http://bugs.kde.org</a>에 버그를 보고해 주십" -"시오.\n" +"<a href=\"https://bugs.kde.org\";>https://bugs.kde.org</a>에 버그를 보고해 주" +"십시오.\n" #: kaboutapplicationdialog.cpp:192 #, kde-format @@ -455,12 +452,7 @@ "\"보내기\" 단추를 누르면 이 프로그램의 관리자에게 이메일을 보냅니다.\n" #: kbugreport.cpp:294 -#, 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=\"https://bugs.kde.org\";>https://bugs.kde.org</a> " @@ -468,9 +460,9 @@ "be transferred to that server.</qt>" msgstr "" "<qt>버그 보고서를 전달하려면 아래의 단추를 누르십시오. 웹 브라우저 창이 열리" -"고 <a href=\"http://bugs.kde.org\";>http://bugs.kde.org</a> 사이트가 열리면서 " -"채워 넣을 양식이 보입니다. 그 양식에 채워놓은 보고들은 서버로 전송됩니다.</" -"qt>" +"고 <a href=\"https://bugs.kde.org\";>https://bugs.kde.org</a> 사이트가 열리면" +"서 채워 넣을 양식이 보입니다. 그 양식에 채워놓은 보고들은 서버로 전송됩니다." +"</qt>" #: kbugreport.cpp:299 #, kde-format @@ -541,11 +533,7 @@ "주시기 바랍니다. 감사합니다</p>" #: kbugreport.cpp:476 -#, fuzzy, kde-format -#| msgid "" -#| "Unable to send the bug report.\n" -#| "Please submit a bug report manually....\n" -#| "See http://bugs.kde.org/ for instructions." +#, kde-format msgid "" "Unable to send the bug report.\n" "Please submit a bug report manually....\n" @@ -553,7 +541,7 @@ msgstr "" "버그 보고서를 보낼 수 없습니다.\n" "직접 버그를 보고해 주시기 바랍니다...\n" -"http://bugs.kde.org/ 에 있는 설명을 따라 주십시오." +"https://bugs.kde.org/ 에 있는 설명을 따라 주십시오." #: kbugreport.cpp:484 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.41.0/po/pl/kxmlgui5.po new/kxmlgui-5.42.0/po/pl/kxmlgui5.po --- old/kxmlgui-5.41.0/po/pl/kxmlgui5.po 2017-12-02 21:09:39.000000000 +0100 +++ new/kxmlgui-5.42.0/po/pl/kxmlgui5.po 2018-01-07 17:22:13.000000000 +0100 @@ -17,7 +17,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-13 03:08+0100\n" -"PO-Revision-Date: 2017-10-14 06:30+0100\n" +"PO-Revision-Date: 2017-12-09 07:42+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -553,7 +553,7 @@ "If you press \"Send\", a mail message will be sent to the maintainer of this " "program.\n" msgstr "" -"Proszę wpisać (w miarę możliwości po angielsku) opis zgłaszanego błędu.\n" +"Wpisz (w miarę możliwości po angielsku) opis zgłaszanego błędu.\n" "Po naciśnięciu \"Wyślij\" zgłoszenie zostanie wysłany do opiekuna programu.\n" #: kbugreport.cpp:294 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.41.0/po/pt_BR/kxmlgui5.po new/kxmlgui-5.42.0/po/pt_BR/kxmlgui5.po --- old/kxmlgui-5.41.0/po/pt_BR/kxmlgui5.po 2017-12-02 21:09:39.000000000 +0100 +++ new/kxmlgui-5.42.0/po/pt_BR/kxmlgui5.po 2018-01-07 17:22:13.000000000 +0100 @@ -8,7 +8,7 @@ # Marcus Gama <[email protected]>, 2006. # Diniz Bortolotto <[email protected]>, 2007, 2008. # André Marcelo Alvarenga <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016. -# Luiz Fernando Ranghetti <[email protected]>, 2008, 2009, 2010, 2012. +# Luiz Fernando Ranghetti <[email protected]>, 2008, 2009, 2010, 2012, 2017. # Fernando Boaglio <[email protected]>, 2009. # Doutor Zero <[email protected]>, 2007, 2009. # Marcus Vinícius de Andrade Gama <[email protected]>, 2010, 2012. @@ -18,9 +18,9 @@ "Project-Id-Version: kxmlgui5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-13 03:08+0100\n" -"PO-Revision-Date: 2016-02-14 08:21-0300\n" -"Last-Translator: André Marcelo Alvarenga <[email protected]>\n" -"Language-Team: Brazilian Portuguese <[email protected]>\n" +"PO-Revision-Date: 2017-12-12 15:13-0300\n" +"Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n" +"Language-Team: Portuguese <[email protected]>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,10 +34,9 @@ msgstr "Sobre o %1" #: kaboutapplicationdialog.cpp:98 -#, fuzzy, kde-format -#| msgid "<html><font size=\"5\">%1</font></html>" +#, kde-format msgid "<html><font size=\"5\">%1</font><br />Version %2</html>" -msgstr "<html><font size=\"5\">%1</font></html>" +msgstr "<html><font size=\"5\">%1</font><br />Versão %2</html>" #: kaboutapplicationdialog.cpp:136 #, kde-format @@ -50,39 +49,32 @@ msgstr "&Sobre" #: 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 "" -"Usando:<ul><li>KDE Frameworks %1</li><li>Qt %2 (compilado com %3)</" -"li><li>Sistema de janelas <em>%4</em></li></ul>" +"<ul><li>KDE Frameworks %1</li><li>Qt %2 (compilado com %3)</li><li>Sistema " +"de janelas <em>%4</em></li></ul>" #: kaboutapplicationdialog.cpp:165 #, kde-format msgid "&Libraries" -msgstr "" +msgstr "&Bibliotecas" #: kaboutapplicationdialog.cpp:186 -#, fuzzy, kde-format -#| msgid "" -#| "Please use <a href=\"http://bugs.kde.org\";>http://bugs.kde.org</a> to " -#| "report bugs.\n" +#, kde-format msgid "" "Please use <a href=\"https://bugs.kde.org\";>https://bugs.kde.org</a> to " "report bugs.\n" msgstr "" -"Use o endereço <a href=\"http://bugs.kde.org\";> http://bugs.kde.org</a> para " -"relatar erros.\n" +"Use o endereço <a href=\"https://bugs.kde.org\";> https://bugs.kde.org</a> " +"para relatar erros.\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 "Use o e-mail <a href=\"mailto:%1\";>%2</a> para relatar erros.\n" +msgstr "Relate erros em <a href=\"%1\">%2</a>.\n" #: kaboutapplicationdialog.cpp:218 #, kde-format @@ -481,12 +473,7 @@ "programa.\n" #: kbugreport.cpp:294 -#, 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=\"https://bugs.kde.org\";>https://bugs.kde.org</a> " @@ -494,25 +481,18 @@ "be transferred to that server.</qt>" msgstr "" "<qt>Para enviar um relatório de erros, clique no botão abaixo. Isto abrirá " -"um navegador web em <a href=\"http://bugs.kde.org\";>http://bugs.kde.org</a>, " -"onde você encontrará um formulário para preencher. A informação exibida " +"um navegador web em <a href=\"https://bugs.kde.org\";>https://bugs.kde.org</" +"a>, onde você encontrará um formulário para preencher. A informação exibida " "acima será transferida para este servidor.</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>Para enviar um relatório de erros, clique no botão abaixo. Isto abrirá " -"um navegador web em <a href=\"http://bugs.kde.org\";>http://bugs.kde.org</a>, " -"onde você encontrará um formulário para preencher. A informação exibida " -"acima será transferida para este servidor.</qt>" +"um navegador web em <a href=\"%1\">%2</a>.</qt>" #: kbugreport.cpp:316 #, kde-format @@ -520,10 +500,9 @@ msgstr "&Iniciar o assistente do relatório de erro" #: kbugreport.cpp:318 -#, fuzzy, kde-format -#| msgid "Submit Bug Report" +#, kde-format msgid "&Submit Bug Report" -msgstr "Enviar relatório de erros" +msgstr "&Enviar relatório de erros" # Trata-se da versão do programa. Portanto, deve ficar como "desconhecida". (Alvarenga) #: kbugreport.cpp:382 @@ -580,11 +559,7 @@ "selecione um nível de severidade mais baixo. Obrigado.</p>" #: kbugreport.cpp:476 -#, fuzzy, kde-format -#| msgid "" -#| "Unable to send the bug report.\n" -#| "Please submit a bug report manually....\n" -#| "See http://bugs.kde.org/ for instructions." +#, kde-format msgid "" "Unable to send the bug report.\n" "Please submit a bug report manually....\n" @@ -592,7 +567,7 @@ msgstr "" "Não foi possível enviar o relatório de erros.\n" "Por favor, envie o relatório manualmente...\n" -"Veja as instruções em http://bugs.kde.org/."; +"Veja as instruções em https://bugs.kde.org/."; #: kbugreport.cpp:484 #, kde-format @@ -1492,12 +1467,14 @@ "is most probably a bug. Please report it in <a href='https://bugs.kde."; "org'>bugs.kde.org</a>" msgstr "" +"Existem duas ações (%1, %2) que querem usar o mesmo atalho (%3). Isto " +"provavelmente é um erro. Relate ele em <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 "Foi detectado um atalho que não está definido" +msgstr "Atalhos ambíguos" #. i18n: ectx: Menu (file) #: ui_standards.rc:5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.41.0/po/zh_CN/kxmlgui5.po new/kxmlgui-5.42.0/po/zh_CN/kxmlgui5.po --- old/kxmlgui-5.41.0/po/zh_CN/kxmlgui5.po 2017-12-02 21:09:39.000000000 +0100 +++ new/kxmlgui-5.42.0/po/zh_CN/kxmlgui5.po 2018-01-07 17:22:13.000000000 +0100 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-13 03:08+0100\n" -"PO-Revision-Date: 2017-11-09 08:33-0500\n" +"PO-Revision-Date: 2018-01-05 06:38-0500\n" "Last-Translator: guoyunhebrave <[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.41.0/src/kmainwindow.h new/kxmlgui-5.42.0/src/kmainwindow.h --- old/kxmlgui-5.41.0/src/kmainwindow.h 2017-12-02 21:09:39.000000000 +0100 +++ new/kxmlgui-5.42.0/src/kmainwindow.h 2018-01-07 17:22:13.000000000 +0100 @@ -646,14 +646,20 @@ Q_PRIVATE_SLOT(k_func(), void _k_slotSaveAutoSaveSize()) }; + +/** + * @defgroup KXMLGUI_Session KXMLGUI Session Macros and Functions + * + * @{ + */ + +#ifndef KXMLGUI_NO_DEPRECATED /** * @def RESTORE - * @ingroup XMLGUIMacros * Restores the last session. * * @deprecated since 5.0, use kRestoreMainWindows() instead **/ -#ifndef KXMLGUI_NO_DEPRECATED #define RESTORE(type) { int n = 1;\ while (KMainWindow::canBeRestored(n)){\ (new type)->restore(n);\ @@ -662,7 +668,6 @@ /** * @def KDE_RESTORE_MAIN_WINDOWS_NUM_TEMPLATE_ARGS - * @ingroup XMLGUIMacros * Returns the maximal number of arguments that are actually * supported by kRestoreMainWindows(). **/ @@ -674,14 +679,19 @@ * These functions work also if you have more than one kind of toplevel * widget (each derived from KMainWindow, of course). * - * Imagine you have three kinds of toplevel widgets: the classes childMW1, - * childMW2 and childMW3. Than you can just do: + * Imagine you have three kinds of toplevel widgets: the classes @c childMW1, + * @c childMW2 and @c childMW3. Then you can just do: * * \code - * if (qApp->isSessionRestored()) - * kRestoreMainWindows< childMW1, childMW2, childMW3 >(); - * else { - * // create default application as usual + * int main(int argc, char *argv[]) + * { + * // [...] + * if (qApp->isSessionRestored()) + * kRestoreMainWindows<childMW1, childMW2, childMW3>(); + * else { + * // create default application as usual + * } + * // [...] * } * \endcode * @@ -695,6 +705,8 @@ * deciding whether or not you can use kRestoreMainWindows, a * define #KDE_RESTORE_MAIN_WINDOWS_NUM_TEMPLATE_ARGS is provided. * + * @tparam T toplevel widget class + * * @see KMainWindow::restore() * @see KMainWindow::classNameOfToplevel() **/ @@ -709,6 +721,13 @@ } } +/** + * Restores the last session. + * Overloaded method for usage with two different toplevel widget classes. + * + * @tparam T0 one toplevel widget class + * @tparam T1 other toplevel widget class + */ template <typename T0, typename T1> inline void kRestoreMainWindows() { @@ -725,6 +744,14 @@ } } +/** + * Restores the last session. + * Overloaded method for usage with three different toplevel widget classes. + * + * @tparam T0 one toplevel widget class + * @tparam T1 other toplevel widget class + * @tparam T2 yet another toplevel widget class + */ template <typename T0, typename T1, typename T2> inline void kRestoreMainWindows() { @@ -743,5 +770,6 @@ } } } +/** @} */ #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.41.0/src/kshortcuteditwidget.cpp new/kxmlgui-5.42.0/src/kshortcuteditwidget.cpp --- old/kxmlgui-5.41.0/src/kshortcuteditwidget.cpp 2017-12-02 21:09:39.000000000 +0100 +++ new/kxmlgui-5.42.0/src/kshortcuteditwidget.cpp 2018-01-07 17:22:13.000000000 +0100 @@ -90,7 +90,7 @@ this, SIGNAL(stealShortcut(QKeySequence,QAction*))); #if HAVE_GLOBALACCEL connect(KGlobalAccel::self(), &KGlobalAccel::globalShortcutChanged, - [this](QAction *action, const QKeySequence &seq) { + this, [this](QAction *action, const QKeySequence &seq) { if (action != m_action) { return; }
