Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package incidenceeditor for openSUSE:Factory
checked in at 2021-10-13 18:02:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/incidenceeditor (Old)
and /work/SRC/openSUSE:Factory/.incidenceeditor.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "incidenceeditor"
Wed Oct 13 18:02:10 2021 rev:68 rq:923845 version:21.08.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/incidenceeditor/incidenceeditor.changes
2021-09-04 22:34:23.368074713 +0200
+++
/work/SRC/openSUSE:Factory/.incidenceeditor.new.2443/incidenceeditor.changes
2021-10-13 18:02:28.574935045 +0200
@@ -1,0 +2,10 @@
+Tue Oct 5 16:27:44 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 21.08.2
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/gear/21.08.2/
+- Changes since 21.08.1:
+ * Do not create duplicate tags (kde#441846)
+
+-------------------------------------------------------------------
Old:
----
incidenceeditor-21.08.1.tar.xz
incidenceeditor-21.08.1.tar.xz.sig
New:
----
incidenceeditor-21.08.2.tar.xz
incidenceeditor-21.08.2.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ incidenceeditor.spec ++++++
--- /var/tmp/diff_new_pack.bQ7HCR/_old 2021-10-13 18:02:29.174935986 +0200
+++ /var/tmp/diff_new_pack.bQ7HCR/_new 2021-10-13 18:02:29.178935992 +0200
@@ -21,7 +21,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: incidenceeditor
-Version: 21.08.1
+Version: 21.08.2
Release: 0
Summary: Incidenceeditor library
License: GPL-2.0-or-later AND LGPL-2.1-or-later
++++++ incidenceeditor-21.08.1.tar.xz -> incidenceeditor-21.08.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/incidenceeditor-21.08.1/.gitlab-ci.yml
new/incidenceeditor-21.08.2/.gitlab-ci.yml
--- old/incidenceeditor-21.08.1/.gitlab-ci.yml 2021-08-17 18:05:00.000000000
+0200
+++ new/incidenceeditor-21.08.2/.gitlab-ci.yml 2021-09-30 03:05:30.000000000
+0200
@@ -31,4 +31,4 @@
- cd build && run-clang-tidy
variables:
PLATFORM: SUSEQt5.15
- BRANCH_GROUP: kf5-qt5
+ BRANCH_GROUP: stable-kf5-qt5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/incidenceeditor-21.08.1/CMakeLists.txt
new/incidenceeditor-21.08.2/CMakeLists.txt
--- old/incidenceeditor-21.08.1/CMakeLists.txt 2021-08-17 18:05:00.000000000
+0200
+++ new/incidenceeditor-21.08.2/CMakeLists.txt 2021-09-30 03:05:30.000000000
+0200
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
-set(PIM_VERSION "5.18.1")
+set(PIM_VERSION "5.18.2")
project(incidenceeditor VERSION ${PIM_VERSION})
@@ -26,21 +26,21 @@
set(INCIDENCEEDITOR_LIB_VERSION ${PIM_VERSION})
-set(AKONADI_MIMELIB_VERSION "5.18.1")
-set(KDEPIM_LIB_VERSION "5.18.1")
+set(AKONADI_MIMELIB_VERSION "5.18.2")
+set(KDEPIM_LIB_VERSION "5.18.2")
set(QT_REQUIRED_VERSION "5.15.0")
-set(KMIME_LIB_VERSION "5.18.1")
-set(KMAILTRANSPORT_LIB_VERSION "5.18.1")
-set(KLDAP_LIB_VERSION "5.18.1")
-set(CALENDARUTILS_LIB_VERSION "5.18.1")
-set(CALENDARSUPPORT_LIB_VERSION "5.18.1")
-set(LIBKDEPIM_LIB_VERSION "5.18.1")
-set(EVENTVIEW_LIB_VERSION "5.18.1")
-set(AKONADI_VERSION "5.18.1")
-set(AKONADICONTACT_LIB_VERSION "5.18.1")
-set(AKONADICALENDAR_LIB_VERSION "5.18.1")
-set(PIMCOMMON_LIB_VERSION "5.18.1")
-set(GRANTLEETHEME_LIB_VERSION "5.18.1")
+set(KMIME_LIB_VERSION "5.18.2")
+set(KMAILTRANSPORT_LIB_VERSION "5.18.2")
+set(KLDAP_LIB_VERSION "5.18.2")
+set(CALENDARUTILS_LIB_VERSION "5.18.2")
+set(CALENDARSUPPORT_LIB_VERSION "5.18.2")
+set(LIBKDEPIM_LIB_VERSION "5.18.2")
+set(EVENTVIEW_LIB_VERSION "5.18.2")
+set(AKONADI_VERSION "5.18.2")
+set(AKONADICONTACT_LIB_VERSION "5.18.2")
+set(AKONADICALENDAR_LIB_VERSION "5.18.2")
+set(PIMCOMMON_LIB_VERSION "5.18.2")
+set(GRANTLEETHEME_LIB_VERSION "5.18.2")
set(KDIAGRAM_LIB_VERSION "1.4.0")
find_package(KGantt ${KDIAGRAM_LIB_VERSION} CONFIG REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/incidenceeditor-21.08.1/po/ca/libincidenceeditors.po
new/incidenceeditor-21.08.2/po/ca/libincidenceeditors.po
--- old/incidenceeditor-21.08.1/po/ca/libincidenceeditors.po 2021-08-31
02:38:37.000000000 +0200
+++ new/incidenceeditor-21.08.2/po/ca/libincidenceeditors.po 2021-10-05
07:46:09.000000000 +0200
@@ -4,15 +4,15 @@
# version 3 or later versions approved by the membership of KDE e.V.
#
# Manuel Tortosa <[email protected]>, 2011.
-# Josep Ma. Ferrer <[email protected]>, 2011, 2012, 2014, 2015, 2016, 2017,
2018, 2020.
+# Josep Ma. Ferrer <[email protected]>, 2011, 2012, 2014, 2015, 2016, 2017,
2018, 2020, 2021.
# Antoni Bella P??rez <[email protected]>, 2013, 2014, 2015, 2016, 2017,
2018, 2019, 2020, 2021.
msgid ""
msgstr ""
"Project-Id-Version: incidenceeditor\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-08-18 01:43+0000\n"
-"PO-Revision-Date: 2021-07-11 09:21+0200\n"
-"Last-Translator: Antoni Bella P??rez <[email protected]>\n"
+"PO-Revision-Date: 2021-09-19 18:55+0200\n"
+"Last-Translator: Josep M. Ferrer <[email protected]>\n"
"Language-Team: Catalan <[email protected]>\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Accelerator-Marker: &\n"
-"X-Generator: Lokalize 21.04.3\n"
+"X-Generator: Lokalize 20.12.0\n"
#: alarmdialog.cpp:25
#, kde-format
@@ -997,7 +997,7 @@
#: incidenceeditor.kcfg:12
#, kde-format
msgid "Default Email Attachment Method"
-msgstr "M??tode predeterminat d'adjunci?? per al correu"
+msgstr "M??tode predeterminat d'adjunci?? del correu"
#. i18n: ectx: tooltip, entry (DefaultEmailAttachMethod), group
(AttachmentHandling)
#: incidenceeditor.kcfg:13
@@ -1208,7 +1208,7 @@
#, kde-format
msgctxt "@title:window"
msgid "Group Scheduling Email"
-msgstr "Correu per a la planificaci?? de grups"
+msgstr "Correu de planificaci?? de grups"
#: individualmaildialog.cpp:34
#, kde-format
@@ -2262,7 +2262,7 @@
#: ui/dialogdesktop.ui:866
#, kde-format
msgid "Substitute with group members"
-msgstr "Substitueix per als membres del grup"
+msgstr "Substitueix pels membres del grup"
#. i18n: ectx: property (toolTip), widget (QPushButton, mSelectButton)
#: ui/dialogdesktop.ui:873
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/incidenceeditor-21.08.1/po/ca@valencia/libincidenceeditors.po
new/incidenceeditor-21.08.2/po/ca@valencia/libincidenceeditors.po
--- old/incidenceeditor-21.08.1/po/ca@valencia/libincidenceeditors.po
2021-08-31 02:38:37.000000000 +0200
+++ new/incidenceeditor-21.08.2/po/ca@valencia/libincidenceeditors.po
2021-10-05 07:46:09.000000000 +0200
@@ -4,15 +4,15 @@
# version 3 or later versions approved by the membership of KDE e.V.
#
# Manuel Tortosa <[email protected]>, 2011.
-# Josep Ma. Ferrer <[email protected]>, 2011, 2012, 2014, 2015, 2016, 2017,
2018, 2020.
+# Josep Ma. Ferrer <[email protected]>, 2011, 2012, 2014, 2015, 2016, 2017,
2018, 2020, 2021.
# Antoni Bella P??rez <[email protected]>, 2013, 2014, 2015, 2016, 2017,
2018, 2019, 2020, 2021.
msgid ""
msgstr ""
"Project-Id-Version: incidenceeditor\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-08-18 01:43+0000\n"
-"PO-Revision-Date: 2021-07-11 09:21+0200\n"
-"Last-Translator: Antoni Bella P??rez <[email protected]>\n"
+"PO-Revision-Date: 2021-09-19 18:55+0200\n"
+"Last-Translator: Josep M. Ferrer <[email protected]>\n"
"Language-Team: Catalan <[email protected]>\n"
"Language: ca@valencia\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Accelerator-Marker: &\n"
-"X-Generator: Lokalize 21.04.3\n"
+"X-Generator: Lokalize 20.12.0\n"
#: alarmdialog.cpp:25
#, kde-format
@@ -997,7 +997,7 @@
#: incidenceeditor.kcfg:12
#, kde-format
msgid "Default Email Attachment Method"
-msgstr "M??tode predeterminat d'adjunci?? per al correu"
+msgstr "M??tode predeterminat d'adjunci?? del correu"
#. i18n: ectx: tooltip, entry (DefaultEmailAttachMethod), group
(AttachmentHandling)
#: incidenceeditor.kcfg:13
@@ -1208,7 +1208,7 @@
#, kde-format
msgctxt "@title:window"
msgid "Group Scheduling Email"
-msgstr "Correu per a la planificaci?? de grups"
+msgstr "Correu de planificaci?? de grups"
#: individualmaildialog.cpp:34
#, kde-format
@@ -2263,7 +2263,7 @@
#: ui/dialogdesktop.ui:866
#, kde-format
msgid "Substitute with group members"
-msgstr "Substitueix per als membres del grup"
+msgstr "Substitueix pels membres del grup"
#. i18n: ectx: property (toolTip), widget (QPushButton, mSelectButton)
#: ui/dialogdesktop.ui:873
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/incidenceeditor-21.08.1/po/nb/libincidenceeditors.po
new/incidenceeditor-21.08.2/po/nb/libincidenceeditors.po
--- old/incidenceeditor-21.08.1/po/nb/libincidenceeditors.po 2021-08-31
02:38:37.000000000 +0200
+++ new/incidenceeditor-21.08.2/po/nb/libincidenceeditors.po 2021-10-05
07:46:09.000000000 +0200
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
-"POT-Creation-Date: 2021-07-11 01:37+0000\n"
+"POT-Creation-Date: 2021-08-18 01:43+0000\n"
"PO-Revision-Date: 2014-09-13 18:13+0200\n"
"Last-Translator: Bj??rn Steensrud <[email protected]>\n"
"Language-Team: Norwegian Bokm??l <[email protected]>\n"
@@ -131,19 +131,19 @@
msgstr[0] "%1 dag f??r forfall"
msgstr[1] "%1 dager f??r forfall"
-#: attachmenteditdialog.cpp:37
+#: attachmenteditdialog.cpp:38
#, kde-format
msgctxt "@title:window"
msgid "Edit Attachment"
msgstr ""
-#: attachmenteditdialog.cpp:56
+#: attachmenteditdialog.cpp:57
#, kde-format
msgctxt "@label unknown mimetype"
msgid "Unknown"
msgstr "Ukjent"
-#: attachmenteditdialog.cpp:109
+#: attachmenteditdialog.cpp:110
#, kde-format
msgctxt "@label"
msgid "New attachment"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/incidenceeditor-21.08.1/po/zh_CN/libincidenceeditors.po
new/incidenceeditor-21.08.2/po/zh_CN/libincidenceeditors.po
--- old/incidenceeditor-21.08.1/po/zh_CN/libincidenceeditors.po 2021-08-31
02:38:37.000000000 +0200
+++ new/incidenceeditor-21.08.2/po/zh_CN/libincidenceeditors.po 2021-10-05
07:46:09.000000000 +0200
@@ -13,7 +13,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-08-18 01:43+0000\n"
-"PO-Revision-Date: 2021-08-30 11:45\n"
+"PO-Revision-Date: 2021-09-27 13:10\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
@@ -188,7 +188,7 @@
msgid ""
"The email address or name of the attendee. An invitation can be sent to the "
"user if an email address is provided."
-msgstr ""
+msgstr
"?????????????????????????????????????????????????????????????????????????????????????????????????????????"
#: attendeeline.cpp:163 incidenceattendee.cpp:69
#, kde-format
@@ -279,6 +279,8 @@
"The item has been changed by another application.\n"
"What should be done?"
msgstr ""
+"?????????????????????????????????????????????\n"
+"???????????????"
#: editoritemmanager.cpp:223
#, kde-format
@@ -335,13 +337,13 @@
#, kde-format
msgctxt "@info:whatsthis"
msgid "Enter the location of the Free/Busy information for the attendee."
-msgstr ""
+msgstr "??????????????????????????????????????????"
#: freebusyurldialog.cpp:69
#, kde-format
msgctxt "@info:tooltip"
msgid "Enter the location of the information."
-msgstr ""
+msgstr "??????????????????????????????"
#: incidencealarm.cpp:250
#, kde-format
@@ -419,82 +421,82 @@
#: incidencealarm.cpp:309
#, kde-format
msgid "%1 %2 after the to-do started %3"
-msgstr ""
+msgstr "?????????????????? %2???%1 %3"
#: incidencealarm.cpp:311
#, kde-format
msgid "%1 %2 after the event started %3"
-msgstr ""
+msgstr "???????????? %2???%1 %3"
#: incidencealarm.cpp:315
#, kde-format
msgid "%1 %2 before the to-do starts %3"
-msgstr ""
+msgstr "?????????????????? %2???%1 %3"
#: incidencealarm.cpp:317
#, kde-format
msgid "%1 %2 before the event starts %3"
-msgstr ""
+msgstr "???????????? %2???%1 %3"
#: incidencealarm.cpp:321
#, kde-format
msgid "%1 %2 after the to-do is due %3"
-msgstr ""
+msgstr "?????????????????? %2???%1 %3"
#: incidencealarm.cpp:323
#, kde-format
msgid "%1 %2 after the event ends %3"
-msgstr ""
+msgstr "???????????? %2???%1 %3"
#: incidencealarm.cpp:327
#, kde-format
msgid "%1 %2 before the to-do is due %3"
-msgstr ""
+msgstr "?????????????????? %2???%1 %3"
#: incidencealarm.cpp:329
#, kde-format
msgid "%1 %2 before the event ends %3"
-msgstr ""
+msgstr "???????????? %2???%1 %3"
#: incidencealarm.cpp:335
#, kde-format
msgid "%1 %2 after the to-do started %3 (Disabled)"
-msgstr ""
+msgstr "?????????????????? %2???%1 %3 (?????????)"
#: incidencealarm.cpp:337
#, kde-format
msgid "%1 %2 after the event started %3 (Disabled)"
-msgstr ""
+msgstr "???????????? %2???%1 %3 (?????????)"
#: incidencealarm.cpp:341
#, kde-format
msgid "%1 %2 before the to-do starts %3 (Disabled)"
-msgstr ""
+msgstr "?????????????????? %2???%1 %3 (?????????)"
#: incidencealarm.cpp:343
#, kde-format
msgid "%1 %2 before the event starts %3 (Disabled)"
-msgstr ""
+msgstr "???????????? %2???%1 %3 (?????????)"
#: incidencealarm.cpp:347
#, kde-format
msgid "%1 %2 after the to-do is due %3 (Disabled)"
-msgstr ""
+msgstr "?????????????????? %2???%1 %3 (?????????)"
#: incidencealarm.cpp:349
#, kde-format
msgid "%1 %2 after the event ends %3 (Disabled)"
-msgstr ""
+msgstr "???????????? %2???%1 %3 (?????????)"
#: incidencealarm.cpp:353
#, kde-format
msgid "%1 %2 before the to-do is due %3 (Disabled)"
-msgstr ""
+msgstr "?????????????????? %2???%1 %3 (?????????)"
#: incidencealarm.cpp:355
#, kde-format
msgid "%1 %2 before the event ends %3 (Disabled)"
-msgstr ""
+msgstr "???????????? %2???%1 %3 (?????????)"
#: incidencealarm.cpp:363
#, kde-format
@@ -708,25 +710,25 @@
#, kde-format
msgctxt "@info"
msgid "Invalid start date."
-msgstr ""
+msgstr "?????????????????????"
#: incidencedatetime.cpp:842
#, kde-format
msgctxt "@info"
msgid "Invalid start time."
-msgstr ""
+msgstr "?????????????????????"
#: incidencedatetime.cpp:850
#, kde-format
msgctxt "@info"
msgid "Invalid end date."
-msgstr ""
+msgstr "?????????????????????"
#: incidencedatetime.cpp:855
#, kde-format
msgctxt "@info"
msgid "Invalid end time."
-msgstr ""
+msgstr "?????????????????????"
#: incidencedatetime.cpp:864
#, kde-format
@@ -841,7 +843,7 @@
#, kde-format
msgctxt "@info"
msgid "Error loading template file '%1'."
-msgstr "?????????????????????%1?????????????????????"
+msgstr "?????????????????????%1?????????????????????"
#: incidencedialog.cpp:294
#, kde-format
@@ -893,6 +895,9 @@
"\n"
" Reason: %1"
msgstr ""
+"???????????????????????????????????????????????????????????????\n"
+"\n"
+"????????? %1"
#: incidencedialog.cpp:452
#, kde-kuit-format
@@ -904,12 +909,15 @@
"para><para>Would you like to set your default events calendar to <resource>"
"%1</resource>?</para>"
msgstr ""
+"<para>??????????????????????????????????????????</para><para>?????????????????????????????????????????????"
+"?????????????????????????????????????????????????????????</para><para>?????????????????????????????????
"
+"<resource>%1</resource> ??????</para>"
#: incidencedialog.cpp:460
#, kde-format
msgctxt "@title:window"
msgid "Set Default Calendar?"
-msgstr ""
+msgstr "?????????????????????"
#: incidencedialog.cpp:642
#, kde-format
@@ -927,7 +935,7 @@
#, kde-format
msgctxt "@action:button"
msgid "Discard changes and close dialog"
-msgstr ""
+msgstr "??????????????????????????????"
#: incidencedialog.cpp:648
#, kde-format
@@ -939,7 +947,7 @@
#, kde-format
msgctxt "@info:tooltip"
msgid "Manage templates for this item"
-msgstr ""
+msgstr "????????????????????????"
#: incidencedialog.cpp:652
#, kde-format
@@ -974,7 +982,7 @@
#: incidenceeditor.kcfg:13
#, kde-format
msgid "Choose the default way of attaching dropped emails to an event"
-msgstr ""
+msgstr "??????????????????????????????????????????????????????"
#. i18n: ectx: whatsthis, entry (DefaultEmailAttachMethod), group
(AttachmentHandling)
#: incidenceeditor.kcfg:14
@@ -1021,7 +1029,7 @@
msgid ""
"A recurring event or to-do must occur at least once. Adjust the recurring "
"parameters."
-msgstr ""
+msgstr
"????????????????????????????????????????????????????????????????????????????????????"
#: incidencerecurrence.cpp:459
#, kde-format
@@ -1032,7 +1040,7 @@
#, kde-format
msgctxt "@info"
msgid "The recurrence end date is invalid."
-msgstr ""
+msgstr "???????????????????????????"
#: incidencerecurrence.cpp:508
#, kde-format
@@ -1148,7 +1156,7 @@
#, kde-format
msgctxt "@info"
msgid "Please enter a summary."
-msgstr ""
+msgstr "??????????????????"
#: individualmailcomponentfactory.h:50 individualmailcomponentfactory.h:57
#: individualmailcomponentfactory.h:63
@@ -1192,13 +1200,13 @@
#, kde-format
msgctxt "@info:whatsthis"
msgid "Options for this particular attendee."
-msgstr ""
+msgstr "???????????????????????????"
#: individualmaildialog.cpp:38
#, kde-format
msgctxt "@info:tooltip"
msgid "Choose an option for this attendee."
-msgstr ""
+msgstr "?????????????????????????????????"
#: individualmaildialog.cpp:113
#, kde-format
@@ -1526,7 +1534,7 @@
#: ui/alarmdialog.ui:225
#, kde-format
msgid "Use this selector to choose the alarm type for the reminders."
-msgstr ""
+msgstr "?????????????????????????????????????????????"
#. i18n: ectx: property (text), item, widget (QComboBox, mTypeCombo)
#: ui/alarmdialog.ui:235
@@ -1641,6 +1649,9 @@
"If the 'To:' field stays empty the email reminder will be sent to the\n"
"default email configured in Kmail (Settings menu/Configure Kmail/Identities)."
msgstr ""
+"???????????????????????????????????????????????????\n"
+"??????To:????????????????????????????????????????????? Kmail
????????????????????????????????????\n"
+"(????????????/?????? Kmail/??????)???"
#. i18n: ectx: property (whatsThis), widget (PimCommon::AddresseeLineEdit,
mEmailAddress)
#: ui/alarmdialog.ui:451
@@ -1716,6 +1727,9 @@
"attachment will be stored. Do not use a link for attachments that change "
"often or may be moved (or removed) from their current location."
msgstr ""
+"???????????????????????????????????????????????????????????????????????????????????????
(?????????????????????)???"
+"????????????????????????????????????????????????????????????????????????????????????????????????????????????
(???"
+"??????) ??????????????????????????????"
#. i18n: ectx: property (text), widget (QCheckBox, mInlineCheck)
#: ui/attachmenteditdialog.ui:78
@@ -1769,13 +1783,13 @@
#: ui/dialogdesktop.ui:20
#, kde-format
msgid "A message on this incidence item"
-msgstr ""
+msgstr "???????????????????????????"
#. i18n: ectx: property (whatsThis), widget (CalendarSupport::MessageWidget,
mMessageWidget)
#: ui/dialogdesktop.ui:23
#, kde-format
msgid "Use this message to correct the item parameters."
-msgstr ""
+msgstr "????????????????????????????????????"
#. i18n: ectx: property (text), widget (QLabel, label)
#: ui/dialogdesktop.ui:53
@@ -1789,7 +1803,7 @@
#, kde-format
msgctxt "@info"
msgid "You are Invited, what do you want to do?"
-msgstr ""
+msgstr "????????????????????????????????????????????????"
#. i18n: ectx: property (toolTip), widget (QPushButton,
mAcceptInvitationButton)
#: ui/dialogdesktop.ui:94
@@ -1825,7 +1839,7 @@
#, kde-format
msgctxt "@info:tooltip"
msgid "Set the summary"
-msgstr ""
+msgstr "????????????"
#. i18n: ectx: property (whatsThis), widget (QLabel, label_2)
#. i18n: ectx: property (whatsThis), widget (QLineEdit, mSummaryEdit)
@@ -1835,14 +1849,14 @@
msgid ""
"Sets brief information that will be displayed in many places in the user "
"interface."
-msgstr ""
+msgstr "????????????????????????????????????????????????????????????"
#. i18n: ectx: property (text), widget (QLabel, label_2)
#: ui/dialogdesktop.ui:153
#, kde-format
msgctxt "@label"
msgid "Summar&y:"
-msgstr ""
+msgstr "??????(&Y)???"
#. i18n: ectx: property (text), widget (QLabel, mLocationLabel)
#: ui/dialogdesktop.ui:194
@@ -1976,7 +1990,7 @@
#, kde-format
msgctxt "@option:check"
msgid "Blocks me for other events"
-msgstr ""
+msgstr "???????????????????????????"
#. i18n: ectx: property (text), widget (QLabel, mStartLabel)
#: ui/dialogdesktop.ui:428
@@ -2091,7 +2105,7 @@
#, kde-format
msgctxt "@label"
msgid "Tags:"
-msgstr ""
+msgstr "?????????"
#. i18n: ectx: attribute (title), widget (QWidget, mAttendeesTab)
#: ui/dialogdesktop.ui:736
@@ -2124,6 +2138,8 @@
"configuration. In addition, identities are gathered from your KMail settings "
"and from your address book."
msgstr ""
+"?????????????????????????????????????????????????????????????????????
KOrganizer ??????????????????????????????"
+"???????????????????????????????????????????????????????????? KMail
?????????????????????????????????"
#. i18n: ectx: property (text), widget (QLabel, label_5)
#: ui/dialogdesktop.ui:818
@@ -2137,7 +2153,7 @@
#, kde-format
msgctxt "@info:tooltip"
msgid "Schedule the meeting with your attendees."
-msgstr ""
+msgstr "?????????????????????????????????"
#. i18n: ectx: property (whatsThis), widget (QPushButton, mSolveButton)
#: ui/dialogdesktop.ui:840
@@ -2146,7 +2162,7 @@
msgid ""
"Opens the scheduling dialog, which will assist in picking a time slot that "
"works for all attendees."
-msgstr ""
+msgstr
"????????????????????????????????????????????????????????????????????????????????????"
#. i18n: ectx: property (text), widget (QPushButton, mSolveButton)
#: ui/dialogdesktop.ui:843
@@ -2159,7 +2175,7 @@
#: ui/dialogdesktop.ui:866
#, kde-format
msgid "Substitute with group members"
-msgstr ""
+msgstr "???????????????"
#. i18n: ectx: property (toolTip), widget (QPushButton, mSelectButton)
#: ui/dialogdesktop.ui:873
@@ -2192,7 +2208,7 @@
#: ui/dialogdesktop.ui:943
#, kde-format
msgid "Book Resource"
-msgstr ""
+msgstr "????????????"
#. i18n: ectx: property (text), widget (QPushButton, mFindResourcesButton)
#: ui/dialogdesktop.ui:972
@@ -2444,14 +2460,14 @@
#: ui/resourcemanagement.ui:39
#, kde-format
msgid "Enter the search term"
-msgstr ""
+msgstr "???????????????"
#. i18n: ectx: property (whatsThis), widget (QLineEdit, resourceSearch)
#: ui/resourcemanagement.ui:42
#, kde-format
msgid ""
"Use this text box to enter some keyword for the resource you want to find."
-msgstr ""
+msgstr "???????????????????????????????????????????????????????????????"
#. i18n: ectx: property (title), widget (QGroupBox, groupDetails)
#: ui/resourcemanagement.ui:76
@@ -2488,7 +2504,7 @@
#: ui/schedulingdialog.ui:83 ui/schedulingdialog.ui:108
#, kde-format
msgid "Check the weekdays to include in the search."
-msgstr ""
+msgstr "?????????????????????????????????????????????"
#. i18n: ectx: property (whatsThis), widget (QLabel, label_3)
#. i18n: ectx: property (whatsThis), widget
(IncidenceEditorNG::KWeekdayCheckCombo, mWeekdayCombo)
@@ -2496,7 +2512,7 @@
#, kde-format
msgid ""
"Only the checked weekdays will be included in the free time slot search."
-msgstr ""
+msgstr "?????????????????????????????????????????????????????????????????????"
#. i18n: ectx: property (text), widget (QLabel, label_3)
#: ui/schedulingdialog.ui:92
@@ -2509,7 +2525,7 @@
#: ui/schedulingdialog.ui:118 ui/schedulingdialog.ui:140
#, kde-format
msgid "Check the roles to include in the search."
-msgstr ""
+msgstr "?????????????????????????????????????????????"
#. i18n: ectx: property (whatsThis), widget (QLabel, label_5)
#. i18n: ectx: property (whatsThis), widget (KPIM::KCheckComboBox, mRolesCombo)
@@ -2518,13 +2534,13 @@
msgid ""
"Only the participants with the checked roles will be considered in the free "
"time slot search."
-msgstr ""
+msgstr
"???????????????????????????????????????????????????????????????????????????????????????"
#. i18n: ectx: property (text), widget (QLabel, label_5)
#: ui/schedulingdialog.ui:124
#, kde-format
msgid "Mandatory roles:"
-msgstr ""
+msgstr "???????????????"
#. i18n: ectx: property (toolTip), widget (QTabWidget, mTabWidget)
#: ui/schedulingdialog.ui:154
@@ -2582,6 +2598,8 @@
"Select a template and click <i>Apply</i> to apply it to this item. Click "
"<i>New</i> to create a new template based on the current item settings."
msgstr ""
+"?????????????????????<i>??????</i>???????????????????????????????????????<i>??????</i>?????????????????????"
+"????????????????????????"
#. i18n: ectx: property (toolTip), widget (QListWidget, m_listBox)
#: ui/template_management_dialog_base.ui:42
@@ -2760,13 +2778,13 @@
#, kde-format
msgctxt "@action:button reload freebusy data"
msgid "Reload"
-msgstr "????????????"
+msgstr "????????????"
#: visualfreebusywidget.cpp:186
#, kde-format
msgctxt "@info:tooltip"
msgid "Reload Free/Busy data for all attendees"
-msgstr "?????????????????????????????????/?????????"
+msgstr "?????????????????????????????????/?????????"
#: visualfreebusywidget.cpp:188
#, kde-format
@@ -2774,7 +2792,7 @@
msgid ""
"Pressing this button will cause the Free/Busy data for all attendees to be "
"reloaded from their corresponding servers."
-msgstr
"????????????????????????????????????????????????????????????????????????/????????????"
+msgstr
"????????????????????????????????????????????????????????????????????????/????????????"
#: visualfreebusywidget.cpp:199
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/incidenceeditor-21.08.1/src/incidencecategories.cpp
new/incidenceeditor-21.08.2/src/incidencecategories.cpp
--- old/incidenceeditor-21.08.1/src/incidencecategories.cpp 2021-08-17
18:05:00.000000000 +0200
+++ new/incidenceeditor-21.08.2/src/incidencecategories.cpp 2021-09-30
03:05:30.000000000 +0200
@@ -98,8 +98,11 @@
void IncidenceCategories::createMissingCategories()
{
for (const QString &category : std::as_const(mMissingCategories)) {
- Akonadi::Tag missingTag = Akonadi::Tag::genericTag(category);
+ // Either the tag doesn't exist, or Akonadi doesn't have a tag <-> item
+ // relation for this category and instance. Try to create a PLAIN tag.
+ Akonadi::Tag missingTag = Akonadi::Tag(category);
auto createJob = new Akonadi::TagCreateJob(missingTag, this);
+ createJob->setMergeIfExisting(true);
connect(createJob, &Akonadi::TagCreateJob::result, this,
&IncidenceCategories::onMissingTagCreated);
}
}
@@ -124,10 +127,13 @@
}
auto createJob = static_cast<Akonadi::TagCreateJob *>(job);
int count = mMissingCategories.removeAll(createJob->tag().name());
- Q_ASSERT(count > 0);
- QVector<Akonadi::Tag> selectedTags;
- selectedTags.reserve(mUi->mTagWidget->selection().count() + 1);
- selectedTags << mUi->mTagWidget->selection() << createJob->tag();
+ auto selectedTags {mUi->mTagWidget->selection()};
+ selectedTags += createJob->tag();
+
+ // If the created tag was one of the instance's missing categories,
+ // adding it to the widget doesn't make it dirty.
+ mUi->mTagWidget->blockSignals(count > 0);
mUi->mTagWidget->setSelection(selectedTags);
+ mUi->mTagWidget->blockSignals(false);
}
