diff -pruN 6.4.0-1/CMakeLists.txt 6.5.0-1/CMakeLists.txt --- 6.4.0-1/CMakeLists.txt 2024-07-05 20:09:51.000000000 +0000 +++ 6.5.0-1/CMakeLists.txt 2024-08-02 11:16:31.000000000 +0000 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "6.4.0") # handled by release scripts -set(KF_DEP_VERSION "6.4.0") # handled by release scripts +set(KF_VERSION "6.5.0") # handled by release scripts +set(KF_DEP_VERSION "6.5.0") # handled by release scripts project(KXmlGui VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 6.4.0 NO_MODULE) +find_package(ECM 6.5.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 -pruN 6.4.0-1/debian/changelog 6.5.0-1/debian/changelog --- 6.4.0-1/debian/changelog 2024-07-19 07:24:55.000000000 +0000 +++ 6.5.0-1/debian/changelog 2024-08-10 21:22:11.000000000 +0000 @@ -1,3 +1,12 @@ +kf6-kxmlgui (6.5.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (6.5.0). + * Update build-deps and deps with the info from cmake. + * Release to unstable. + + -- Aurélien COUDERC Sat, 10 Aug 2024 23:22:11 +0200 + kf6-kxmlgui (6.4.0-1) experimental; urgency=medium [ Aurélien COUDERC ] diff -pruN 6.4.0-1/debian/control 6.5.0-1/debian/control --- 6.4.0-1/debian/control 2024-07-16 17:28:30.000000000 +0000 +++ 6.5.0-1/debian/control 2024-08-10 21:20:14.000000000 +0000 @@ -9,16 +9,16 @@ Build-Depends: cmake (>= 3.16~), dh-sequence-kf6, dh-sequence-pkgkde-symbolshelper, doxygen, - extra-cmake-modules (>= 6.4.0~), - libkf6config-dev (>= 6.4.0~), - libkf6configwidgets-dev (>= 6.4.0~), - libkf6coreaddons-dev (>= 6.4.0~), - libkf6globalaccel-dev (>= 6.4.0~), - libkf6guiaddons-dev (>= 6.4.0~), - libkf6i18n-dev (>= 6.4.0~), - libkf6iconthemes-dev (>= 6.4.0~), - libkf6itemviews-dev (>= 6.4.0~), - libkf6widgetsaddons-dev (>= 6.4.0~), + extra-cmake-modules (>= 6.5.0~), + libkf6config-dev (>= 6.5.0~), + libkf6configwidgets-dev (>= 6.5.0~), + libkf6coreaddons-dev (>= 6.5.0~), + libkf6globalaccel-dev (>= 6.5.0~), + libkf6guiaddons-dev (>= 6.5.0~), + libkf6i18n-dev (>= 6.5.0~), + libkf6iconthemes-dev (>= 6.5.0~), + libkf6itemviews-dev (>= 6.5.0~), + libkf6widgetsaddons-dev (>= 6.5.0~), libxkbcommon-dev, qt6-base-dev (>= 6.5.0+dfsg~), qt6-base-private-dev (>= 6.5.0+dfsg~), @@ -43,11 +43,11 @@ Description: User configurable main wind Package: libkf6xmlgui-dev Section: libdevel Architecture: any -Depends: libkf6config-dev (>= 6.4.0~), - libkf6configwidgets-dev (>= 6.4.0~), - libkf6globalaccel-dev (>= 6.4.0~), - libkf6guiaddons-dev (>= 6.4.0~), - libkf6itemviews-dev (>= 6.4.0~), +Depends: libkf6config-dev (>= 6.5.0~), + libkf6configwidgets-dev (>= 6.5.0~), + libkf6globalaccel-dev (>= 6.5.0~), + libkf6guiaddons-dev (>= 6.5.0~), + libkf6itemviews-dev (>= 6.5.0~), libkf6xmlgui6 (= ${binary:Version}), qt6-base-dev (>= 6.5.0+dfsg~), ${misc:Depends}, diff -pruN 6.4.0-1/po/bg/kxmlgui6.po 6.5.0-1/po/bg/kxmlgui6.po --- 6.4.0-1/po/bg/kxmlgui6.po 2024-07-05 20:09:51.000000000 +0000 +++ 6.5.0-1/po/bg/kxmlgui6.po 2024-08-02 11:16:31.000000000 +0000 @@ -9,14 +9,14 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2024-06-22 00:37+0000\n" -"PO-Revision-Date: 2024-05-30 20:46+0200\n" +"PO-Revision-Date: 2024-07-05 15:58+0200\n" "Last-Translator: Mincho Kondarev \n" "Language-Team: Bulgarian \n" "Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 24.05.0\n" +"X-Generator: Lokalize 24.05.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: kaboutapplicationcomponentlistdelegate_p.cpp:51 @@ -781,7 +781,7 @@ msgstr "Добавяне в лентат #, kde-format msgctxt "@action:inmenu" msgid "Configure Shortcut…" -msgstr "Конфигуриране на клавишна комбинация..." +msgstr "Конфигуриране на клавишна комбинация…" #: kshortcuteditwidget.cpp:55 #, kde-format @@ -834,13 +834,13 @@ msgstr "Запазване на клав #, kde-format msgctxt "@action:inmenu" msgid "Export Scheme…" -msgstr "Схема за експортиране..." +msgstr "Схема за експортиране…" #: kshortcutschemeseditor.cpp:66 #, kde-format msgctxt "@action:inmenu" msgid "Import Scheme…" -msgstr "Схема за импортиране..." +msgstr "Схема за импортиране…" #: kshortcutschemeseditor.cpp:115 #, kde-format diff -pruN 6.4.0-1/po/ca/kxmlgui6.po 6.5.0-1/po/ca/kxmlgui6.po --- 6.4.0-1/po/ca/kxmlgui6.po 2024-07-05 20:09:51.000000000 +0000 +++ 6.5.0-1/po/ca/kxmlgui6.po 2024-08-02 11:16:31.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: kxmlgui\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2024-06-22 00:37+0000\n" -"PO-Revision-Date: 2024-05-08 19:51+0200\n" +"PO-Revision-Date: 2024-07-05 19:25+0200\n" "Last-Translator: Josep M. Ferrer \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -185,7 +185,7 @@ msgstr "" "preparat per a fer-ho. En canvi, vós - l'usuari - heu de dir-nos quan alguna " "cosa no funciona tal com s'espera o si es pot fer millor.

