Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kscreen5 for openSUSE:Factory checked in at 2023-03-17 17:01:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kscreen5 (Old) and /work/SRC/openSUSE:Factory/.kscreen5.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kscreen5" Fri Mar 17 17:01:27 2023 rev:147 rq:1071991 version:5.27.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kscreen5/kscreen5.changes 2023-03-02 23:02:35.670917658 +0100 +++ /work/SRC/openSUSE:Factory/.kscreen5.new.31432/kscreen5.changes 2023-03-17 17:01:34.436835240 +0100 @@ -1,0 +2,10 @@ +Tue Mar 14 15:05:53 UTC 2023 - Fabian Vogt <[email protected]> + +- Update to 5.27.3 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.27.3 +- Changes since 5.27.2: + * kded/output: with duplicate edid hashes, use different global config files (kde#452614,kde#448599) + +------------------------------------------------------------------- Old: ---- kscreen-5.27.2.tar.xz kscreen-5.27.2.tar.xz.sig New: ---- kscreen-5.27.3.tar.xz kscreen-5.27.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kscreen5.spec ++++++ --- /var/tmp/diff_new_pack.LG42MZ/_old 2023-03-17 17:01:36.028843582 +0100 +++ /var/tmp/diff_new_pack.LG42MZ/_new 2023-03-17 17:01:36.032843603 +0100 @@ -20,7 +20,7 @@ %bcond_without released Name: kscreen5 -Version: 5.27.2 +Version: 5.27.3 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}} ++++++ kscreen-5.27.2.tar.xz -> kscreen-5.27.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/CMakeLists.txt new/kscreen-5.27.3/CMakeLists.txt --- old/kscreen-5.27.2/CMakeLists.txt 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/CMakeLists.txt 2023-03-14 13:24:02.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16) project(KScreen) -set(PROJECT_VERSION "5.27.2") +set(PROJECT_VERSION "5.27.3") set(KSCREEN_VERSION ${PROJECT_VERSION}) add_definitions("-DKSCREEN_VERSION=\"${KSCREEN_VERSION}\"") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/kded/config.cpp new/kscreen-5.27.3/kded/config.cpp --- old/kscreen-5.27.2/kded/config.cpp 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/kded/config.cpp 2023-03-14 13:24:02.000000000 +0100 @@ -229,6 +229,12 @@ oldOutputs = oldConfig->data()->outputs(); } + const auto hasDuplicate = [&outputs](const auto output) { + return std::any_of(outputs.begin(), outputs.end(), [output](const auto &o) { + return o != output && o->hashMd5() == output->hashMd5(); + }); + }; + QVariantList outputList; for (const KScreen::OutputPtr &output : outputs) { QVariantMap info; @@ -260,7 +266,7 @@ if (output->isEnabled() && m_control->getOutputRetention(output->hash(), output->name()) != Control::OutputRetention::Individual) { // try to update global output data - Output::writeGlobal(output); + Output::writeGlobal(output, hasDuplicate(output)); } outputList.append(info); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/kded/output.cpp new/kscreen-5.27.3/kded/output.cpp --- old/kscreen-5.27.2/kded/output.cpp 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/kded/output.cpp 2023-03-14 13:24:02.000000000 +0100 @@ -27,15 +27,6 @@ return Globals::dirPath() % s_dirName; } -QString Output::globalFileName(const QString &hash) -{ - const auto dir = dirPath(); - if (!QDir().mkpath(dir)) { - return QString(); - } - return dir % hash; -} - static Output::GlobalConfig fromInfo(const KScreen::OutputPtr output, const QVariantMap &info) { Output::GlobalConfig config; @@ -116,19 +107,26 @@ QVariantMap Output::getGlobalData(KScreen::OutputPtr output) { - QString fileName = Globals::findFile(s_dirName % output->hashMd5()); - if (fileName.isEmpty()) { - qCDebug(KSCREEN_KDED) << "No file for" << s_dirName % output->hashMd5(); - return QVariantMap(); + const auto tryFile = [output](const auto &name) { + QString fileName = Globals::findFile(name); + if (fileName.isEmpty()) { + qCDebug(KSCREEN_KDED) << "No file for" << name; + return QVariantMap(); + } + QFile file(fileName); + if (!file.open(QIODevice::ReadOnly)) { + qCDebug(KSCREEN_KDED) << "Failed to open file" << file.fileName(); + return QVariantMap(); + } + qCDebug(KSCREEN_KDED) << "Found global data at" << file.fileName(); + QJsonDocument parser; + return parser.fromJson(file.readAll()).toVariant().toMap(); + }; + auto specific = tryFile(s_dirName % output->hashMd5() % output->name()); + if (!specific.isEmpty()) { + return specific; } - QFile file(fileName); - if (!file.open(QIODevice::ReadOnly)) { - qCDebug(KSCREEN_KDED) << "Failed to open file" << file.fileName(); - return QVariantMap(); - } - qCDebug(KSCREEN_KDED) << "Found global data at" << file.fileName(); - QJsonDocument parser; - return parser.fromJson(file.readAll()).toVariant().toMap(); + return tryFile(s_dirName % output->hashMd5()); } bool Output::readInGlobal(KScreen::OutputPtr output) @@ -484,7 +482,7 @@ return true; } -void Output::writeGlobal(const KScreen::OutputPtr &output) +void Output::writeGlobal(const KScreen::OutputPtr &output, bool hasDuplicate) { // get old values and subsequently override QVariantMap info = getGlobalData(output); @@ -492,7 +490,15 @@ return; } - QFile file(globalFileName(output->hashMd5())); + if (!QDir().mkpath(dirPath())) { + return; + } + QString fileName = dirPath() % output->hashMd5() % output->name(); + if (!hasDuplicate && !QFile(fileName).exists()) { + // connector-specific file doesn't exist yet, use the non-specific one instead + fileName = dirPath() % output->hashMd5(); + } + QFile file(fileName); if (!file.open(QIODevice::WriteOnly)) { qCWarning(KSCREEN_KDED) << "Failed to open global output file for writing! " << file.errorString(); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/kded/output.h new/kscreen-5.27.3/kded/output.h --- old/kscreen-5.27.2/kded/output.h 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/kded/output.h 2023-03-14 13:24:02.000000000 +0100 @@ -23,7 +23,7 @@ public: static void readInOutputs(KScreen::ConfigPtr config, const QVariantList &outputsInfo); - static void writeGlobal(const KScreen::OutputPtr &output); + static void writeGlobal(const KScreen::OutputPtr &output, bool hasDuplicate); static bool writeGlobalPart(const KScreen::OutputPtr &output, QVariantMap &info, const KScreen::OutputPtr &fallback); static QString dirPath(); @@ -41,7 +41,6 @@ static GlobalConfig readGlobal(const KScreen::OutputPtr &output); private: - static QString globalFileName(const QString &hash); static QVariantMap getGlobalData(KScreen::OutputPtr output); static void readIn(KScreen::OutputPtr output, const QVariantMap &info, Control::OutputRetention retention); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/po/ca@valencia/kcm_kscreen.po new/kscreen-5.27.3/po/ca@valencia/kcm_kscreen.po --- old/kscreen-5.27.2/po/ca@valencia/kcm_kscreen.po 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/po/ca@valencia/kcm_kscreen.po 2023-03-14 13:24:02.000000000 +0100 @@ -190,8 +190,8 @@ msgstr "" "Determina en quina pantalla apareixeran l'escriptori i el tauler principals. " "Alguns jocs més antics també l'utilitzen per decidir en quina pantalla " -"apareixeran.<nl/><nl/>No té cap efecte a on apareixeran les notificacions de " -"pantalla o altres finestres." +"apareixeran.<nl/><nl/>No té cap efecte sobre a on apareixeran les " +"notificacions de pantalla o les altres finestres." #: package/contents/ui/OutputPanel.qml:53 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/po/en_GB/kcm_kscreen.po new/kscreen-5.27.3/po/en_GB/kcm_kscreen.po --- old/kscreen-5.27.2/po/en_GB/kcm_kscreen.po 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/po/en_GB/kcm_kscreen.po 2023-03-14 13:24:02.000000000 +0100 @@ -9,7 +9,7 @@ "POT-Creation-Date: 2022-12-30 00:54+0000\n" "PO-Revision-Date: 2022-12-31 15:46+0000\n" "Last-Translator: Steve Allewell <[email protected]>\n" -"Language-Team: English <[email protected]>\n" +"Language-Team: British English <[email protected]>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/po/en_GB/kscreen_common.po new/kscreen-5.27.3/po/en_GB/kscreen_common.po --- old/kscreen-5.27.2/po/en_GB/kscreen_common.po 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/po/en_GB/kscreen_common.po 2023-03-14 13:24:02.000000000 +0100 @@ -9,7 +9,7 @@ "POT-Creation-Date: 2023-01-25 02:55+0000\n" "PO-Revision-Date: 2023-02-27 22:41+0000\n" "Last-Translator: Steve Allewell <[email protected]>\n" -"Language-Team: English <[email protected]>\n" +"Language-Team: British English <[email protected]>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/po/fi/kcm_kscreen.po new/kscreen-5.27.3/po/fi/kcm_kscreen.po --- old/kscreen-5.27.2/po/fi/kcm_kscreen.po 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/po/fi/kcm_kscreen.po 2023-03-14 13:24:02.000000000 +0100 @@ -1,20 +1,20 @@ # KDE Finnish translation sprint participants: # Lasse Liehu <[email protected]>, 2013, 2014, 2015, 2016, 2022. -# Tommi Nieminen <[email protected]>, 2017, 2018, 2019, 2020, 2021, 2022. +# Tommi Nieminen <[email protected]>, 2017, 2018, 2019, 2020, 2021, 2022, 2023. msgid "" msgstr "" "Project-Id-Version: kcm_displayconfiguration\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-12-30 00:54+0000\n" -"PO-Revision-Date: 2022-10-30 16:57+0200\n" -"Last-Translator: Lasse Liehu <[email protected]>\n" +"PO-Revision-Date: 2023-03-05 19:23+0200\n" +"Last-Translator: Tommi Nieminen <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-POT-Import-Date: 2013-01-13 21:18:05+0000\n" -"X-Generator: Lokalize 22.08.2\n" +"X-Generator: Lokalize 22.12.3\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: output_model.cpp:98 @@ -70,7 +70,7 @@ #, kde-format msgctxt "@info" msgid "All displays are disabled. Enable at least one." -msgstr "" +msgstr "Kaikki näytöt on poistettu käytöstä. Ota vähintään yksi käyttöön." #: package/contents/ui/main.qml:107 package/contents/ui/main.qml:289 #, kde-format @@ -78,6 +78,8 @@ msgid "" "Gaps between displays are not supported. Make sure all displays are touching." msgstr "" +"Näyttöjen välisiä aukkoja ei tueta. Varmista, että näytöt koskettavat " +"toisiaan." #: package/contents/ui/main.qml:119 package/contents/ui/main.qml:302 #, kde-format @@ -100,14 +102,11 @@ msgstr "Ulostuloja ei virheen takia voitu tallentaa." #: package/contents/ui/main.qml:191 -#, fuzzy, kde-format -#| msgid "" -#| "New global scale applied. Changes will come into effect after the system " -#| "is restarted." +#, kde-format msgid "" "Global scale changes will come into effect after the system is restarted." msgstr "" -"Mittakaavaa on muutettu. Muutokset tulevat voimaan järjestelmän " +"Yleismittakaavan muutokset tulevat voimaan järjestelmän " "uudelleenkäynnistyksen jälkeen." #: package/contents/ui/main.qml:197 @@ -124,7 +123,7 @@ #, kde-format msgctxt "@title:window" msgid "Change Priorities" -msgstr "" +msgstr "Muuta etusijaisuuksia" #: package/contents/ui/main.qml:254 package/contents/ui/OutputPanel.qml:42 #, kde-format @@ -134,12 +133,12 @@ #: package/contents/ui/main.qml:260 #, kde-format msgid "Raise priority" -msgstr "" +msgstr "Nosta etusijaisuutta" #: package/contents/ui/main.qml:270 #, kde-format msgid "Lower priority" -msgstr "" +msgstr "Laske etusijaisuutta" #: package/contents/ui/Orientation.qml:12 #, kde-format @@ -176,7 +175,7 @@ #: package/contents/ui/OutputPanel.qml:35 #, kde-format msgid "Change Screen Prioritiesâ¦" -msgstr "" +msgstr "Muuta näyttöjen etusijaisuuksiaâ¦" #: package/contents/ui/OutputPanel.qml:48 #, kde-kuit-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/po/fi/kscreen_common.po new/kscreen-5.27.3/po/fi/kscreen_common.po --- old/kscreen-5.27.2/po/fi/kscreen_common.po 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/po/fi/kscreen_common.po 2023-03-14 13:24:02.000000000 +0100 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # Lasse Liehu <[email protected]>, 2013. -# Tommi Nieminen <[email protected]>, 2016, 2018. +# Tommi Nieminen <[email protected]>, 2016, 2018, 2023. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2023-01-25 02:55+0000\n" -"PO-Revision-Date: 2018-07-23 12:57+0200\n" +"PO-Revision-Date: 2023-02-23 19:58+0200\n" "Last-Translator: Tommi Nieminen <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" "Language: fi\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 22.12.2\n" #: osdaction.cpp:22 #, kde-format @@ -52,7 +52,7 @@ #: utils.cpp:21 #, kde-format msgid "Built-in Screen" -msgstr "" +msgstr "Sisäänrakennettu näyttö" #~ msgid "Switch Display" #~ msgstr "Vaihda näyttöä" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/po/nn/kcm_kscreen.po new/kscreen-5.27.3/po/nn/kcm_kscreen.po --- old/kscreen-5.27.2/po/nn/kcm_kscreen.po 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/po/nn/kcm_kscreen.po 2023-03-14 13:24:02.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-12-30 00:54+0000\n" -"PO-Revision-Date: 2023-01-15 11:51+0100\n" +"PO-Revision-Date: 2023-03-04 17:01+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" "Language: nn\n" @@ -14,7 +14,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 22.12.1\n" +"X-Generator: Lokalize 22.12.2\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -188,7 +188,7 @@ msgstr "" "Kva skjerm hovudÂskrivebordet og panelet skal visast pÃ¥. Nokre gamle spel " "brukar det òg til Ã¥ velja kva skjerm dei skal visast pÃ¥.<nl/><nl/>Det " -"pÃ¥verkar ikkje kva skjerm varslingar eller andre vindauge vert viste pÃ¥." +"pÃ¥verkar ikkje kva for ein skjerm varslingar og andre vindauge vert viste pÃ¥." #: package/contents/ui/OutputPanel.qml:53 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/po/pl/plasma_applet_org.kde.kscreen.po new/kscreen-5.27.3/po/pl/plasma_applet_org.kde.kscreen.po --- old/kscreen-5.27.2/po/pl/plasma_applet_org.kde.kscreen.po 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/po/pl/plasma_applet_org.kde.kscreen.po 2023-03-14 13:24:02.000000000 +0100 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This file is copyright: # This file is distributed under the same license as the kscreen package. # -# Åukasz WojniÅowicz <[email protected]>, 2018, 2021. +# Åukasz WojniÅowicz <[email protected]>, 2018, 2021, 2023. msgid "" msgstr "" "Project-Id-Version: kscreen\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2023-01-14 11:31+0000\n" -"PO-Revision-Date: 2021-11-13 08:57+0100\n" +"PO-Revision-Date: 2023-03-05 08:36+0100\n" "Last-Translator: Åukasz WojniÅowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 20.12.1\n" +"X-Generator: Lokalize 22.12.2\n" #: package/contents/ui/main.qml:22 #, kde-format @@ -42,8 +42,7 @@ #, kde-format msgid "" "This will prevent your screen and computer from turning off automatically." -msgstr "" -"BÄdzie to przeciwdziaÅaÄ samoczynnemu wyÅÄ czeniu siÄ komputera i ekranu." +msgstr "Po zaznaczeniu twój ekran i komputer nie bÄdÄ siÄ same wyÅÄ czaÄ." #: package/contents/ui/PresentationModeItem.qml:75 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/po/zh_CN/kcm_kscreen.po new/kscreen-5.27.3/po/zh_CN/kcm_kscreen.po --- old/kscreen-5.27.2/po/zh_CN/kcm_kscreen.po 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/po/zh_CN/kcm_kscreen.po 2023-03-14 13:24:02.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-12-30 00:54+0000\n" -"PO-Revision-Date: 2023-02-24 12:59\n" +"PO-Revision-Date: 2023-03-11 04:55\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/po/zh_CN/kscreen.po new/kscreen-5.27.3/po/zh_CN/kscreen.po --- old/kscreen-5.27.2/po/zh_CN/kscreen.po 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/po/zh_CN/kscreen.po 2023-03-14 13:24:02.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-11-05 00:47+0000\n" -"PO-Revision-Date: 2023-02-24 12:59\n" +"PO-Revision-Date: 2023-03-11 04:55\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/po/zh_CN/kscreen_common.po new/kscreen-5.27.3/po/zh_CN/kscreen_common.po --- old/kscreen-5.27.2/po/zh_CN/kscreen_common.po 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/po/zh_CN/kscreen_common.po 2023-03-14 13:24:02.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2023-01-25 02:55+0000\n" -"PO-Revision-Date: 2023-02-24 12:59\n" +"PO-Revision-Date: 2023-03-11 04:55\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/po/zh_CN/plasma_applet_org.kde.kscreen.po new/kscreen-5.27.3/po/zh_CN/plasma_applet_org.kde.kscreen.po --- old/kscreen-5.27.2/po/zh_CN/plasma_applet_org.kde.kscreen.po 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/po/zh_CN/plasma_applet_org.kde.kscreen.po 2023-03-14 13:24:02.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2023-01-14 11:31+0000\n" -"PO-Revision-Date: 2023-02-24 12:59\n" +"PO-Revision-Date: 2023-03-11 04:55\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kscreen-5.27.2/tests/kded/testgenerator.cpp new/kscreen-5.27.3/tests/kded/testgenerator.cpp --- old/kscreen-5.27.2/tests/kded/testgenerator.cpp 2023-02-28 13:18:25.000000000 +0100 +++ new/kscreen-5.27.3/tests/kded/testgenerator.cpp 2023-03-14 13:24:02.000000000 +0100 @@ -550,7 +550,7 @@ output->setCurrentModeId(QStringLiteral("2")); output->setRotation(KScreen::Output::Left); output->setScale(2.0); - ::Output::writeGlobal(output); + ::Output::writeGlobal(output, false); config = Generator::self()->idealConfig(currentConfig); output = config->connectedOutputs().first(); @@ -588,7 +588,7 @@ presetOutput->setCurrentModeId(QStringLiteral("2")); presetOutput->setRotation(KScreen::Output::Left); presetOutput->setScale(2.0); - ::Output::writeGlobal(presetOutput); + ::Output::writeGlobal(presetOutput, false); QDir(dataDir.path()).mkpath(QStringLiteral("kscreen/outputs")); QFile::copy(::Output::dirPath() + presetOutput->hashMd5(), dataDir.filePath(QStringLiteral("kscreen/outputs/") % presetOutput->hashMd5())); QFile::remove(::Output::dirPath() + presetOutput->hashMd5()); @@ -600,7 +600,7 @@ QCOMPARE(output->scale(), 2.0); // But local global settings should still overwrite - ::Output::writeGlobal(defaultOutput); + ::Output::writeGlobal(defaultOutput, false); config = Generator::self()->idealConfig(currentConfig); output = config->connectedOutputs().first(); QCOMPARE(output->currentModeId(), QLatin1String("3"));
