Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package incidenceeditor for openSUSE:Factory
checked in at 2022-05-14 22:52:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/incidenceeditor (Old)
and /work/SRC/openSUSE:Factory/.incidenceeditor.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "incidenceeditor"
Sat May 14 22:52:44 2022 rev:75 rq:976724 version:22.04.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/incidenceeditor/incidenceeditor.changes
2022-04-24 00:19:16.812247631 +0200
+++
/work/SRC/openSUSE:Factory/.incidenceeditor.new.1538/incidenceeditor.changes
2022-05-14 22:52:59.671053317 +0200
@@ -1,0 +2,8 @@
+Tue May 10 16:29:34 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 22.04.1
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/gear/22.04.1/
+
+-------------------------------------------------------------------
Old:
----
incidenceeditor-22.04.0.tar.xz
incidenceeditor-22.04.0.tar.xz.sig
New:
----
incidenceeditor-22.04.1.tar.xz
incidenceeditor-22.04.1.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ incidenceeditor.spec ++++++
--- /var/tmp/diff_new_pack.qM6ctH/_old 2022-05-14 22:53:00.179053952 +0200
+++ /var/tmp/diff_new_pack.qM6ctH/_new 2022-05-14 22:53:00.183053957 +0200
@@ -20,7 +20,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without released
Name: incidenceeditor
-Version: 22.04.0
+Version: 22.04.1
Release: 0
Summary: Incidenceeditor library
License: GPL-2.0-or-later AND LGPL-2.1-or-later
++++++ incidenceeditor-22.04.0.tar.xz -> incidenceeditor-22.04.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/incidenceeditor-22.04.0/CMakeLists.txt
new/incidenceeditor-22.04.1/CMakeLists.txt
--- old/incidenceeditor-22.04.0/CMakeLists.txt 2022-04-09 17:54:19.000000000
+0200
+++ new/incidenceeditor-22.04.1/CMakeLists.txt 2022-04-26 21:10:08.000000000
+0200
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: none
# SPDX-License-Identifier: BSD-3-Clause
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
-set(PIM_VERSION "5.20.0")
+set(PIM_VERSION "5.20.1")
project(incidenceeditor VERSION ${PIM_VERSION})
@@ -33,20 +33,20 @@
set(INCIDENCEEDITOR_LIB_VERSION ${PIM_VERSION})
-set(AKONADI_MIMELIB_VERSION "5.20.0")
-set(KDEPIM_LIB_VERSION "5.20.0")
+set(AKONADI_MIMELIB_VERSION "5.20.1")
+set(KDEPIM_LIB_VERSION "5.20.1")
set(QT_REQUIRED_VERSION "5.15.2")
-set(KMIME_LIB_VERSION "5.20.0")
-set(KMAILTRANSPORT_LIB_VERSION "5.20.0")
-set(KLDAP_LIB_VERSION "5.20.0")
-set(CALENDARUTILS_LIB_VERSION "5.20.0")
-set(CALENDARSUPPORT_LIB_VERSION "5.20.0")
-set(LIBKDEPIM_LIB_VERSION "5.20.0")
-set(EVENTVIEW_LIB_VERSION "5.20.0")
-set(AKONADI_VERSION "5.20.0")
-set(AKONADICONTACT_LIB_VERSION "5.20.0")
-set(AKONADICALENDAR_LIB_VERSION "5.20.0")
-set(PIMCOMMON_LIB_VERSION "5.20.0")
+set(KMIME_LIB_VERSION "5.20.1")
+set(KMAILTRANSPORT_LIB_VERSION "5.20.1")
+set(KLDAP_LIB_VERSION "5.20.1")
+set(CALENDARUTILS_LIB_VERSION "5.20.1")
+set(CALENDARSUPPORT_LIB_VERSION "5.20.1")
+set(LIBKDEPIM_LIB_VERSION "5.20.1")
+set(EVENTVIEW_LIB_VERSION "5.20.1")
+set(AKONADI_VERSION "5.20.1")
+set(AKONADICONTACT_LIB_VERSION "5.20.1")
+set(AKONADICALENDAR_LIB_VERSION "5.20.1")
+set(PIMCOMMON_LIB_VERSION "5.20.1")
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-22.04.0/autotests/incidencedatetimetest.cpp
new/incidenceeditor-22.04.1/autotests/incidencedatetimetest.cpp
--- old/incidenceeditor-22.04.0/autotests/incidencedatetimetest.cpp
2022-04-09 17:54:19.000000000 +0200
+++ new/incidenceeditor-22.04.1/autotests/incidencedatetimetest.cpp
2022-04-26 21:10:08.000000000 +0200
@@ -1,5 +1,5 @@
/*
- SPDX-FileCopyrightText: 2020 Glen Ditchfield <[email protected]>
+ SPDX-FileCopyrightText: 2020, 2022 Glen Ditchfield <[email protected]>
SPDX-License-Identifier: LGPL-2.0-or-later
*/
@@ -18,86 +18,220 @@
{
Q_OBJECT
+ IncidenceDialog *mDialog;
+ QCheckBox *mAllDay;
+ QCheckBox *mStartCheck;
+ QCheckBox *mEndCheck;
+ KDateComboBox *mStartDate;
+ KTimeComboBox *mStartTime;
+ KTimeZoneComboBox *mStartZone;
+ KDateComboBox *mEndDate;
+ KTimeComboBox *mEndTime;
+ KTimeZoneComboBox *mEndZone;
+ IncidenceEditor *mEditor;
+
+public:
+ IncidenceDateTimeTest()
+ {
+ mDialog = new IncidenceDialog();
+ mAllDay = mDialog->findChild<QCheckBox
*>(QStringLiteral("mWholeDayCheck"));
+ QVERIFY2(mAllDay, "Couldn't find the 'All Day' checkbox.");
+ mStartCheck = mDialog->findChild<QCheckBox
*>(QStringLiteral("mStartCheck"));
+ QVERIFY2(mStartCheck, "Couldn't find the 'Start' checkbox.");
+ mEndCheck = mDialog->findChild<QCheckBox
*>(QStringLiteral("mEndCheck"));
+ QVERIFY2(mEndCheck, "Couldn't find the 'End' checkbox.");
+ mStartDate = mDialog->findChild<KDateComboBox
*>(QStringLiteral("mStartDateEdit"));
+ QVERIFY2(mStartDate, "Couldn't find start date field.");
+ mStartTime = mDialog->findChild<KTimeComboBox
*>(QStringLiteral("mStartTimeEdit"));
+ QVERIFY2(mStartTime, "Couldn't find start time field.");
+ mStartZone = mDialog->findChild<KTimeZoneComboBox
*>(QStringLiteral("mTimeZoneComboStart"));
+ QVERIFY2(mStartZone, "Couldn't find start time zone field.");
+ mEndDate = mDialog->findChild<KDateComboBox
*>(QStringLiteral("mEndDateEdit"));
+ QVERIFY2(mEndDate, "Couldn't find end date field.");
+ mEndTime = mDialog->findChild<KTimeComboBox
*>(QStringLiteral("mEndTimeEdit"));
+ QVERIFY2(mEndTime, "Couldn't find end time field.");
+ mEndZone = mDialog->findChild<KTimeZoneComboBox
*>(QStringLiteral("mTimeZoneComboEnd"));
+ QVERIFY2(mEndZone, "Couldn't find end time zone field.");
+ mEditor = mDialog->findChild<IncidenceEditor *>();
+ QVERIFY2(mEditor, "Couldn't find the combined editor.");
+ }
+
private Q_SLOTS:
- void testStartTimeValidation()
+
+ void initTestCase()
+ {
+ qputenv("TZ", "Asia/Tokyo");
+ }
+
+ void testEventTimeValidation()
{
QLocale currentLocale;
QLocale::setDefault(QLocale::c());
- Akonadi::Item item;
+ const QDate date {2022, 04, 11};
+ const QTime time {10, 11, 12};
+ const QTimeZone zone {"Etc/UTC"};
+ const QDateTime dt {date, time, zone};
+
+ // Put the dialog into a known, valid state.
KCalendarCore::Event::Ptr event(new KCalendarCore::Event);
+ event->setSummary(QStringLiteral("e"));
+ event->setDtStart(dt);
+ event->setDtEnd(dt);
+ event->setAllDay(false);
+ Akonadi::Item item;
item.setPayload<KCalendarCore::Event::Ptr>(event);
- auto dialog = new IncidenceDialog();
- dialog->load(item);
+ mDialog->load(item);
+ QVERIFY(mEditor->isValid());
+
+ auto validDate = mStartDate->currentText();
+ auto invalidDate =
mStartDate->currentText().replace(QStringLiteral("11"), QStringLiteral("31"));
+ mStartDate->setCurrentText(invalidDate);
+ QVERIFY2(!mEditor->isValid(), qPrintable(QStringLiteral("Didn't detect
invalid start date ").append(invalidDate)));
+ mStartDate->setCurrentText(validDate);
+ QVERIFY2(mEditor->isValid(),
qPrintable(validDate.append(QStringLiteral(" considered invalid."))));
+
+ auto validTime = mStartTime->currentText();
+ auto invalidTime =
mStartTime->currentText().replace(QStringLiteral("11"), QStringLiteral("61"));
+ mStartTime->setCurrentText(invalidTime);
+ QVERIFY2(!mEditor->isValid(), qPrintable(QStringLiteral("Didn't detect
invalid start time ").append(invalidTime)));
+ mStartTime->setCurrentText(validTime);
+ QVERIFY2(mEditor->isValid(),
qPrintable(validTime.append(QStringLiteral(" considered invalid."))));
+
+ validDate = mEndDate->currentText();
+ invalidDate = mEndDate->currentText().replace(QStringLiteral("11"),
QStringLiteral("31"));
+ mEndDate->setCurrentText(invalidDate);
+ QVERIFY2(!mEditor->isValid(), qPrintable(QStringLiteral("Didn't detect
invalid end date ").append(invalidDate)));
+ mEndDate->setCurrentText(validDate);
+ QVERIFY2(mEditor->isValid(),
qPrintable(validDate.append(QStringLiteral(" considered invalid."))));
+
+ validTime = mEndTime->currentText();
+ invalidTime = mEndTime->currentText().replace(QStringLiteral("11"),
QStringLiteral("61"));
+ mEndTime->setCurrentText(invalidTime);
+ QVERIFY2(!mEditor->isValid(), qPrintable(QStringLiteral("Didn't detect
invalid end time ").append(invalidTime)));
+ mEndTime->setCurrentText(validTime);
+ QVERIFY2(mEditor->isValid(),
qPrintable(validTime.append(QStringLiteral(" considered invalid."))));
+ }
+
+ void testEventTimeOrdering()
+ {
+ QLocale currentLocale;
+ QLocale::setDefault(QLocale::c());
+
+ const QDate date {2022, 04, 11};
+ const QTime time {10, 11, 12};
+ const QTimeZone zone {"Africa/Abidjan"}; // UTC+0.
+ const QDateTime dt {date, time, zone};
// Put the dialog into a known, valid state.
- auto editor = dialog->findChild<IncidenceEditor *>();
- QVERIFY2(editor, "Couldn't find the combined editor.");
- QCOMPARE(editor->metaObject()->className(),
"IncidenceEditorNG::CombinedIncidenceEditor");
- auto allDay = dialog->findChild<QCheckBox
*>(QStringLiteral("mWholeDayCheck"));
- QVERIFY2(allDay, "Couldn't find the 'All Day' checkbox.");
- allDay->setCheckState(Qt::Unchecked);
- auto startCheck = dialog->findChild<QCheckBox
*>(QStringLiteral("mStartCheck"));
- QVERIFY2(startCheck, "Couldn't find the 'Start' checkbox.");
- startCheck->setCheckState(Qt::Checked);
- auto endCheck = dialog->findChild<QCheckBox
*>(QStringLiteral("mEndCheck"));
- QVERIFY2(endCheck, "Couldn't find the 'End' checkbox.");
- endCheck->setCheckState(Qt::Checked);
- auto summary = dialog->findChild<QLineEdit
*>(QStringLiteral("mSummaryEdit"));
- QVERIFY2(summary, "Couldn't find the 'Summary' field.");
- summary->setText(QStringLiteral("e"));
- QVERIFY(editor->isValid());
-
- auto startDate = dialog->findChild<KDateComboBox
*>(QStringLiteral("mStartDateEdit"));
- QVERIFY2(startDate, "Couldn't find start date field.");
- startDate->setCurrentText(QStringLiteral("32 Jan 2000"));
- QVERIFY2(!editor->isValid(), "Didn't detect invalid start date.");
- startDate->setCurrentText(QStringLiteral("12 Jan 2000"));
- QVERIFY(editor->isValid());
-
- auto startTime = dialog->findChild<KTimeComboBox
*>(QStringLiteral("mStartTimeEdit"));
- QVERIFY2(startTime, "Couldn't find start time field.");
- startTime->setCurrentText(QStringLiteral("12:99:00"));
- QVERIFY2(!editor->isValid(), "Didn't detect invalid start time.");
- startTime->setCurrentText(QStringLiteral("12:00:00"));
- QVERIFY(editor->isValid());
-
- auto endDate = dialog->findChild<KDateComboBox
*>(QStringLiteral("mEndDateEdit"));
- QVERIFY2(endDate, "Couldn't find end date field.");
- endDate->setCurrentText(QStringLiteral("33 Jan 2000"));
- QVERIFY2(!editor->isValid(), "Didn't detect invalid end date.");
- endDate->setCurrentText(QStringLiteral("13 Jan 2000"));
- QVERIFY(editor->isValid());
-
- auto endTime = dialog->findChild<KTimeComboBox
*>(QStringLiteral("mEndTimeEdit"));
- QVERIFY2(endTime, "Couldn't find end time field.");
- endTime->setCurrentText(QStringLiteral("12:99:00"));
- QVERIFY2(!editor->isValid(), "Didn't detect invalid end time.");
- endTime->setCurrentText(QStringLiteral("12:00:00"));
- QVERIFY(editor->isValid());
-
- auto startZone = dialog->findChild<KTimeZoneComboBox
*>(QStringLiteral("mTimeZoneComboStart"));
- QVERIFY2(startZone, "Couldn't find start time zone field.");
- auto endZone = dialog->findChild<KTimeZoneComboBox
*>(QStringLiteral("mTimeZoneComboEnd"));
- QVERIFY2(endZone, "Couldn't find end time zone field.");
- startZone->selectTimeZone(QTimeZone("Africa/Abidjan")); // UTC.
- endZone->selectTimeZone(QTimeZone("Africa/Abidjan"));
- QVERIFY(editor->isValid());
-
- endDate->setDate(startDate->date().addDays(-1));
- endTime->setTime(startTime->time());
- QVERIFY2(!editor->isValid(), "Didn't detect end date < start date");
- endDate->setDate(startDate->date());
- QVERIFY(editor->isValid());
- endTime->setTime(startTime->time().addSecs(-60));
- QVERIFY2(!editor->isValid(), "Didn't detect end time < start time");
- endTime->setTime(startTime->time());
- QVERIFY(editor->isValid());
- endZone->selectTimeZone(QTimeZone("Africa/Addis_Ababa")); // UTC+3;
causes 3-hour shift in effective end time.
- QVERIFY2(!editor->isValid(), "Didn't detect end time < start time in
different time zone");
+ KCalendarCore::Event::Ptr event(new KCalendarCore::Event);
+ event->setSummary(QStringLiteral("e"));
+ event->setDtStart(dt);
+ event->setDtEnd(dt);
+ event->setAllDay(false);
+ Akonadi::Item item;
+ item.setPayload<KCalendarCore::Event::Ptr>(event);
+ mDialog->load(item);
+ QVERIFY(mEditor->isValid());
+
+ mEndDate->setDate(mStartDate->date().addDays(-1));
+ mEndTime->setTime(mStartTime->time());
+ QVERIFY2(!mEditor->isValid(), "Didn't detect end date < start date");
+ mEndDate->setDate(mStartDate->date());
+ QVERIFY(mEditor->isValid());
+ mEndTime->setTime(mStartTime->time().addSecs(-60));
+ QVERIFY2(!mEditor->isValid(), "Didn't detect end time < start time");
+ mEndTime->setTime(mStartTime->time());
+ QVERIFY(mEditor->isValid());
+ mEndZone->selectTimeZone(QTimeZone("Africa/Addis_Ababa")); // UTC+3;
causes 3-hour shift in effective end time.
+ QVERIFY2(!mEditor->isValid(), "Didn't detect end time < start time in
different time zone");
QLocale::setDefault(currentLocale);
}
+
+ void testLoadingTimelessTodo()
+ {
+ KCalendarCore::Todo::Ptr todo {new KCalendarCore::Todo};
+ todo->setDtStart(QDateTime());
+ todo->setDtDue(QDateTime());
+ todo->setAllDay(false);
+ Akonadi::Item item;
+ item.setPayload<KCalendarCore::Todo::Ptr>(todo);
+ mDialog->load(item);
+
+ QVERIFY( ! mAllDay->isEnabled());
+ QVERIFY(mAllDay->isVisible());
+ QVERIFY(mStartCheck->isEnabled());
+ QVERIFY(mStartCheck->isVisible());
+ QCOMPARE(mStartCheck->checkState(), Qt::Unchecked);
+ QVERIFY(mEndCheck->isEnabled());
+ QVERIFY(mEndCheck->isVisible());
+ QCOMPARE(mEndCheck->checkState(), Qt::Unchecked);
+ }
+
+ void testLoadingTimedTodo()
+ {
+ const QDate date {2022, 04, 01};
+ const QTime time {00, 00, 00};
+ const QTimeZone zone {"Africa/Abidjan"};
+ const QDateTime dt {date, time, zone};
+
+ KCalendarCore::Todo::Ptr todo {new KCalendarCore::Todo};
+ todo->setDtStart(dt);
+ todo->setDtDue(dt);
+ todo->setAllDay(false);
+ Akonadi::Item item;
+ item.setPayload<KCalendarCore::Todo::Ptr>(todo);
+ mDialog->load(item);
+
+ QVERIFY(mAllDay->isEnabled());
+ QVERIFY(mAllDay->isVisible());
+ QCOMPARE(mAllDay->checkState(), Qt::Unchecked);
+ QVERIFY(mStartCheck->isEnabled());
+ QVERIFY(mStartCheck->isVisible());
+ QCOMPARE(mStartCheck->checkState(), Qt::Checked);
+ QCOMPARE(mStartDate->date(), date);
+ QCOMPARE(mStartTime->time(), time);
+ QCOMPARE(mStartZone->selectedTimeZone(), zone);
+ QVERIFY(mEndCheck->isEnabled());
+ QVERIFY(mEndCheck->isVisible());
+ QCOMPARE(mEndCheck->checkState(), Qt::Checked);
+ QCOMPARE(mEndDate->date(), date);
+ QCOMPARE(mEndTime->time(), time);
+ QCOMPARE(mEndZone->selectedTimeZone(), zone);
+ }
+
+ void testLoadingAlldayTodo()
+ {
+ const QDate date {2022, 04, 01};
+ const QTime time {00, 00, 00};
+ const QTimeZone zone {"Africa/Abidjan"};
+ const QDateTime dt {date, time, zone};
+
+ KCalendarCore::Todo::Ptr todo {new KCalendarCore::Todo};
+ todo->setDtStart(dt);
+ todo->setDtDue(dt);
+ todo->setAllDay(true);
+ Akonadi::Item item;
+ item.setPayload<KCalendarCore::Todo::Ptr>(todo);
+ mDialog->load(item);
+
+ QCOMPARE(mAllDay->isEnabled(), true);
+ QVERIFY(mAllDay->isVisible());
+ QCOMPARE(mAllDay->checkState(), Qt::Checked);
+ QVERIFY(mStartCheck->isEnabled());
+ QVERIFY(mStartCheck->isVisible());
+ QCOMPARE(mStartCheck->checkState(), Qt::Checked);
+ QCOMPARE(mStartDate->date(), date);
+ QVERIFY( ! mStartTime->isEnabled());
+ QVERIFY( ! mStartZone->isVisible());
+ QVERIFY(mEndCheck->isEnabled());
+ QVERIFY(mEndCheck->isVisible());
+ QCOMPARE(mEndCheck->checkState(), Qt::Checked);
+ QVERIFY( ! mEndTime->isEnabled());
+ QVERIFY( ! mEndZone->isVisible());
+ }
+
};
QTEST_MAIN(IncidenceDateTimeTest)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/incidenceeditor-22.04.0/autotests/ktimezonecomboboxtest.cpp
new/incidenceeditor-22.04.1/autotests/ktimezonecomboboxtest.cpp
--- old/incidenceeditor-22.04.0/autotests/ktimezonecomboboxtest.cpp
2022-04-09 17:54:19.000000000 +0200
+++ new/incidenceeditor-22.04.1/autotests/ktimezonecomboboxtest.cpp
2022-04-26 21:10:08.000000000 +0200
@@ -88,3 +88,22 @@
QCOMPARE(dt.timeSpec(), Qt::TimeZone);
QCOMPARE(dt.timeZone().id(), "Europe/Paris");
}
+
+/**
+ * For the user's convenience, the first three items are the system time zone,
+ * "floating", and UTC.
+ */
+void KTimeZoneComboBoxTest::test_convenience()
+{
+ IncidenceEditorNG::KTimeZoneComboBox combo;
+ combo.setCurrentIndex(0);
+ QVERIFY(!combo.isFloating());
+ QCOMPARE(combo.selectedTimeZone(), QTimeZone::systemTimeZone());
+
+ combo.setCurrentIndex(1);
+ QVERIFY(combo.isFloating());
+
+ combo.setCurrentIndex(2);
+ QVERIFY(!combo.isFloating());
+ QCOMPARE(combo.selectedTimeZone(), QTimeZone::utc());
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/incidenceeditor-22.04.0/autotests/ktimezonecomboboxtest.h
new/incidenceeditor-22.04.1/autotests/ktimezonecomboboxtest.h
--- old/incidenceeditor-22.04.0/autotests/ktimezonecomboboxtest.h
2022-04-09 17:54:19.000000000 +0200
+++ new/incidenceeditor-22.04.1/autotests/ktimezonecomboboxtest.h
2022-04-26 21:10:08.000000000 +0200
@@ -15,5 +15,6 @@
void test_timeSpec();
void test_selectTimeZoneFor();
void test_applyTimeZoneTo();
+ void test_convenience();
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/incidenceeditor-22.04.0/po/ca@valencia/libincidenceeditors.po
new/incidenceeditor-22.04.1/po/ca@valencia/libincidenceeditors.po
--- old/incidenceeditor-22.04.0/po/ca@valencia/libincidenceeditors.po
2022-04-15 02:22:50.000000000 +0200
+++ new/incidenceeditor-22.04.1/po/ca@valencia/libincidenceeditors.po
2022-05-10 07:57:03.000000000 +0200
@@ -205,8 +205,8 @@
"Edits whether to send an email to the attendee to request a response "
"concerning attendance."
msgstr ""
-"Edita si s'ha d'enviar un correu a l'assistent o sol??licitar una resposta
amb "
-"relaci?? a l'assist??ncia."
+"Edita si s'ha d'enviar un correu a l'assistent o sol??licitar una resposta "
+"amb relaci?? a l'assist??ncia."
#: attendeetablemodel.cpp:64
#, kde-format
@@ -283,7 +283,7 @@
"The item has been changed by another application.\n"
"What should be done?"
msgstr ""
-"Una altra aplicaci?? ha canviat l'element.\n"
+"Una atra aplicaci?? ha canviat l'element.\n"
"Qu?? s'ha de fer?"
#: editoritemmanager.cpp:225
@@ -552,7 +552,7 @@
#, kde-format
msgctxt "@title:window"
msgid "Remove Attachments?"
-msgstr "Elimino els adjunts?"
+msgstr "Voleu eliminar els adjunts?"
#: incidenceattachment.cpp:230
#, kde-format
@@ -588,7 +588,7 @@
#, kde-format
msgctxt "@action:inmenu save the attachment to a file"
msgid "Save As..."
-msgstr "Guarda com a..."
+msgstr "Anomena i guarda..."
#: incidenceattachment.cpp:497
#, kde-format
@@ -941,14 +941,15 @@
"<para>You have not set a default calendar for your events yet.</"
"para><para>Setting a default calendar will make creating new events faster "
"and easier with less chance of filing them into the wrong folder.</"
-"para><para>Would you like to set your default events calendar to "
-"<resource>%1</resource>?</para>"
+"para><para>Would you like to set your default events calendar to <resource>"
+"%1</resource>?</para>"
msgstr ""
-"<para>Encara no heu definit cap calendari predeterminat per als
esdeveniments."
-"</para><para>Definir un calendari predeterminat far?? que la creaci?? "
-"d'esdeveniments nous siga m??s r??pida i f??cil, amb menys possibilitats "
-"d'afegir-los a la carpeta incorrecta.</para><para>Voleu definir el calendari "
-"predeterminat d'esdeveniments a <resource>%1</resource>?</para>"
+"<para>Encara no heu definit cap calendari predeterminat per als "
+"esdeveniments.</para><para>Definir un calendari predeterminat far?? que la "
+"creaci?? d'esdeveniments nous siga m??s r??pida i f??cil, amb menys "
+"possibilitats d'afegir-los a la carpeta incorrecta.</para><para>Voleu "
+"definir el calendari predeterminat d'esdeveniments a <resource>%1</resource>?"
+"</para>"
#: incidencedialog.cpp:465
#, kde-format
@@ -1006,9 +1007,9 @@
"Templates can make creating new items easier and faster by putting your "
"favorite default values into the editor automatically."
msgstr ""
-"Premeu este bot?? per a mostrar un di??leg que us ajudar?? a gestionar un joc
de "
-"plantilles. Les plantilles poden fer m??s f??cil i r??pid crear nous elements
"
-"posant els vostres valors per defecte a l'editor autom??ticament."
+"Premeu este bot?? per a mostrar un di??leg que us ajudar?? a gestionar un joc
"
+"de plantilles. Les plantilles poden fer m??s f??cil i r??pid crear nous "
+"elements posant els vostres valors predeterminats a l'editor autom??ticament."
#: incidencedialog.cpp:754 incidencedialog.cpp:775 incidencedialog.cpp:791
#, kde-format
@@ -1113,19 +1114,19 @@
#, kde-format
msgctxt "example: the 30th"
msgid "the %1"
-msgstr "el %1"
+msgstr "%1"
#: incidencerecurrence.cpp:512
#, kde-format
msgctxt "example: the 4th to last day"
msgid "the %1 to last day"
-msgstr "el %1 fins a l'??ltim dia"
+msgstr "%1 fins a l'??ltim dia"
#: incidencerecurrence.cpp:515
#, kde-format
msgctxt "example: the 5th Wednesday"
msgid "the %1 %2"
-msgstr "el %2 %1"
+msgstr "%2 %1"
#: incidencerecurrence.cpp:521
#, kde-format
@@ -1137,25 +1138,25 @@
#, kde-format
msgctxt "example: the 5th to last Wednesday"
msgid "the %1 to last %2"
-msgstr "el %1 fins a l'??ltim %2"
+msgstr "%1 fins a l'??ltim %2"
#: incidencerecurrence.cpp:539
#, kde-format
msgctxt "example: the 5th of June"
msgid "the %1 of %2"
-msgstr "el %1 de %2"
+msgstr "%1 de %2"
#: incidencerecurrence.cpp:542
#, kde-format
msgctxt "example: the 3rd to last day of June"
msgid "the %1 to last day of %2"
-msgstr "el %1 a l'??ltim dia de %2"
+msgstr "%1 a l'??ltim dia de %2"
#: incidencerecurrence.cpp:545
#, kde-format
msgctxt "example: the 4th Wednesday of June"
msgid "the %1 %2 of %3"
-msgstr "el %1 %2 de %3"
+msgstr "%1 %2 de %3"
#: incidencerecurrence.cpp:552
#, kde-format
@@ -1167,13 +1168,13 @@
#, kde-format
msgctxt "example: the 4th to last Wednesday of June"
msgid "the %1 to last %2 of %3 "
-msgstr "el %1 a l'??ltim %2 de %3 "
+msgstr "%1 a l'??ltim %2 de %3 "
#: incidencerecurrence.cpp:564
#, kde-format
msgctxt "example: the 15th day of the year"
msgid "the %1 day of the year"
-msgstr "el %1 dia de l'any"
+msgstr "%1 dia de l'any"
#: incidencerecurrence.cpp:579
#, kde-format
@@ -1500,7 +1501,8 @@
#, kde-format
msgid "Select the reminder trigger relative to the start or end time"
msgstr ""
-"Selecciona el disparador del recordatori en relaci?? amb l'hora d'inici o
final"
+"Selecciona el disparador del recordatori en relaci?? amb l'hora d'inici o "
+"final"
#. i18n: ectx: property (whatsThis), widget (QComboBox, mBeforeAfter)
#: ui/alarmdialog.ui:100
@@ -1553,7 +1555,7 @@
#, kde-format
msgid "Check this if you want to the reminder to recur on a periodic interval."
msgstr ""
-"Marqueu a???? si voleu que el recordatori es repetisca en un interval
peri??dic."
+"Marqueu-la si voleu que el recordatori es repetisca en un interval peri??dic."
#. i18n: ectx: property (toolTip), widget (QSpinBox, mRepeatCount)
#: ui/alarmdialog.ui:160
@@ -1565,11 +1567,11 @@
#: ui/alarmdialog.ui:163
#, kde-format
msgid ""
-"Use this selector to choose how many times you want the recurring reminder to
"
-"repeat."
+"Use this selector to choose how many times you want the recurring reminder "
+"to repeat."
msgstr ""
-"Utilitzeu este selector per a escollir quantes vegades voleu que es repetisca
"
-"el recordatori."
+"Utilitzeu este selector per a escollir quantes vegades voleu que es "
+"repetisca el recordatori."
#. i18n: ectx: property (suffix), widget (QSpinBox, mRepeatCount)
#: ui/alarmdialog.ui:166
@@ -1622,7 +1624,8 @@
#, kde-format
msgid "Use this selector to choose the alarm type for the reminders."
msgstr ""
-"Utilitzeu este selector per a escollir el tipus d'alarma per als
recordatoris."
+"Utilitzeu este selector per a escollir el tipus d'alarma per als "
+"recordatoris."
#. i18n: ectx: property (text), item, widget (QComboBox, mTypeCombo)
#: ui/alarmdialog.ui:235
@@ -1668,7 +1671,8 @@
"playing a sound when the reminder triggers."
msgstr ""
"Utilitzeu el navegador de fitxers adjacent per a ajudar-vos a trobar el "
-"fitxer que voleu usar per a reproduir un so en disparar-se el recordatori."
+"fitxer que voleu utilitzar per a reproduir un so en disparar-se el "
+"recordatori."
#. i18n: ectx: property (toolTip), widget (QLineEdit, mLabelEdit)
#: ui/attachmenteditdialog.ui:38
@@ -1716,11 +1720,11 @@
"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 ""
-"En marcar esta opci??, l'adjunt s'emmagatzemar?? dintre del calendari, cosa
que "
-"pot requerir for??a espai depenent de la mida de l'adjunt. Si esta opci?? no "
-"est?? marcada, nom??s s'emmagatzemar?? un enlla?? apuntant a l'adjunt. No
useu un "
-"enlla?? per a adjunts que canvien sovint o que es poden moure (o eliminar) de
"
-"la seua ubicaci?? actual."
+"En marcar esta opci??, l'adjunt s'emmagatzemar?? dintre del calendari, cosa "
+"que pot requerir for??a espai depenent de la mida de l'adjunt. Si esta opci??
"
+"no est?? marcada, nom??s s'emmagatzemar?? un enlla?? apuntant a l'adjunt. No "
+"useu un enlla?? per a adjunts que canvien sovint o que es poden moure (o "
+"eliminar) de la seua ubicaci?? actual."
#. i18n: ectx: property (text), widget (QCheckBox, mInlineCheck)
#: ui/attachmenteditdialog.ui:78
@@ -1747,8 +1751,8 @@
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
-"Enter the path to the attachment file or use the file browser by pressing the
"
-"adjacent button"
+"Enter the path to the attachment file or use the file browser by pressing "
+"the adjacent button"
msgstr ""
"Introdu??u el cam?? cap al fitxer de l'adjunt o useu el navegador de fitxers "
"prement el bot?? adjacent"
@@ -1843,8 +1847,8 @@
"Sets brief information that will be displayed in many places in the user "
"interface."
msgstr ""
-"Estableix una informaci?? breu que es mostrar?? en molts llocs de la
interf??cie "
-"d'usuari."
+"Estableix una informaci?? breu que es mostrar?? en molts llocs de la "
+"interf??cie d'usuari."
#. i18n: ectx: property (text), widget (QLabel, label_2)
#: ui/dialogdesktop.ui:147
@@ -1969,7 +1973,8 @@
#: ui/dialogdesktop.ui:362
#, kde-format
msgctxt "@info:whatsthis"
-msgid "Set if this to-do's start and due dates have times associated with
them."
+msgid ""
+"Set if this to-do's start and due dates have times associated with them."
msgstr ""
"Estableix si les dates d'inici i de venciment de les tasques pendents tenen "
"un horari associat."
@@ -1986,7 +1991,7 @@
#, kde-format
msgctxt "@option:check"
msgid "Blocks me for other events"
-msgstr "Bloqueja'm per a altres esdeveniments"
+msgstr "Bloqueja'm per a atres esdeveniments"
#. i18n: ectx: property (text), widget (QLabel, mStartLabel)
#: ui/dialogdesktop.ui:422
@@ -2076,15 +2081,15 @@
msgctxt "@info:whatsthis"
msgid ""
"Sets whether the access to this event or to-do is restricted. Please note "
-"that KOrganizer currently does not use this setting, so the implementation of
"
-"the restrictions will depend on the groupware server. This means that events "
-"or to-dos marked as private or confidential may be visible to others."
-msgstr ""
-"Estableix si l'acc??s a este esdeveniment o tasca pendent est?? restringit.
Cal "
-"tindre en compte que, actualment KOrganizer no usa esta configuraci??, aix?? "
-"que la implementaci?? de les restriccions dependr?? del servidor de treball
en "
-"grup. A???? vol dir que els esdeveniments o tasques pendents marcades com a "
-"privades o confidencials poden ser visibles per als altres."
+"that KOrganizer currently does not use this setting, so the implementation "
+"of the restrictions will depend on the groupware server. This means that "
+"events or to-dos marked as private or confidential may be visible to others."
+msgstr ""
+"Estableix si l'acc??s a este esdeveniment o tasca pendent est?? restringit. "
+"Cal tindre en compte que, actualment KOrganizer no usa esta configuraci??, "
+"aix?? que la implementaci?? de les restriccions dependr?? del servidor de "
+"treball en grup. A???? vol dir que els esdeveniments o tasques pendents "
+"marcades com a privades o confidencials poden ser visibles per als atres."
#. i18n: ectx: property (text), widget (QLabel, mSecrecyLabel)
#: ui/dialogdesktop.ui:657
@@ -2522,7 +2527,8 @@
#. i18n: ectx: property (whatsThis), widget
(IncidenceEditorNG::KWeekdayCheckCombo, mWeekdayCombo)
#: ui/schedulingdialog.ui:89 ui/schedulingdialog.ui:111
#, kde-format
-msgid "Only the checked weekdays will be included in the free time slot
search."
+msgid ""
+"Only the checked weekdays will be included in the free time slot search."
msgstr ""
"Nom??s s'inclouran els dies de la setmana marcats en la busca d'un espai de "
"temps lliure."
@@ -2670,8 +2676,8 @@
"Clicking this button will permanently remove the selected template from your "
"list of managed templates."
msgstr ""
-"En clicar este bot?? s'eliminar?? permanentment la plantilla seleccionada de
la "
-"llista de plantilles gestionades."
+"En clicar este bot?? s'eliminar?? permanentment la plantilla seleccionada de "
+"la llista de plantilles gestionades."
#. i18n: ectx: property (text), widget (QPushButton, m_buttonRemove)
#: ui/template_management_dialog_base.ui:78
@@ -2692,8 +2698,8 @@
"Clicking this button will apply the settings from the selected template to "
"the item you are currently editing."
msgstr ""
-"En clicar este bot?? s'aplicar?? la configuraci?? de la plantilla
seleccionada a "
-"l'element que esteu editant."
+"En clicar este bot?? s'aplicar?? la configuraci?? de la plantilla
seleccionada "
+"a l'element que esteu editant."
#. i18n: ectx: property (text), widget (QPushButton, m_buttonApply)
#: ui/template_management_dialog_base.ui:91
@@ -2717,17 +2723,18 @@
#, kde-kuit-format
msgctxt "@info:whatsthis"
msgid ""
-"Select the Gantt chart zoom level from one of the following:<nl/>'Hour' shows
"
-"a range of several hours,<nl/>'Day' shows a range of a few days,<nl/>'Week' "
-"shows a range of a few months,<nl/>and 'Month' shows a range of a few years,"
-"<nl/>while 'Automatic' selects the range most appropriate for the current "
-"event or to-do."
+"Select the Gantt chart zoom level from one of the following:<nl/>'Hour' "
+"shows a range of several hours,<nl/>'Day' shows a range of a few days,<nl/"
+">'Week' shows a range of a few months,<nl/>and 'Month' shows a range of a "
+"few years,<nl/>while 'Automatic' selects the range most appropriate for the "
+"current event or to-do."
msgstr ""
"Seleccioneu el nivell d'ampliaci?? del diagrama de Gantt d'un dels seg??ents:"
"<nl/>??Hora?? mostra un interval de diverses hores,<nl/>??Dia?? mostra un "
"interval de diversos dies,<nl/>??Setmana?? mostra un interval d'uns pocs
mesos,"
"<nl/>i ??Mes?? mostra un interval d'uns pocs anys,<nl/>mentre que
??Autom??tic?? "
-"selecciona l'interval m??s adequat per a l'esdeveniment o tasca pendent
actual."
+"selecciona l'interval m??s adequat per a l'esdeveniment o tasca pendent "
+"actual."
#: visualfreebusywidget.cpp:152
#, kde-format
@@ -2775,8 +2782,8 @@
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
-"Click this button to center the Gantt chart on the start time and day of this
"
-"event."
+"Click this button to center the Gantt chart on the start time and day of "
+"this event."
msgstr ""
"Cliqueu este bot?? per a centrar el diagrama de Gantt a l'hora d'inici i el "
"dia de l'esdeveniment."
@@ -2799,8 +2806,8 @@
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
-"Click this button to move the event to a date and time when all the attendees
"
-"have time available in their Free/Busy lists."
+"Click this button to move the event to a date and time when all the "
+"attendees have time available in their Free/Busy lists."
msgstr ""
"Cliqueu este bot?? per a moure l'esdeveniment a una data i hora en la qual "
"tots els assistents tinguen temps disponible a les seues llistes de lliure/"
@@ -2850,9 +2857,9 @@
#, kde-format
msgctxt "@info:whatsthis"
msgid ""
-"Shows the Free/Busy status of all attendees. Double-clicking on an attendee's
"
-"entry in the list will allow you to enter the location of their Free/Busy "
-"Information."
+"Shows the Free/Busy status of all attendees. Double-clicking on an "
+"attendee's entry in the list will allow you to enter the location of their "
+"Free/Busy Information."
msgstr ""
"Mostra l'estat de lliure/ocupat de tots els assistents. En fer clic doble "
"sobre una entrada d'un assistent a la llista us permetr?? introduir la "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/incidenceeditor-22.04.0/po/de/libincidenceeditors.po
new/incidenceeditor-22.04.1/po/de/libincidenceeditors.po
--- old/incidenceeditor-22.04.0/po/de/libincidenceeditors.po 2022-04-15
02:22:50.000000000 +0200
+++ new/incidenceeditor-22.04.1/po/de/libincidenceeditors.po 2022-05-10
07:57:03.000000000 +0200
@@ -16,7 +16,7 @@
"Project-Id-Version: libincidenceeditors\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2022-04-05 02:16+0000\n"
-"PO-Revision-Date: 2022-03-13 10:44+0100\n"
+"PO-Revision-Date: 2022-04-15 04:30+0200\n"
"Last-Translator: Frederik Schwarzer <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
"Language: de\n"
@@ -679,12 +679,10 @@
msgstr "1 Teilnehmer"
#: incidenceattendee.cpp:783
-#, fuzzy, kde-format
-#| msgctxt "@title:window"
-#| msgid "No Changes"
+#, kde-format
msgctxt "@action:button"
msgid "Do Not Change"
-msgstr "Keine ??nderungen"
+msgstr "Nicht ??ndern"
#: incidencedatetime.cpp:215
#, kde-format
@@ -941,7 +939,7 @@
#, kde-format
msgctxt "@action:button"
msgid "Retry"
-msgstr ""
+msgstr "Erneut versuchen"
#: incidencedialog.cpp:457
#, kde-kuit-format
@@ -966,19 +964,16 @@
msgstr "Als Standard-Kalender benutzen?"
#: incidencedialog.cpp:466
-#, fuzzy, kde-format
-#| msgid "Reset to Defaults"
+#, kde-format
msgctxt "@action:button"
msgid "Set As Default"
-msgstr "Auf Standardwerte zur??cksetzen"
+msgstr "Als &Standard verwenden"
#: incidencedialog.cpp:467
-#, fuzzy, kde-format
-#| msgctxt "@action:button dialog negative answer"
-#| msgid "Do Not Send"
+#, kde-format
msgctxt "@action:button"
msgid "Do Not Set"
-msgstr "Nicht senden"
+msgstr "Nicht einstellen"
#: incidencedialog.cpp:647
#, kde-format
@@ -1039,15 +1034,13 @@
#, kde-format
msgctxt "@action:button"
msgid "Cancel Editing"
-msgstr ""
+msgstr "Bearbeiten abbrechen"
#: incidencedialog.cpp:757 incidencedialog.cpp:778 incidencedialog.cpp:794
-#, fuzzy, kde-format
-#| msgctxt "@action:button dialog negative answer"
-#| msgid "Do Not Send"
+#, kde-format
msgctxt "@action:button"
msgid "Do Not Cancel"
-msgstr "Nicht senden"
+msgstr "Nicht abbrechen"
#. i18n: ectx: label, entry (DefaultEmailAttachMethod), group
(AttachmentHandling)
#: incidenceeditor.kcfg:12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/incidenceeditor-22.04.0/po/zh_CN/libincidenceeditors.po
new/incidenceeditor-22.04.1/po/zh_CN/libincidenceeditors.po
--- old/incidenceeditor-22.04.0/po/zh_CN/libincidenceeditors.po 2022-04-15
02:22:50.000000000 +0200
+++ new/incidenceeditor-22.04.1/po/zh_CN/libincidenceeditors.po 2022-05-10
07:57:03.000000000 +0200
@@ -13,7 +13,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2022-04-05 02:16+0000\n"
-"PO-Revision-Date: 2022-04-14 15:36\n"
+"PO-Revision-Date: 2022-05-08 08:17\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/incidenceeditor-22.04.0/src/ktimezonecombobox.cpp
new/incidenceeditor-22.04.1/src/ktimezonecombobox.cpp
--- old/incidenceeditor-22.04.0/src/ktimezonecombobox.cpp 2022-04-09
17:54:19.000000000 +0200
+++ new/incidenceeditor-22.04.1/src/ktimezonecombobox.cpp 2022-04-26
21:10:08.000000000 +0200
@@ -31,16 +31,18 @@
mParent->clear();
mZones.clear();
- // Read all system time zones
+ // Read all known time zones.
const QList<QByteArray> lstTimeZoneIds = QTimeZone::availableTimeZoneIds();
- mZones.reserve(lstTimeZoneIds.count());
- std::copy(lstTimeZoneIds.begin(), lstTimeZoneIds.end(),
std::back_inserter(mZones));
- std::sort(mZones.begin(), mZones.end()); //
clazy:exclude=detaching-member
+ mZones.reserve(lstTimeZoneIds.count() + 3);
+
+ // Prepend the system time zone, UTC and Floating, for convenience.
+ mZones.append(QTimeZone::systemTimeZoneId());
+ mZones.append("Floating");
+ mZones.append("UTC");
+ const auto sortStart = mZones.end();
- // Prepend Local, UTC and Floating, for convenience
- mZones.prepend("UTC"); // do not use i18n here index=2
- mZones.prepend("Floating"); // do not use i18n here index=1
- mZones.prepend(QTimeZone::systemTimeZoneId()); // index=0
+ std::copy(lstTimeZoneIds.begin(), lstTimeZoneIds.end(),
std::back_inserter(mZones));
+ std::sort(sortStart, mZones.end()); // clazy:exclude=detaching-member
// Put translated zones into the combobox
for (const auto &z : std::as_const(mZones)) {