El KDE " "té un sistema de seguiment d'errors. Visiteu %1 o useu el " -"diàleg «Informa d'un error...» des del menú «Ajuda» per a informar-ne.

Si teniu un suggeriment de millora, us convidem a usar el sistema de " "seguiment d'errors per a registrar la vostra petició. Assegureu-vos d'usar " "la severitat anomenada «Llista de desitjos» (Wishlist)." @@ -249,7 +249,7 @@ msgstr "&Quant a" #, kde-format msgctxt "@title:tab" msgid "&Report Bugs or Wishes" -msgstr "&Informa d'errors o desitjos" +msgstr "&Informeu d'errors o desitjos" #: kaboutkdedialog_p.cpp:130 #, kde-format @@ -346,7 +346,7 @@ msgid "" "please use the Report Bug menu item of the correct application" msgstr "" "L'aplicació per a la qual voleu enviar un informe d'error -si és " -"incorrecta-, useu l'element de menú «Informa d'un error» des de l'aplicació " +"incorrecta-, useu l'element de menú «Informeu d'un error» des de l'aplicació " "correcta" #: kbugreport.cpp:97 diff -pruN 6.4.0-1/po/ca@valencia/kxmlgui6.po 6.5.0-1/po/ca@valencia/kxmlgui6.po --- 6.4.0-1/po/ca@valencia/kxmlgui6.po 2024-07-05 20:09:51.000000000 +0000 +++ 6.5.0-1/po/ca@valencia/kxmlgui6.po 2024-08-02 11:16:31.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: kxmlgui\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2024-06-22 00:37+0000\n" -"PO-Revision-Date: 2024-05-08 19:51+0200\n" +"PO-Revision-Date: 2024-07-05 19:25+0200\n" "Last-Translator: Josep M. Ferrer \n" "Language-Team: Catalan \n" "Language: ca@valencia\n" @@ -1370,6 +1370,3 @@ msgstr "Con&figuració" #, kde-format msgid "Main Toolbar" msgstr "Barra d'eines principal" - -#~ msgid "About %1" -#~ msgstr "Quant a %1" diff -pruN 6.4.0-1/po/da/kxmlgui6.po 6.5.0-1/po/da/kxmlgui6.po --- 6.4.0-1/po/da/kxmlgui6.po 2024-07-05 20:09:51.000000000 +0000 +++ 6.5.0-1/po/da/kxmlgui6.po 2024-08-02 11:16:31.000000000 +0000 @@ -4,53 +4,45 @@ # # Martin Schlander , 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2019, 2020, 2021. # Keld Simonsen , 2010. +# SPDX-FileCopyrightText: 2024 rasmus rosendahl-kaa msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2024-06-22 00:37+0000\n" -"PO-Revision-Date: 2021-09-09 21:39+0200\n" -"Last-Translator: Martin Schlander \n" +"PO-Revision-Date: 2024-07-08 16:42+0200\n" +"Last-Translator: rasmus rosendahl-kaa \n" "Language-Team: Danish \n" "Language: da\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 20.04.2\n" +"X-Generator: Lokalize 24.05.2\n" #: kaboutapplicationcomponentlistdelegate_p.cpp:51 -#, fuzzy, kde-format -#| msgid "Visit contributor's homepage" +#, kde-format msgid "Visit component's homepage" -msgstr "Besøg bidragsyders hjemmeside" +msgstr "Besøg komponenternes hjemmeside" #: kaboutapplicationcomponentlistdelegate_p.cpp:99 -#, fuzzy, kde-format -#| msgctxt "@info:tooltip" -#| msgid "" -#| "Visit contributor's homepage\n" -#| "%1" +#, kde-format msgctxt "@info:tooltip" msgid "" "Visit components's homepage\n" "%1" msgstr "" -"Besøg bidragsyders hjemmeside\n" +"Besøg komponenternes hjemmeside\n" "%1" #: kaboutapplicationcomponentlistdelegate_p.cpp:140 -#, fuzzy, kde-format -#| msgctxt "@item Contributor name in about dialog." -#| msgid "%1" +#, kde-format msgctxt "@item Component name in about dialog." msgid "%1" msgstr "%1" #: kaboutapplicationcomponentlistdelegate_p.cpp:143 -#, fuzzy, kde-format -#| msgctxt "Version version-number" -#| msgid "Version %1" +#, kde-format msgid "Version %1" msgstr "Version %1" @@ -73,11 +65,10 @@ msgid "About" msgstr "Om" #: kaboutapplicationdialog.cpp:94 -#, fuzzy, kde-format -#| msgid "Comments" +#, kde-format msgctxt "@title:tab" msgid "Components" -msgstr "Kommentarer" +msgstr "Komponenter" #: kaboutapplicationdialog.cpp:104 kaboutplugindialog.cpp:92 #, kde-format @@ -192,15 +183,7 @@ msgstr "" "registrere dit ønske. Husk at angive alvorligheden til \"Wishlist\"." #: kaboutkdedialog_p.cpp:85 -#, fuzzy, kde-format -#| msgid "" -#| "You do not have to be a software developer to be a member of the " -#| "KDE team. You can join the national teams that translate program " -#| "interfaces. You can provide graphics, themes, sounds, and improved " -#| "documentation. You decide!

Visit %1 for " -#| "information on some projects in which you can participate.

If " -#| "you need more information or documentation, then a visit to %2 will provide you with what you need." +#, kde-format msgid "" "You do not have to be a software developer to be a member of the KDE " "team. You can join the language teams that translate program interfaces. You " @@ -211,12 +194,12 @@ msgid "" "what you need." msgstr "" "Man behøver ikke at være programmør for at være med i KDE-holdet. Du " -"kan deltage i de nationale hold der oversætter programmernes brugerflader. " -"Du kan hjælpe med grafik, temaer, lyde og forbedret dokumentation. Du " -"bestemmer!

Besøg %1 for information om nogle " -"projekter du kan deltage i.

Hvis du mangler mere information " -"eller dokumentation, så besøg %2 hvor du vil finde hvad " -"du har brug for." +"kan deltage i de sproghold der oversætter programmernes brugerflader. Du kan " +"hjælpe med grafik, temaer, lyde og forbedret dokumentation. Du bestemmer!" +"

Besøg %1 for information om nogle projekter " +"du kan deltage i.

Hvis du mangler mere information eller " +"dokumentation, så besøg %2 hvor du vil finde hvad du har " +"brug for." #: kaboutkdedialog_p.cpp:108 #, kde-format @@ -280,7 +263,7 @@ msgstr "Version %1" #: kabstractaboutdialog_p.cpp:106 #, kde-format msgid "The %1 windowing system" -msgstr "" +msgstr "%1 vinduesystemet" #: kabstractaboutdialog_p.cpp:107 #, kde-format @@ -290,12 +273,12 @@ msgstr "Qt" #: kabstractaboutdialog_p.cpp:109 #, kde-format msgid "%1 (built against %2)" -msgstr "" +msgstr "%1 (bygget imod %2)" #: kabstractaboutdialog_p.cpp:111 #, kde-format msgid "KDE Frameworks" -msgstr "" +msgstr "KDE Framworks" #: kabstractaboutdialog_p.cpp:136 #, kde-format @@ -388,10 +371,7 @@ msgid "OS:" msgstr "OS:" #: kbugreport.cpp:130 -#, fuzzy, kde-format -#| msgctxt "" -#| "@info:tooltip %1 is the tooltip of an action, %2 is its keyboard shorcut" -#| msgid "%1 (%2)" +#, kde-format msgctxt "" "%1 is the operating system name, e.g. 'Windows 10', %2 is the CPU " "architecture, e.g. 'x86_64'" @@ -399,19 +379,15 @@ msgid "%1 (%2)" msgstr "%1 (%2)" #: kbugreport.cpp:137 -#, fuzzy, kde-format -#| msgid "%1 %2, %3" +#, kde-format msgctxt "" "%1 is the operating system name, e.g. 'Fedora Linux', %2 is the operating " "system version, e.g. '35', %3 is the CPU architecture, e.g. 'x86_64'" msgid "%1 %2 (%3)" -msgstr "%1 %2, %3" +msgstr "%1 %2 (%3)" #: kbugreport.cpp:143 -#, fuzzy, kde-format -#| msgctxt "" -#| "@info:tooltip %1 is the tooltip of an action, %2 is its keyboard shorcut" -#| msgid "%1 (%2)" +#, kde-format msgctxt "" "%1 is the operating system name, e.g. 'Fedora Linux', %2 is the CPU " "architecture, e.g. 'x86_64'" @@ -559,19 +535,16 @@ msgid "Curr&ent actions:" msgstr "&Nuværende handlinger:" #: kedittoolbar.cpp:1040 -#, fuzzy, kde-format -#| msgid "Change Icon" +#, kde-format msgctxt "@action:button" msgid "Change &Icon…" -msgstr "Skift ikon" +msgstr "Skift &ikon..." #: kedittoolbar.cpp:1049 -#, fuzzy, kde-format -#| msgctxt "@title:window" -#| msgid "Change Text" +#, kde-format msgctxt "@action:button" msgid "Change Te&xt…" -msgstr "Ændr tekst" +msgstr "Ændr te&kst..." #: kedittoolbar.cpp:1191 #, kde-format @@ -703,10 +676,9 @@ msgstr "" "
Vælg venligst en anden." #: kkeysequencewidget.cpp:275 -#, fuzzy, kde-format -#| msgid "Shortcut '%1' in Application %2 for action %3\n" +#, kde-format msgid "Shortcut '%1' in Application '%2' for action '%3'\n" -msgstr "Genvejen \"%1\" i programmet %2 til handlingen %3\n" +msgstr "Genvejen '%1' i programmet '%2' til handlingen '%3'\n" #: kkeysequencewidget.cpp:284 #, kde-format @@ -796,9 +768,7 @@ msgid "Add to Toolbar" msgstr "Tilføj til værktøjslinje" #: kmenumenuhandler_p.cpp:224 -#, fuzzy, kde-format -#| msgctxt "@action:inmenu" -#| msgid "Configure Shortcut..." +#, kde-format msgctxt "@action:inmenu" msgid "Configure Shortcut…" msgstr "Indstil genvej..." @@ -830,7 +800,7 @@ msgstr "Nuværende skema:" #, kde-format msgctxt "@action:button" msgid "New…" -msgstr "" +msgstr "Ny..." #: kshortcutschemeseditor.cpp:50 #, kde-format @@ -851,17 +821,13 @@ msgid "Save shortcuts to scheme" msgstr "Gem genveje i skema" #: kshortcutschemeseditor.cpp:62 -#, fuzzy, kde-format -#| msgctxt "@action:inmenu" -#| msgid "Export Scheme..." +#, kde-format msgctxt "@action:inmenu" msgid "Export Scheme…" msgstr "Eksportér skema..." #: kshortcutschemeseditor.cpp:66 -#, fuzzy, kde-format -#| msgctxt "@action:inmenu" -#| msgid "Import Scheme..." +#, kde-format msgctxt "@action:inmenu" msgid "Import Scheme…" msgstr "Importér skema..." @@ -1263,9 +1229,7 @@ msgstr "%1 (%2)" #. the message, translating "Press Shift to learn more." would also mostly fit what #. is supposed to be expressed here. #: ktooltiphelper.cpp:281 -#, fuzzy, kde-format -#| msgid "" -#| "Press Shift for more Info." +#, kde-format msgctxt "@info:tooltip" msgid "" "Press Shift for more Info." @@ -1284,10 +1248,7 @@ msgstr "" #. %1 can be any tooltip.
produces a linebreak. The other things between < and > are #. styling information. The word "more" refers to "information". #: ktooltiphelper.cpp:295 -#, fuzzy, kde-format -#| msgid "" -#| "%1
Press Shift for more." +#, kde-format msgctxt "@info:tooltip keep short" msgid "" "%1
Press Shift for more." @@ -1310,10 +1271,9 @@ msgid "No text" msgstr "Ingen tekst" #: kxmlguiwindow.cpp:191 -#, fuzzy, kde-format -#| msgid "Action" +#, kde-format msgid "Find Action…" -msgstr "Handling" +msgstr "Find handling..." #: kxmlguiwindow.cpp:529 #, kde-format diff -pruN 6.4.0-1/po/eu/kxmlgui6.po 6.5.0-1/po/eu/kxmlgui6.po --- 6.4.0-1/po/eu/kxmlgui6.po 2024-07-05 20:09:51.000000000 +0000 +++ 6.5.0-1/po/eu/kxmlgui6.po 2024-08-02 11:16:31.000000000 +0000 @@ -1,27 +1,27 @@ # Translation for kxmlgui5.po to Euskara/Basque (eu). -# Copyright (C) 2017-2023 This file is copyright: +# Copyright (C) 2017-2024 This file is copyright: # This file is distributed under the same license as the kxmlgui package. -# SPDX-FileCopyrightText: 2023 KDE euskaratzeko proiektuko arduraduna +# SPDX-FileCopyrightText: 2023, 2024 KDE euskaratzeko proiektuko arduraduna # # Translators: # Marcos , 2002,2003, 2004, 2005. # Ion Gaztañaga , 2005. # marcos , 2006, 2007, 2008, 2009, 2010. # Iñaki Larrañaga Murgoitio , 2009. -# Iñigo Salvador Azurmendi , 2010, 2011, 2012, 2013, 2014, 2017, 2018, 2019, 2020, 2021, 2022, 2023. +# Iñigo Salvador Azurmendi , 2010, 2011, 2012, 2013, 2014, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024. msgid "" msgstr "" "Project-Id-Version: kxmlgui\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2024-06-22 00:37+0000\n" -"PO-Revision-Date: 2023-11-25 09:20+0100\n" +"PO-Revision-Date: 2024-07-09 13:57+0200\n" "Last-Translator: Iñigo Salvador Azurmendi \n" "Language-Team: Basque \n" "Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 23.08.3\n" +"X-Generator: Lokalize 24.05.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: kaboutapplicationcomponentlistdelegate_p.cpp:51 @@ -542,19 +542,16 @@ msgid "Curr&ent actions:" msgstr "&Uneko ekintzak:" #: kedittoolbar.cpp:1040 -#, fuzzy, kde-format -#| msgid "Change Icon" +#, kde-format msgctxt "@action:button" msgid "Change &Icon…" -msgstr "Aldatu ikonoa" +msgstr "Aldatu &ikonoa..." #: kedittoolbar.cpp:1049 -#, fuzzy, kde-format -#| msgctxt "@title:window" -#| msgid "Change Text" +#, kde-format msgctxt "@action:button" msgid "Change Te&xt…" -msgstr "Aldatu testua" +msgstr "Aldatu te&stua..." #: kedittoolbar.cpp:1191 #, kde-format @@ -779,9 +776,7 @@ msgid "Add to Toolbar" msgstr "Gehitu tresna-barrari" #: kmenumenuhandler_p.cpp:224 -#, fuzzy, kde-format -#| msgctxt "@action:inmenu" -#| msgid "Configure Shortcut..." +#, kde-format msgctxt "@action:inmenu" msgid "Configure Shortcut…" msgstr "Konfiguratu lasterbidea..." @@ -813,7 +808,7 @@ msgstr "Uneko antolaera:" #, kde-format msgctxt "@action:button" msgid "New…" -msgstr "" +msgstr "Berria…" #: kshortcutschemeseditor.cpp:50 #, kde-format @@ -834,17 +829,13 @@ msgid "Save shortcuts to scheme" msgstr "Gorde lasterbideak antolaeran" #: kshortcutschemeseditor.cpp:62 -#, fuzzy, kde-format -#| msgctxt "@action:inmenu" -#| msgid "Export Scheme..." +#, kde-format msgctxt "@action:inmenu" msgid "Export Scheme…" msgstr "Esportatu antolaera..." #: kshortcutschemeseditor.cpp:66 -#, fuzzy, kde-format -#| msgctxt "@action:inmenu" -#| msgid "Import Scheme..." +#, kde-format msgctxt "@action:inmenu" msgid "Import Scheme…" msgstr "Inportatu antolaera..." diff -pruN 6.4.0-1/po/nn/kxmlgui6.po 6.5.0-1/po/nn/kxmlgui6.po --- 6.4.0-1/po/nn/kxmlgui6.po 2024-07-05 20:09:51.000000000 +0000 +++ 6.5.0-1/po/nn/kxmlgui6.po 2024-08-02 11:16:31.000000000 +0000 @@ -2,7 +2,6 @@ # # Gaute Hvoslef Kvalnes , 2003, 2004, 2005, 2006. # Håvard Korsvoll , 2003, 2005. -# Karl Ove Hufthammer , 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023. # Eirik U. Birkeland , 2008, 2009, 2010. # Øystein Steffensen-Alværvik , 2022. msgid "" @@ -10,14 +9,14 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2024-06-22 00:37+0000\n" -"PO-Revision-Date: 2023-07-31 21:57+0200\n" +"PO-Revision-Date: 2024-07-06 16:47+0200\n" "Last-Translator: Karl Ove Hufthammer \n" "Language-Team: Norwegian Nynorsk \n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 23.04.3\n" +"X-Generator: Lokalize 24.05.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" @@ -186,15 +185,7 @@ msgstr "" "systemet. Sjå då til at du har markert feil­rapporten med «Wishlist»." #: kaboutkdedialog_p.cpp:85 -#, fuzzy, kde-format -#| msgid "" -#| "You do not have to be a software developer to be a member of the " -#| "KDE team. You can join the national teams that translate program " -#| "interfaces. You can provide graphics, themes, sounds, and improved " -#| "documentation. You decide!

Visit %1 for " -#| "information on some projects in which you can participate.

If " -#| "you need more information or documentation, then a visit to %2 will provide you with what you need." +#, kde-format msgid "" "You do not have to be a software developer to be a member of the KDE " "team. You can join the language teams that translate program interfaces. You " @@ -245,6 +236,7 @@ msgctxt "@title:tab About KDE" msgid "&About" msgstr "&Om" +# skip-rule: e-infinitiv #: kaboutkdedialog_p.cpp:129 #, kde-format msgctxt "@title:tab" @@ -318,15 +310,15 @@ msgid "" "from the 'Settings' menu to solve the ambiguity.\n" "No action will be triggered." msgstr "" -"Snøggtasten «%1» er tvetydig. Vel «Set opp snøggtastar»\n" -"frå «Innstillingar»-menyen for å løysa konflikta.\n" +"Snøggtasten «%1» er tvitydig. Vel «Set opp snøggtastar»\n" +"frå «Innstillingar»-menyen for å løysa konflikten.\n" "Inga handling vart utført." #: kactionconflictdetector.cpp:42 #, kde-format msgctxt "@title:window" msgid "Ambiguous shortcut detected" -msgstr "Oppdaga tvetydig snøggtast" +msgstr "Oppdaga tvitydig snøggtast" #: kbugreport.cpp:62 #, kde-format @@ -487,7 +479,7 @@ msgstr "Ikon&tekst:" #, kde-format msgctxt "@option:check" msgid "&Hide text when toolbar shows text alongside icons" -msgstr "&Gøym tekst når verktøylinja viser tekst ved sidan av ikona" +msgstr "&Gøym tekst når verktøylinja viser tekst ved sida av ikona" #: kedittoolbar.cpp:591 #, kde-format @@ -542,19 +534,16 @@ msgid "Curr&ent actions:" msgstr "Nov&erande handlingar:" #: kedittoolbar.cpp:1040 -#, fuzzy, kde-format -#| msgid "Change Icon" +#, kde-format msgctxt "@action:button" msgid "Change &Icon…" -msgstr "Endra ikon" +msgstr "Endra &ikon …" #: kedittoolbar.cpp:1049 -#, fuzzy, kde-format -#| msgctxt "@title:window" -#| msgid "Change Text" +#, kde-format msgctxt "@action:button" msgid "Change Te&xt…" -msgstr "Endra tekst" +msgstr "Endra &tekst …" #: kedittoolbar.cpp:1191 #, kde-format @@ -627,7 +616,7 @@ 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 "" -"Trykk på knappen, og skriv så inn snarvegen du ønskjer å bruka.\n" +"Trykk på knappen, og skriv så inn snøggtasten du ønskjer å bruka.\n" "For eksempel for «Ctrl + A»: Hald inne «Ctrl»-tasten og trykk «A»." #: kkeysequencewidget.cpp:169 @@ -778,9 +767,7 @@ msgid "Add to Toolbar" msgstr "Legg til verktøylinje" #: kmenumenuhandler_p.cpp:224 -#, fuzzy, kde-format -#| msgctxt "@action:inmenu" -#| msgid "Configure Shortcut..." +#, kde-format msgctxt "@action:inmenu" msgid "Configure Shortcut…" msgstr "Set opp snarveg …" @@ -812,7 +799,7 @@ msgstr "Gjeldande oppsett:" #, kde-format msgctxt "@action:button" msgid "New…" -msgstr "" +msgstr "Ny …" #: kshortcutschemeseditor.cpp:50 #, kde-format @@ -833,17 +820,13 @@ msgid "Save shortcuts to scheme" msgstr "Lagra snøggtastar til snøggtastoppsett" #: kshortcutschemeseditor.cpp:62 -#, fuzzy, kde-format -#| msgctxt "@action:inmenu" -#| msgid "Export Scheme..." +#, kde-format msgctxt "@action:inmenu" msgid "Export Scheme…" msgstr "Eksporter oppsett …" #: kshortcutschemeseditor.cpp:66 -#, fuzzy, kde-format -#| msgctxt "@action:inmenu" -#| msgid "Import Scheme..." +#, kde-format msgctxt "@action:inmenu" msgid "Import Scheme…" msgstr "Importer oppsett …" @@ -898,7 +881,7 @@ msgstr "Importer snøggtastar" #: kshortcutschemeseditor.cpp:209 #, kde-format msgid "Shortcut scheme successfully saved." -msgstr "Snøggtastoppsetter er no lagra." +msgstr "Snøggtastoppsettet er no lagra." #: kshortcutschemeseditor.cpp:212 #, kde-format @@ -1301,7 +1284,7 @@ msgstr "" #: kxmlguiwindow.cpp:534 #, kde-format msgid "Ambiguous Shortcuts" -msgstr "Tvetydige snøggtastar" +msgstr "Tvitydige snøggtastar" #. i18n: ectx: Menu (file) #: ui_standards.rc:5 diff -pruN 6.4.0-1/src/kshortcutsdialog_p.h 6.5.0-1/src/kshortcutsdialog_p.h --- 6.4.0-1/src/kshortcutsdialog_p.h 2024-07-05 20:09:51.000000000 +0000 +++ 6.5.0-1/src/kshortcutsdialog_p.h 2024-08-02 11:16:31.000000000 +0000 @@ -329,21 +329,6 @@ private: // NEEDED FOR KShortcutsEditorPrivate #include "ui_kshortcutsdialog.h" -// Hack to make two protected methods public. -// Used by both KShortcutsEditorPrivate and KShortcutsEditorDelegate -class QTreeWidgetHack : public QTreeWidget -{ -public: - QTreeWidgetItem *itemFromIndex(const QModelIndex &index) const - { - return QTreeWidget::itemFromIndex(index); - } - QModelIndex indexFromItem(QTreeWidgetItem *item, int column) const - { - return QTreeWidget::indexFromItem(item, column); - } -}; - /** * This class should belong into kshortcutseditor.cpp. But kshortcutseditordelegate uses a static * function of this class. So for now it's here. But i will remove it later. diff -pruN 6.4.0-1/src/kshortcutseditor.cpp 6.5.0-1/src/kshortcutseditor.cpp --- 6.4.0-1/src/kshortcutseditor.cpp 2024-07-05 20:09:51.000000000 +0000 +++ 6.5.0-1/src/kshortcutseditor.cpp 2024-08-02 11:16:31.000000000 +0000 @@ -16,7 +16,7 @@ #include "kshortcutseditor.h" -// The following is needed for KShortcutsEditorPrivate and QTreeWidgetHack +// The following is needed for KShortcutsEditorPrivate #include "debug.h" #include "kshortcutsdialog_p.h" @@ -391,7 +391,7 @@ void KShortcutsEditorPrivate::allDefault // static KShortcutsEditorItem *KShortcutsEditorPrivate::itemFromIndex(QTreeWidget *const w, const QModelIndex &index) { - QTreeWidgetItem *item = static_cast(w)->itemFromIndex(index); + QTreeWidgetItem *item = w->itemFromIndex(index); if (item && item->type() == ActionItem) { return static_cast(item); } diff -pruN 6.4.0-1/tests/krichtexteditor/main.cpp 6.5.0-1/tests/krichtexteditor/main.cpp --- 6.4.0-1/tests/krichtexteditor/main.cpp 2024-07-05 20:09:51.000000000 +0000 +++ 6.5.0-1/tests/krichtexteditor/main.cpp 2024-08-02 11:16:31.000000000 +0000 @@ -14,5 +14,5 @@ int main(int argc, char **argv) QApplication app(argc, argv); KRichTextEditor *mw = new KRichTextEditor(); mw->show(); - app.exec(); + return app.exec(); }