diff -Nru akonadi-calendar-19.04.3/autotests/calendarbasetest.cpp akonadi-calendar-19.12.3/autotests/calendarbasetest.cpp --- akonadi-calendar-19.04.3/autotests/calendarbasetest.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/calendarbasetest.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -29,7 +29,7 @@ #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; QTEST_AKONADIMAIN(CalendarBaseTest) @@ -37,7 +37,7 @@ { QStringList uids = _uids; - for (const KCalCore::Incidence::Ptr &incidence : incidences) { + for (const KCalendarCore::Incidence::Ptr &incidence : incidences) { if (uids.contains(incidence->uid())) uids.removeAll(incidence->uid()); } @@ -144,14 +144,14 @@ void CalendarBaseTest::testItem() { - foreach (const QString &uid, mUids) { + for (const QString &uid : qAsConst(mUids)) { const Item item1 = mCalendar->item(uid); const Item item2 = mCalendar->item(item1.id()); QVERIFY(item1.isValid()); QVERIFY(item2.isValid()); QCOMPARE(item1.id(), item2.id()); - QCOMPARE(item1.payload()->uid(), uid); - QCOMPARE(item2.payload()->uid(), uid); + QCOMPARE(item1.payload()->uid(), uid); + QCOMPARE(item2.payload()->uid(), uid); } } @@ -175,7 +175,7 @@ QFETCH(QString, parentUid); QFETCH(Akonadi::Item::Id, parentId); QFETCH(QStringList, childrenUids); - KCalCore::Incidence::List childs = mCalendar->childIncidences(parentId); + KCalendarCore::Incidence::List childs = mCalendar->childIncidences(parentId); QVERIFY(compareUids(childrenUids, childs)); childs = mCalendar->childIncidences(parentUid); QVERIFY(compareUids(childrenUids, childs)); @@ -193,19 +193,19 @@ QVERIFY(incidence.isValid()); mExpectedSlotResult = true; - QVERIFY(mCalendar->deleteEvent(event.payload())); + QVERIFY(mCalendar->deleteEvent(event.payload())); QTestEventLoop::instance().enterLoop(5); QVERIFY(!QTestEventLoop::instance().timeout()); - QVERIFY(mCalendar->deleteTodo(todo.payload())); + QVERIFY(mCalendar->deleteTodo(todo.payload())); QTestEventLoop::instance().enterLoop(5); QVERIFY(!QTestEventLoop::instance().timeout()); - QVERIFY(mCalendar->deleteJournal(journal.payload())); + QVERIFY(mCalendar->deleteJournal(journal.payload())); QTestEventLoop::instance().enterLoop(5); QVERIFY(!QTestEventLoop::instance().timeout()); - QVERIFY(mCalendar->deleteIncidence(incidence.payload())); + QVERIFY(mCalendar->deleteIncidence(incidence.payload())); QTestEventLoop::instance().enterLoop(5); QVERIFY(!QTestEventLoop::instance().timeout()); diff -Nru akonadi-calendar-19.04.3/autotests/calendarbasetest.h akonadi-calendar-19.12.3/autotests/calendarbasetest.h --- akonadi-calendar-19.04.3/autotests/calendarbasetest.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/calendarbasetest.h 2020-02-21 17:12:44.000000000 +0000 @@ -45,7 +45,7 @@ void testChildIncidences_data(); void testChildIncidences(); void testDelete(); - // void testDeleteAll(); This has been disabled in KCalCore::Calendar::deleteAll*() so no need to test + // void testDeleteAll(); This has been disabled in KCalendarCore::Calendar::deleteAll*() so no need to test private: void fetchCollection(); diff -Nru akonadi-calendar-19.04.3/autotests/CMakeLists.txt akonadi-calendar-19.12.3/autotests/CMakeLists.txt --- akonadi-calendar-19.04.3/autotests/CMakeLists.txt 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/CMakeLists.txt 2020-02-21 17:12:44.000000000 +0000 @@ -1,7 +1,6 @@ include(ECMMarkAsTest) include(ECMAddTests) -set(QT_REQUIRED_VERSION "5.9.0") find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG REQUIRED) diff -Nru akonadi-calendar-19.04.3/autotests/etmcalendartest.cpp akonadi-calendar-19.12.3/autotests/etmcalendartest.cpp --- akonadi-calendar-19.04.3/autotests/etmcalendartest.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/etmcalendartest.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -35,18 +35,18 @@ #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; Q_DECLARE_METATYPE(QSet) -KCalCore::Incidence::Ptr Akonadi::CalendarUtils::incidence(const Akonadi::Item &item) +KCalendarCore::Incidence::Ptr Akonadi::CalendarUtils::incidence(const Akonadi::Item &item) { // With this try-catch block, we get a 2x performance improvement in retrieving the payload // since we don't call hasPayload() try { - return item.payload(); + return item.payload(); } catch (const Akonadi::PayloadException&) { - return KCalCore::Incidence::Ptr(); + return KCalendarCore::Incidence::Ptr(); } } @@ -58,7 +58,7 @@ incidence->setUid(uid); incidence->setDtStart(QDateTime::currentDateTimeUtc()); incidence->setSummary(QStringLiteral("summary")); - item.setPayload(incidence); + item.setPayload(incidence); ItemCreateJob *job = new ItemCreateJob(item, mCollection, this); AKVERIFYEXEC(job); } @@ -74,7 +74,7 @@ todo->setSummary(QStringLiteral("summary")); - item.setPayload(todo); + item.setPayload(todo); ItemCreateJob *job = new ItemCreateJob(item, mCollection, this); mIncidencesToAdd++; mIncidencesToChange++; @@ -162,7 +162,7 @@ { QFETCH(Akonadi::Collection, noRightsCollection); CollectionModifyJob *job = new CollectionModifyJob(mCollection, this); - QSignalSpy spy(mCalendar, SIGNAL(collectionChanged(Akonadi::Collection,QSet))); + QSignalSpy spy(mCalendar, &ETMCalendar::collectionChanged); mIncidencesToChange = 6; AKVERIFYEXEC(job); QTestEventLoop::instance().enterLoop(10); @@ -304,7 +304,7 @@ checkExitLoop(); } -void ETMCalendarTest::calendarIncidenceDeleted(const Incidence::Ptr &incidence, const KCalCore::Calendar *cal) +void ETMCalendarTest::calendarIncidenceDeleted(const Incidence::Ptr &incidence, const KCalendarCore::Calendar *cal) { Q_UNUSED(cal); const QString id = incidence->customProperty("VOLATILE", "AKONADI-ID"); @@ -430,7 +430,7 @@ waitForIt(); Akonadi::Item item = mCalendar->item(uid); - KCalCore::Incidence::Ptr incidence = KCalCore::Incidence::Ptr(mCalendar->incidence(uid)->clone()); + KCalendarCore::Incidence::Ptr incidence = KCalendarCore::Incidence::Ptr(mCalendar->incidence(uid)->clone()); QVERIFY(item.isValid()); // Modify it @@ -451,7 +451,7 @@ createTodo(originalUid, QString()); waitForIt(); - KCalCore::Incidence::Ptr clone = Incidence::Ptr(mCalendar->incidence(originalUid)->clone()); + KCalendarCore::Incidence::Ptr clone = Incidence::Ptr(mCalendar->incidence(originalUid)->clone()); QCOMPARE(clone->uid(), originalUid); Akonadi::Item item = mCalendar->item(originalUid); @@ -465,7 +465,7 @@ waitForIt(); // Check that stuff still works fine - KCalCore::Incidence::Ptr incidence = mCalendar->incidence(originalUid); + KCalendarCore::Incidence::Ptr incidence = mCalendar->incidence(originalUid); QVERIFY(!incidence); incidence = mCalendar->incidence(newUid); QCOMPARE(incidence->uid(), newUid); @@ -537,17 +537,17 @@ Item item; Incidence::Ptr incidence = Incidence::Ptr(new Event()); KEMailSettings emailSettings; - KCalCore::Attendee::Ptr me(new KCalCore::Attendee(QStringLiteral("me"), emailSettings.getSetting(KEMailSettings::EmailAddress))); + KCalendarCore::Attendee me(QStringLiteral("me"), emailSettings.getSetting(KEMailSettings::EmailAddress)); item.setMimeType(Event::eventMimeType()); incidence->setUid(uid); incidence->setDtStart(QDateTime::currentDateTimeUtc()); incidence->setSummary(QStringLiteral("summary")); - me->setStatus(KCalCore::Attendee::NeedsAction); + me.setStatus(KCalendarCore::Attendee::NeedsAction); incidence->addAttendee(me); - item.setPayload(incidence); + item.setPayload(incidence); ItemCreateJob *job = new ItemCreateJob(item, mCollection, this); AKVERIFYEXEC(job); waitForIt(); @@ -562,7 +562,7 @@ int anz = mCalendar->model()->rowCount(); KEMailSettings emailSettings; - KCalCore::Attendee::Ptr me(new KCalCore::Attendee(QStringLiteral("me"), emailSettings.getSetting(KEMailSettings::EmailAddress))); + KCalendarCore::Attendee me(QStringLiteral("me"), emailSettings.getSetting(KEMailSettings::EmailAddress)); QString uid = QStringLiteral("invite-02"); mIncidencesToAdd = 1; @@ -575,7 +575,7 @@ incidence->addAttendee(me); incidence->setRevision(1); - item.setPayload(incidence); + item.setPayload(incidence); mIncidencesToDelete = 1; ItemModifyJob *modifyJob = new ItemModifyJob(item, this); @@ -583,13 +583,13 @@ waitForIt(); QCOMPARE(mCalendar->model()->rowCount(), anz); - me->setStatus(KCalCore::Attendee::Accepted); + me.setStatus(KCalendarCore::Attendee::Accepted); incidence->clearAttendees(); incidence->addAttendee(me); incidence->setRevision(2); - item.setPayload(incidence); + item.setPayload(incidence); item.setRevision(2); mIncidencesToAdd = 1; modifyJob = new ItemModifyJob(item, this); diff -Nru akonadi-calendar-19.04.3/autotests/etmcalendartest.h akonadi-calendar-19.12.3/autotests/etmcalendartest.h --- akonadi-calendar-19.04.3/autotests/etmcalendartest.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/etmcalendartest.h 2020-02-21 17:12:44.000000000 +0000 @@ -20,7 +20,7 @@ #ifndef ETMCALENDAR_TEST_H_ #define ETMCALENDAR_TEST_H_ -#include +#include #include #include @@ -28,7 +28,7 @@ class ETMCalendar; } -class ETMCalendarTest : public QObject, KCalCore::Calendar::CalendarObserver +class ETMCalendarTest : public QObject, KCalendarCore::Calendar::CalendarObserver { Q_OBJECT private Q_SLOTS: @@ -54,14 +54,14 @@ void testFilterInvitationsChanged(); public Q_SLOTS: - void calendarIncidenceAdded(const KCalCore::Incidence::Ptr &incidence) override; - void calendarIncidenceChanged(const KCalCore::Incidence::Ptr &incidence) override; - void calendarIncidenceDeleted(const KCalCore::Incidence::Ptr &incidence, const KCalCore::Calendar* cal) override; + void calendarIncidenceAdded(const KCalendarCore::Incidence::Ptr &incidence) override; + void calendarIncidenceChanged(const KCalendarCore::Incidence::Ptr &incidence) override; + void calendarIncidenceDeleted(const KCalendarCore::Incidence::Ptr &incidence, const KCalendarCore::Calendar* cal) override; void handleCollectionsAdded(const Akonadi::Collection::List &collectionList); private: //quiet --overloaded-virtual warning - using KCalCore::Calendar::CalendarObserver::calendarIncidenceDeleted; + using KCalendarCore::Calendar::CalendarObserver::calendarIncidenceDeleted; void deleteIncidence(const QString &uid); void createIncidence(const QString &uid); diff -Nru akonadi-calendar-19.04.3/autotests/fetchjobcalendartest.cpp akonadi-calendar-19.12.3/autotests/fetchjobcalendartest.cpp --- akonadi-calendar-19.04.3/autotests/fetchjobcalendartest.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/fetchjobcalendartest.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -25,7 +25,7 @@ #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; class FetchJobCalendarTest : public QObject { @@ -40,7 +40,7 @@ incidence->setUid(uid); incidence->setSummary(QStringLiteral("summary")); incidence->setDtStart(QDateTime::currentDateTimeUtc()); - item.setPayload(incidence); + item.setPayload(incidence); ItemCreateJob *job = new ItemCreateJob(item, mCollection, this); AKVERIFYEXEC(job); } diff -Nru akonadi-calendar-19.04.3/autotests/historytest.cpp akonadi-calendar-19.12.3/autotests/historytest.cpp --- akonadi-calendar-19.04.3/autotests/historytest.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/historytest.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -26,12 +26,12 @@ #include #include #include -#include +#include #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; Q_DECLARE_METATYPE(QList) @@ -54,10 +54,10 @@ return false; } - if (it.payload()->summary() == expected) { + if (it.payload()->summary() == expected) { return true; } else { - qDebug() << "Got " << it.payload()->summary() + qDebug() << "Got " << it.payload()->summary() << "Expected " << expected; return false; } @@ -69,7 +69,7 @@ Incidence::Ptr incidence = Incidence::Ptr(new Event()); incidence->setSummary(QStringLiteral("random summary")); item.setMimeType(incidence->mimeType()); - item.setPayload(incidence); + item.setPayload(incidence); return item; } @@ -123,7 +123,7 @@ QCOMPARE(mHistory->d->redoCount(), 0); QCOMPARE(mHistory->d->undoCount(), 0); QVERIFY(item.hasPayload()); - const int changeId = mChanger->createIncidence(item.payload()); + const int changeId = mChanger->createIncidence(item.payload()); QVERIFY(changeId > 0); mKnownChangeIds << changeId; waitForSignals(); @@ -215,7 +215,7 @@ Item item1 = createItem(mCollection); const QString oldSummary(QStringLiteral("old")); const QString newSummary(QStringLiteral("new")); - item1.payload()->setSummary(oldSummary); + item1.payload()->setSummary(oldSummary); QTest::newRow("item1") << item1 << oldSummary << newSummary; } @@ -225,9 +225,9 @@ QFETCH(QString, oldSummary); QFETCH(QString, newSummary); QVERIFY(item.hasPayload()); - Incidence::Ptr originalPayload = Incidence::Ptr(item.payload()->clone()); + Incidence::Ptr originalPayload = Incidence::Ptr(item.payload()->clone()); - item.payload()->setSummary(newSummary); + item.payload()->setSummary(newSummary); mPendingSignals[ModificationSignal] = 1; QCOMPARE(mHistory->d->redoCount(), 0); QCOMPARE(mHistory->d->undoCount(), 0); @@ -312,7 +312,7 @@ int changeId = -1; switch (changeTypes[i]) { case IncidenceChanger::ChangeTypeCreate: - changeId = mChanger->createIncidence(item.hasPayload() ? item.payload() + changeId = mChanger->createIncidence(item.hasPayload() ? item.payload() : Incidence::Ptr()); QVERIFY(changeId != -1); mKnownChangeIds << changeId; @@ -326,9 +326,9 @@ break; case IncidenceChanger::ChangeTypeModify: { QVERIFY(item.isValid()); - QVERIFY(item.hasPayload()); - Incidence::Ptr originalPayload = Incidence::Ptr(item.payload()->clone()); - item.payload()->setSummary(QStringLiteral("Changed")); + QVERIFY(item.hasPayload()); + Incidence::Ptr originalPayload = Incidence::Ptr(item.payload()->clone()); + item.payload()->setSummary(QStringLiteral("Changed")); changeId = mChanger->modifyIncidence(item, originalPayload); QVERIFY(changeId != -1); mKnownChangeIds << changeId; @@ -435,7 +435,7 @@ int changeId = -1; switch (changeTypes[i]) { case IncidenceChanger::ChangeTypeCreate: - lastCreateChangeId = mChanger->createIncidence(item.payload()); + lastCreateChangeId = mChanger->createIncidence(item.payload()); QVERIFY(lastCreateChangeId != -1); mKnownChangeIds << lastCreateChangeId; ++mPendingSignals[CreationSignal]; @@ -453,9 +453,9 @@ case IncidenceChanger::ChangeTypeModify: { item = item.isValid() ? item : mItemByChangeId.value(lastCreateChangeId); QVERIFY(item.isValid()); - QVERIFY(item.hasPayload()); - Incidence::Ptr originalPayload = Incidence::Ptr(item.payload()->clone()); - item.payload()->setSummary(QStringLiteral("Changed")); + QVERIFY(item.hasPayload()); + Incidence::Ptr originalPayload = Incidence::Ptr(item.payload()->clone()); + item.payload()->setSummary(QStringLiteral("Changed")); QVERIFY(originalPayload); changeId = mChanger->modifyIncidence(item, originalPayload); QVERIFY(changeId != -1); @@ -567,7 +567,7 @@ QVERIFY(item.parentCollection().isValid()); mItemByChangeId.insert(changeId, item); QVERIFY(item.hasPayload()); - Incidence::Ptr incidence = item.payload(); + Incidence::Ptr incidence = item.payload(); //mItemIdByUid.insert(incidence->uid(), item.id()); } else { qDebug() << "Error string is " << errorString; diff -Nru akonadi-calendar-19.04.3/autotests/incidencechangertest.cpp akonadi-calendar-19.12.3/autotests/incidencechangertest.cpp --- akonadi-calendar-19.04.3/autotests/incidencechangertest.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/incidencechangertest.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -30,21 +30,21 @@ #include #include -#include -#include -#include +#include +#include +#include #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(KCalCore::RecurrenceRule::PeriodType) +Q_DECLARE_METATYPE(KCalendarCore::RecurrenceRule::PeriodType) QString s_ourEmail = QStringLiteral("unittests@dev.nul"); // change also in kdepimlibs/akonadi/calendar/tests/unittestenv/kdehome/share/config QString s_outEmail2 = QStringLiteral("identity2@kde.org"); @@ -54,7 +54,7 @@ Incidence::Ptr incidence = Incidence::Ptr(new Event()); incidence->setSummary(QStringLiteral("random summary")); item.setMimeType(incidence->mimeType()); - item.setPayload(incidence); + item.setPayload(incidence); return item; } @@ -232,9 +232,9 @@ Item retrievedItem = fetchJob->items().first(); QVERIFY(retrievedItem.isValid()); QVERIFY(retrievedItem.hasPayload()); - QVERIFY(retrievedItem.hasPayload()); - QVERIFY(retrievedItem.hasPayload()); - Incidence::Ptr incidence = retrievedItem.payload(); + QVERIFY(retrievedItem.hasPayload()); + QVERIFY(retrievedItem.hasPayload()); + Incidence::Ptr incidence = retrievedItem.payload(); QCOMPARE(incidence->summary(), summary); QCOMPARE(incidence->uid(), uid); } @@ -324,12 +324,12 @@ Incidence::Ptr incidence = Incidence::Ptr(new Event()); incidence->setUid(QStringLiteral("test123uid")); incidence->setSummary(QStringLiteral("summary")); - item.setPayload(incidence); + item.setPayload(incidence); ItemCreateJob *job = new ItemCreateJob(item, mCollection, this); AKVERIFYEXEC(job); item = job->item(); incidence->setSummary(QStringLiteral("New Summary")); - item.setPayload(incidence); + item.setPayload(incidence); QTest::newRow("Change summary") << item << "New Summary" << true << 1 << false << IncidenceChanger::ResultCodeSuccess; @@ -366,8 +366,8 @@ QVERIFY(fetchJob->items().count() == 1); Item fetchedItem = fetchJob->items().constFirst(); QVERIFY(fetchedItem.isValid()); - QVERIFY(fetchedItem.hasPayload()); - Incidence::Ptr incidence = fetchedItem.payload(); + QVERIFY(fetchedItem.hasPayload()); + Incidence::Ptr incidence = fetchedItem.payload(); QCOMPARE(incidence->summary(), newSummary); QCOMPARE(incidence->revision(), expectedRevision); delete fetchJob; @@ -384,9 +384,9 @@ Incidence::Ptr incidence = Incidence::Ptr(new Event()); incidence->setUid(QStringLiteral("test123uid")); incidence->setSummary(QStringLiteral("summary")); - incidence->setOrganizer(Person::Ptr(new Person(QStringLiteral("orga"), QStringLiteral("orga@dev.nul")))); + incidence->setOrganizer(Person(QStringLiteral("orga"), QStringLiteral("orga@dev.nul"))); incidence->setDirtyFields(QSet()); - item.setPayload(incidence); + item.setPayload(incidence); ItemCreateJob *job = new ItemCreateJob(item, mCollection, this); AKVERIFYEXEC(job); item = job->item(); @@ -394,7 +394,7 @@ alarm->setStartOffset(Duration(-15)); alarm->setType(Alarm::Display); incidence->addAlarm(alarm); - item.setPayload(incidence); + item.setPayload(incidence); mChanger->setRespectsCollectionRights(true); const int changeId = mChanger->modifyIncidence(item); @@ -409,8 +409,8 @@ QVERIFY(fetchJob->items().count() == 1); Item fetchedItem = fetchJob->items().constFirst(); QVERIFY(fetchedItem.isValid()); - QVERIFY(fetchedItem.hasPayload()); - Incidence::Ptr incidence2 = fetchedItem.payload(); + QVERIFY(fetchedItem.hasPayload()); + Incidence::Ptr incidence2 = fetchedItem.payload(); QCOMPARE(incidence2->alarms().count(), 1); QCOMPARE(incidence2->revision(), 0); delete fetchJob; @@ -424,16 +424,16 @@ QTest::addColumn("event"); QTest::addColumn("expectReset"); - const Attendee::Ptr us = Attendee::Ptr(new Attendee(QString(), s_ourEmail)); - us->setStatus(Attendee::Accepted); - const Attendee::Ptr mia = Attendee::Ptr(new Attendee(QStringLiteral("Mia Wallace"), QStringLiteral("mia@dev.nul"))); - mia->setStatus(Attendee::Declined); - mia->setRSVP(false); - const Attendee::Ptr vincent = Attendee::Ptr(new Attendee(QStringLiteral("Vincent"), QStringLiteral("vincent@dev.nul"))); - vincent->setStatus(Attendee::Delegated); - const Attendee::Ptr jules = Attendee::Ptr(new Attendee(QStringLiteral("Jules"), QStringLiteral("jules@dev.nul"))); - jules->setStatus(Attendee::Accepted); - jules->setRole(Attendee::NonParticipant); + Attendee us(QString(), s_ourEmail); + us.setStatus(Attendee::Accepted); + Attendee mia(QStringLiteral("Mia Wallace"), QStringLiteral("mia@dev.nul")); + mia.setStatus(Attendee::Declined); + mia.setRSVP(false); + Attendee vincent(QStringLiteral("Vincent"), QStringLiteral("vincent@dev.nul")); + vincent.setStatus(Attendee::Delegated); + Attendee jules(QStringLiteral("Jules"), QStringLiteral("jules@dev.nul")); + jules.setStatus(Attendee::Accepted); + jules.setRole(Attendee::NonParticipant); // we as organizator Item item; @@ -444,13 +444,13 @@ incidence->setDtEnd(QDateTime(QDate(2006, 1, 8), QTime(14, 0, 0), Qt::UTC)); incidence->setAllDay(false); incidence->setLocation(QStringLiteral("location")); - incidence->setOrganizer(Person::Ptr(new Person(QString(), s_ourEmail))); + incidence->setOrganizer(Person(QString(), s_ourEmail)); incidence->addAttendee(us); incidence->addAttendee(mia); incidence->addAttendee(vincent); incidence->addAttendee(jules); incidence->setDirtyFields(QSet()); - item.setPayload(incidence); + item.setPayload(incidence); { Event::Ptr event = Event::Ptr(new Event(*incidence)); @@ -496,13 +496,13 @@ incidence2->setDtEnd(QDateTime(QDate(2006, 1, 8), QTime(14, 0, 0), Qt::UTC)); incidence2->setAllDay(false); incidence2->setLocation(QStringLiteral("location")); - incidence2->setOrganizer(Person::Ptr(new Person(QStringLiteral("External organizator"), QStringLiteral("exorga@dev.nul")))); + incidence2->setOrganizer(Person(QStringLiteral("External organizator"), QStringLiteral("exorga@dev.nul"))); incidence2->addAttendee(us); incidence2->addAttendee(mia); incidence2->addAttendee(vincent); incidence2->addAttendee(jules); incidence2->setDirtyFields(QSet()); - item2.setPayload(incidence2); + item2.setPayload(incidence2); { Event::Ptr event = Event::Ptr(new Event(*incidence2)); @@ -545,7 +545,7 @@ ItemCreateJob *job = new ItemCreateJob(item, mCollection, this); AKVERIFYEXEC(job); item = job->item(); - item.setPayload(event); + item.setPayload(event); int revision = event->revision(); @@ -563,28 +563,28 @@ Item fetchedItem = fetchJob->items().constFirst(); QVERIFY(fetchedItem.isValid()); - QVERIFY(fetchedItem.hasPayload()); - Event::Ptr incidence = fetchedItem.payload(); + QVERIFY(fetchedItem.hasPayload()); + Event::Ptr incidence = fetchedItem.payload(); QCOMPARE(incidence->revision(), revision + 1); if (expectReset) { - if (incidence->organizer()->email() == s_ourEmail) { - QCOMPARE(incidence->attendeeByMail(s_ourEmail)->status(), Attendee::Accepted); + if (incidence->organizer().email() == s_ourEmail) { + QCOMPARE(incidence->attendeeByMail(s_ourEmail).status(), Attendee::Accepted); } else { - QCOMPARE(incidence->attendeeByMail(s_ourEmail)->status(), Attendee::NeedsAction); + QCOMPARE(incidence->attendeeByMail(s_ourEmail).status(), Attendee::NeedsAction); } - QCOMPARE(incidence->attendeeByMail(QLatin1String("mia@dev.nul"))->status(), Attendee::NeedsAction); - QCOMPARE(incidence->attendeeByMail(QLatin1String("mia@dev.nul"))->RSVP(), true); - QCOMPARE(incidence->attendeeByMail(QLatin1String("vincent@dev.nul"))->status(), Attendee::Delegated); - QCOMPARE(incidence->attendeeByMail(QLatin1String("vincent@dev.nul"))->RSVP(), false); - QCOMPARE(incidence->attendeeByMail(QLatin1String("jules@dev.nul"))->status(), Attendee::Accepted); - QCOMPARE(incidence->attendeeByMail(QLatin1String("jules@dev.nul"))->RSVP(), false); + QCOMPARE(incidence->attendeeByMail(QLatin1String("mia@dev.nul")).status(), Attendee::NeedsAction); + QCOMPARE(incidence->attendeeByMail(QLatin1String("mia@dev.nul")).RSVP(), true); + QCOMPARE(incidence->attendeeByMail(QLatin1String("vincent@dev.nul")).status(), Attendee::Delegated); + QCOMPARE(incidence->attendeeByMail(QLatin1String("vincent@dev.nul")).RSVP(), false); + QCOMPARE(incidence->attendeeByMail(QLatin1String("jules@dev.nul")).status(), Attendee::Accepted); + QCOMPARE(incidence->attendeeByMail(QLatin1String("jules@dev.nul")).RSVP(), false); } else { - QCOMPARE(incidence->attendeeByMail(s_ourEmail)->status(), Attendee::Accepted); - QCOMPARE(incidence->attendeeByMail(QLatin1String("mia@dev.nul"))->status(), Attendee::Declined); - QCOMPARE(incidence->attendeeByMail(QLatin1String("vincent@dev.nul"))->status(), Attendee::Delegated); - QCOMPARE(incidence->attendeeByMail(QLatin1String("jules@dev.nul"))->status(), Attendee::Accepted); + QCOMPARE(incidence->attendeeByMail(s_ourEmail).status(), Attendee::Accepted); + QCOMPARE(incidence->attendeeByMail(QLatin1String("mia@dev.nul")).status(), Attendee::Declined); + QCOMPARE(incidence->attendeeByMail(QLatin1String("vincent@dev.nul")).status(), Attendee::Delegated); + QCOMPARE(incidence->attendeeByMail(QLatin1String("jules@dev.nul")).status(), Attendee::Accepted); } delete fetchJob; } @@ -600,7 +600,7 @@ Incidence::Ptr incidence = Incidence::Ptr(new Event()); incidence->setUid(QStringLiteral("test123uid")); incidence->setSummary(QStringLiteral("summary")); - item.setPayload(incidence); + item.setPayload(incidence); ItemCreateJob *job = new ItemCreateJob(item, mCollection, this); AKVERIFYEXEC(job); item = job->item(); @@ -624,7 +624,7 @@ int changeId = -1; for (int i = 0; i < numberOfModifications; ++i) { - Incidence::Ptr incidence = item.payload(); + Incidence::Ptr incidence = item.payload(); Q_ASSERT(incidence); incidence->setSummary(QString::number(i)); changeId = mChanger->modifyIncidence(item); @@ -638,7 +638,7 @@ fetchJob->fetchScope().fetchFullPayload(); AKVERIFYEXEC(fetchJob); QVERIFY(fetchJob->items().count() == 1); - QCOMPARE(fetchJob->items().first().payload()->summary(), + QCOMPARE(fetchJob->items().first().payload()->summary(), QString::number(i)); } } @@ -652,7 +652,7 @@ fetchJob->fetchScope().fetchFullPayload(); AKVERIFYEXEC(fetchJob); QVERIFY(fetchJob->items().count() == 1); - QCOMPARE(fetchJob->items().first().payload()->summary(), + QCOMPARE(fetchJob->items().first().payload()->summary(), QString::number(numberOfModifications - 1)); if (mIncidencesToModify > 0) { waitForSignals(); @@ -972,7 +972,7 @@ int changeId = -1; switch (changeTypes[i]) { case IncidenceChanger::ChangeTypeCreate: - changeId = mChanger->createIncidence(item.hasPayload() ? item.payload() : Incidence::Ptr()); + changeId = mChanger->createIncidence(item.hasPayload() ? item.payload() : Incidence::Ptr()); if (changeId != -1) { ++mIncidencesToAdd; } @@ -985,8 +985,8 @@ break; case IncidenceChanger::ChangeTypeModify: QVERIFY(item.isValid()); - QVERIFY(item.hasPayload()); - item.payload()->setSummary(QStringLiteral("Changed")); + QVERIFY(item.hasPayload()); + item.payload()->setSummary(QStringLiteral("Changed")); changeId = mChanger->modifyIncidence(item); if (changeId != -1) { ++mIncidencesToModify; @@ -1014,8 +1014,8 @@ switch (changeTypes[i]) { case IncidenceChanger::ChangeTypeCreate: if (expectedSuccess) { - QVERIFY(item.hasPayload()); - Incidence::Ptr incidence = item.payload(); + QVERIFY(item.hasPayload()); + Incidence::Ptr incidence = item.payload(); QVERIFY(incidence); QVERIFY(!incidence->uid().isEmpty()); QVERIFY(mItemIdByUid.contains(incidence->uid())); @@ -1025,9 +1025,9 @@ QCOMPARE(fJob->items().count(), 1); QVERIFY(fJob->items().constFirst().isValid()); QVERIFY(fJob->items().constFirst().hasPayload()); - QVERIFY(fJob->items().constFirst().hasPayload()); - QCOMPARE(item.payload()->uid(), - fJob->items().constFirst().payload()->uid()); + QVERIFY(fJob->items().constFirst().hasPayload()); + QCOMPARE(item.payload()->uid(), + fJob->items().constFirst().payload()->uid()); } break; case IncidenceChanger::ChangeTypeDelete: @@ -1041,8 +1041,8 @@ ItemFetchJob *fJob = new ItemFetchJob(Item(item.id())); fJob->fetchScope().fetchFullPayload(); AKVERIFYEXEC(fJob); - QCOMPARE(item.payload()->summary(), - fJob->items().first().payload()->summary()); + QCOMPARE(item.payload()->summary(), + fJob->items().first().payload()->summary()); } break; default: @@ -1059,7 +1059,7 @@ QTest::addColumn("dtEnd"); QTest::addColumn("offsetToMove"); QTest::addColumn("frequency"); - QTest::addColumn("recurrenceType"); + QTest::addColumn("recurrenceType"); // For weekly recurrences QTest::addColumn("weekDays"); @@ -1081,7 +1081,7 @@ expectedDays.setBit(dtStart.addSecs(one_day).date().dayOfWeek() - 1); QTest::newRow("weekly") << false << dtStart << dtEnd << one_day - << 1 << KCalCore::RecurrenceRule::rWeekly + << 1 << KCalendarCore::RecurrenceRule::rWeekly << days << expectedDays << QDate() << QDate(); //------------------------------------------------------------------------- days.fill(false); @@ -1089,7 +1089,7 @@ expectedDays.setBit(dtStart.addSecs(one_day).date().dayOfWeek() - 1); QTest::newRow("weekly allday") << true << QDateTime(dtStart.date()) << QDateTime(dtEnd.date()) - << one_day << 1 << KCalCore::RecurrenceRule::rWeekly + << one_day << 1 << KCalendarCore::RecurrenceRule::rWeekly << days << expectedDays << QDate() << QDate(); //------------------------------------------------------------------------- // Here nothing should change @@ -1097,7 +1097,7 @@ days.setBit(dtStart.date().dayOfWeek() - 1); QTest::newRow("weekly nop") << false << dtStart << dtEnd << one_hour - << 1 << KCalCore::RecurrenceRule::rWeekly + << 1 << KCalendarCore::RecurrenceRule::rWeekly << days << days << QDate() << QDate(); //------------------------------------------------------------------------- // Test with multiple week days. Only the weekday from the old DTSTART should be unset. @@ -1105,13 +1105,13 @@ expectedDays = days; expectedDays.clearBit(dtStart.date().dayOfWeek() - 1); QTest::newRow("weekly multiple") << false << dtStart << dtEnd << one_day - << 1 << KCalCore::RecurrenceRule::rWeekly + << 1 << KCalendarCore::RecurrenceRule::rWeekly << days << expectedDays << QDate() << QDate(); //------------------------------------------------------------------------- // Testing moving an event such that DTSTART > recurrence end, which would // result in the event disappearing from all views. QTest::newRow("recur end") << false << dtStart << dtEnd << one_day * 7 - << 1 << KCalCore::RecurrenceRule::rDaily + << 1 << KCalendarCore::RecurrenceRule::rDaily << QBitArray() << QBitArray() << dtStart.date().addDays(3) << QDate(); @@ -1126,7 +1126,7 @@ QFETCH(QDateTime, dtEnd); QFETCH(int, offsetToMove); QFETCH(int, frequency); - QFETCH(KCalCore::RecurrenceRule::PeriodType, recurrenceType); + QFETCH(KCalendarCore::RecurrenceRule::PeriodType, recurrenceType); QFETCH(QBitArray, weekDays); QFETCH(QBitArray, expectedWeekDays); QFETCH(QDate, recurrenceEnd); @@ -1141,10 +1141,10 @@ Recurrence *recurrence = incidence->recurrence(); switch (recurrenceType) { - case KCalCore::RecurrenceRule::rDaily: + case KCalendarCore::RecurrenceRule::rDaily: recurrence->setDaily(frequency); break; - case KCalCore::RecurrenceRule::rWeekly: + case KCalendarCore::RecurrenceRule::rWeekly: recurrence->setWeekly(frequency, weekDays); break; default: @@ -1178,9 +1178,9 @@ // Now check the results switch (recurrenceType) { - case KCalCore::RecurrenceRule::rDaily: + case KCalendarCore::RecurrenceRule::rDaily: break; - case KCalCore::RecurrenceRule::rWeekly: + case KCalendarCore::RecurrenceRule::rWeekly: QCOMPARE(incidence->recurrence()->days(), expectedWeekDays); if (weekDays != expectedWeekDays) { QVERIFY(incidence->dirtyFields().contains(IncidenceBase::FieldRecurrence)); @@ -1261,7 +1261,7 @@ QVERIFY(item.parentCollection().isValid()); mItemIdByChangeId.insert(changeId, item.id()); QVERIFY(item.hasPayload()); - Incidence::Ptr incidence = item.payload(); + Incidence::Ptr incidence = item.payload(); mItemIdByUid.insert(incidence->uid(), item.id()); mLastItemCreated = item; } else { diff -Nru akonadi-calendar-19.04.3/autotests/itiphandlertest.cpp akonadi-calendar-19.12.3/autotests/itiphandlertest.cpp --- akonadi-calendar-19.04.3/autotests/itiphandlertest.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/itiphandlertest.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -23,8 +23,8 @@ #include "fetchjobcalendar.h" #include "utils_p.h" -#include -#include +#include +#include #include #include #include @@ -32,18 +32,18 @@ #include #include -#include +#include #include #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; Q_DECLARE_METATYPE(Akonadi::IncidenceChanger::InvitationPolicy) Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(Akonadi::ITIPHandler::Result) -Q_DECLARE_METATYPE(KCalCore::Attendee::PartStat) +Q_DECLARE_METATYPE(KCalendarCore::Attendee::PartStat) Q_DECLARE_METATYPE(QList) static const char *s_ourEmail = "unittests@dev.nul"; // change also in kdepimlibs/akonadi/calendar/tests/unittestenv/kdehome/share/config @@ -87,7 +87,7 @@ { } - MailTransport::MessageQueueJob *createMessageQueueJob(const KCalCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, QObject *parent = nullptr) override + MailTransport::MessageQueueJob *createMessageQueueJob(const KCalendarCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, QObject *parent = nullptr) override { Q_UNUSED(incidence); Q_UNUSED(identity); @@ -127,7 +127,7 @@ QTest::addColumn("incidenceUid"); // uid of incidence in invitation QTest::addColumn("expectedResult"); QTest::addColumn("expectedNumIncidences"); - QTest::addColumn("expectedPartStat"); + QTest::addColumn("expectedPartStat"); QString data_filename; QString action = QStringLiteral("accepted"); @@ -135,14 +135,14 @@ QString receiver = QLatin1String(s_ourEmail); Akonadi::ITIPHandler::Result expectedResult; int expectedNumIncidences = 0; - KCalCore::Attendee::PartStat expectedPartStat; + KCalendarCore::Attendee::PartStat expectedPartStat; //---------------------------------------------------------------------------------------------- // Someone invited us to an event, and we accept expectedResult = ITIPHandler::ResultSuccess; data_filename = QStringLiteral("invited_us"); expectedNumIncidences = 1; - expectedPartStat = KCalCore::Attendee::Accepted; + expectedPartStat = KCalendarCore::Attendee::Accepted; action = QStringLiteral("accepted"); QTest::newRow("invited us1") << data_filename << action << receiver << incidenceUid << expectedResult @@ -153,7 +153,7 @@ expectedResult = ITIPHandler::ResultSuccess; data_filename = QStringLiteral("invited_us"); expectedNumIncidences = 1; - expectedPartStat = KCalCore::Attendee::Tentative; + expectedPartStat = KCalendarCore::Attendee::Tentative; action = QStringLiteral("tentative"); QTest::newRow("invited us2") << data_filename << action << receiver << incidenceUid << expectedResult @@ -166,7 +166,7 @@ // The e-mail to the delegate is sent by kmail's text_calendar.cpp expectedNumIncidences = 1; - expectedPartStat = KCalCore::Attendee::Delegated; + expectedPartStat = KCalendarCore::Attendee::Delegated; action = QStringLiteral("delegated"); QTest::newRow("invited us3") << data_filename << action << receiver << incidenceUid << expectedResult @@ -189,7 +189,7 @@ expectedResult = ITIPHandler::ResultSuccess; data_filename = QStringLiteral("invited_us"); expectedNumIncidences = 1; - expectedPartStat = KCalCore::Attendee::NeedsAction; + expectedPartStat = KCalendarCore::Attendee::NeedsAction; action = QStringLiteral("request"); QTest::newRow("invited us5") << data_filename << action << receiver << incidenceUid << expectedResult @@ -219,7 +219,7 @@ expectedResult = ITIPHandler::ResultSuccess; data_filename = QStringLiteral("bug235749"); expectedNumIncidences = 1; - expectedPartStat = KCalCore::Attendee::Accepted; + expectedPartStat = KCalendarCore::Attendee::Accepted; action = QStringLiteral("accepted"); incidenceUid = QStringLiteral("b6f0466a-8877-49d0-a4fc-8ee18ffd8e07"); // Don't change, hardcoded in data file QTest::newRow("bug 235749") << data_filename << action << receiver << incidenceUid @@ -231,7 +231,7 @@ expectedResult = ITIPHandler::ResultError; data_filename = QStringLiteral("invited_us"); expectedNumIncidences = 0; - expectedPartStat = KCalCore::Attendee::Accepted; + expectedPartStat = KCalendarCore::Attendee::Accepted; action = QStringLiteral("counter"); incidenceUid = QStringLiteral("b6f0466a-8877-49d0-a4fc-8ee18ffd8e07"); QTest::newRow("counter error") << data_filename << action << receiver << incidenceUid @@ -249,7 +249,7 @@ QFETCH(QString, incidenceUid); QFETCH(Akonadi::ITIPHandler::Result, expectedResult); QFETCH(int, expectedNumIncidences); - QFETCH(KCalCore::Attendee::PartStat, expectedPartStat); + QFETCH(KCalendarCore::Attendee::PartStat, expectedPartStat); FakeMessageQueueJob::sUnitTestResults.clear(); createITIPHandler(); @@ -261,14 +261,14 @@ processItip(iCalData, receiver, action, expectedNumIncidences, items); if (expectedNumIncidences == 1) { - KCalCore::Incidence::Ptr incidence = items.first().payload(); + KCalendarCore::Incidence::Ptr incidence = items.first().payload(); QVERIFY(incidence); QCOMPARE(incidence->schedulingID(), incidenceUid); QVERIFY(incidence->schedulingID() != incidence->uid()); - KCalCore::Attendee::Ptr me = ourAttendee(incidence); - QVERIFY(me); - QCOMPARE(me->status(), expectedPartStat); + KCalendarCore::Attendee me = ourAttendee(incidence); + QVERIFY(!me.isNull()); + QCOMPARE(me.status(), expectedPartStat); } cleanup(); @@ -337,8 +337,8 @@ } QString expectedICalData = icalData(expected_filename); - KCalCore::MemoryCalendar::Ptr expectedCalendar = KCalCore::MemoryCalendar::Ptr(new KCalCore::MemoryCalendar(QTimeZone::utc())); - KCalCore::ICalFormat format; + KCalendarCore::MemoryCalendar::Ptr expectedCalendar = KCalendarCore::MemoryCalendar::Ptr(new KCalendarCore::MemoryCalendar(QTimeZone::utc())); + KCalendarCore::ICalFormat format; format.fromString(expectedCalendar, expectedICalData); compareCalendars(expectedCalendar); // Here's where the cool and complex comparations are done @@ -388,7 +388,7 @@ Item::List items; processItip(iCalData, receiver, QStringLiteral("accepted"), 1, items); - KCalCore::Incidence::Ptr incidence = items.first().payload(); + KCalendarCore::Incidence::Ptr incidence = items.first().payload(); QVERIFY(incidence); // good, now accept the invitation that has the CANCEL @@ -408,7 +408,7 @@ const bool userCancels = true; Akonadi::Item item; - KCalCore::Incidence::Ptr incidence; + KCalendarCore::Incidence::Ptr incidence; IncidenceChanger::ChangeType changeType; const IncidenceChanger::InvitationPolicy invitationPolicyAsk = IncidenceChanger::InvitationPolicyAsk; const IncidenceChanger::InvitationPolicy invitationPolicySend = IncidenceChanger::InvitationPolicySend; @@ -417,17 +417,17 @@ Q_UNUSED(invitationPolicyAsk); const QString ourEmail = QLatin1String(s_ourEmail); - const Attendee::Ptr us = Attendee::Ptr(new Attendee(QString(), ourEmail)); - const Attendee::Ptr mia = Attendee::Ptr(new Attendee(QStringLiteral("Mia Wallace"), QStringLiteral("mia@dev.nul"))); - const Attendee::Ptr vincent = Attendee::Ptr(new Attendee(QStringLiteral("Vincent"), QStringLiteral("vincent@dev.nul"))); - const Attendee::Ptr jules = Attendee::Ptr(new Attendee(QStringLiteral("Jules"), QStringLiteral("jules@dev.nul"))); + Attendee us(QString(), ourEmail); + const Attendee mia(QStringLiteral("Mia Wallace"), QStringLiteral("mia@dev.nul")); + const Attendee vincent(QStringLiteral("Vincent"), QStringLiteral("vincent@dev.nul")); + const Attendee jules(QStringLiteral("Jules"), QStringLiteral("jules@dev.nul")); const QString uid = QStringLiteral("random-uid-123"); //---------------------------------------------------------------------------------------------- // Creation. We are organizer. We invite another person. changeType = IncidenceChanger::ChangeTypeCreate; item = generateIncidence(uid, /**organizer=*/ourEmail); - incidence = item.payload(); + incidence = item.payload(); incidence->addAttendee(vincent); incidence->addAttendee(jules); expectedEmailCount = 1; @@ -437,7 +437,7 @@ // Creation. We are organizer. We invite another person. But we choose not to send invitation e-mail. changeType = IncidenceChanger::ChangeTypeCreate; item = generateIncidence(uid, /**organizer=*/ourEmail); - incidence = item.payload(); + incidence = item.payload(); incidence->addAttendee(vincent); incidence->addAttendee(jules); expectedEmailCount = 0; @@ -446,7 +446,7 @@ // We delete an event that we organized, and has attendees, that will be notified. changeType = IncidenceChanger::ChangeTypeDelete; item = generateIncidence(uid, /**organizer=*/ourEmail); - incidence = item.payload(); + incidence = item.payload(); incidence->addAttendee(vincent); incidence->addAttendee(jules); expectedEmailCount = 1; @@ -455,7 +455,7 @@ // We delete an event that we organized, and has attendees. We won't send e-mail notifications. changeType = IncidenceChanger::ChangeTypeDelete; item = generateIncidence(uid, /**organizer=*/ourEmail); - incidence = item.payload(); + incidence = item.payload(); incidence->addAttendee(vincent); incidence->addAttendee(jules); expectedEmailCount = 0; @@ -464,7 +464,7 @@ // We delete an event that we organized, and has attendees, who will be notified. changeType = IncidenceChanger::ChangeTypeModify; item = generateIncidence(uid, /**organizer=*/ourEmail); - incidence = item.payload(); + incidence = item.payload(); incidence->addAttendee(vincent); incidence->addAttendee(jules); expectedEmailCount = 1; @@ -473,7 +473,7 @@ // We delete an event that we organized, and has attendees, who wont be notified. changeType = IncidenceChanger::ChangeTypeModify; item = generateIncidence(uid, /**organizer=*/ourEmail); - incidence = item.payload(); + incidence = item.payload(); incidence->addAttendee(vincent); // TODO: test that all attendees got the e-mail incidence->addAttendee(jules); expectedEmailCount = 0; @@ -481,44 +481,44 @@ //---------------------------------------------------------------------------------------------- // We delete an event which we're not the organizer of. Organizer gets REPLY with PartState=Declined changeType = IncidenceChanger::ChangeTypeDelete; - item = generateIncidence(uid, /**organizer=*/mia->email()); - incidence = item.payload(); + item = generateIncidence(uid, /**organizer=*/mia.email()); + incidence = item.payload(); incidence->addAttendee(vincent); incidence->addAttendee(jules); - us->setStatus(Attendee::Accepted); // TODO: Test without accepted status + us.setStatus(Attendee::Accepted); // TODO: Test without accepted status incidence->addAttendee(us); // TODO: test that attendees didn't receive the REPLY expectedEmailCount = 1; // REPLY is always sent, there are no dialogs to control this. Dialogs only control REQUEST and CANCEL. Bug or feature ? QTest::newRow("Deletion. We didnt organize.") << item << changeType << expectedEmailCount << invitationPolicyDontSend << userDoesntCancel; //---------------------------------------------------------------------------------------------- // We delete an event which we're not the organizer of. Organizer gets REPLY with PartState=Declined changeType = IncidenceChanger::ChangeTypeDelete; - item = generateIncidence(uid, /**organizer=*/mia->email()); - incidence = item.payload(); + item = generateIncidence(uid, /**organizer=*/mia.email()); + incidence = item.payload(); incidence->addAttendee(vincent); incidence->addAttendee(jules); // TODO: test that attendees didn't receive the REPLY - us->setStatus(Attendee::Accepted); // TODO: Test without accepted status + us.setStatus(Attendee::Accepted); // TODO: Test without accepted status incidence->addAttendee(us); expectedEmailCount = 1; QTest::newRow("Deletion. We didnt organize.2") << item << changeType << expectedEmailCount << invitationPolicySend << userDoesntCancel; //---------------------------------------------------------------------------------------------- // We modified an event which we're not the organizer of. And, when the "do you really want to modify", we choose "yes". changeType = IncidenceChanger::ChangeTypeModify; - item = generateIncidence(uid, /**organizer=*/mia->email()); - incidence = item.payload(); + item = generateIncidence(uid, /**organizer=*/mia.email()); + incidence = item.payload(); incidence->addAttendee(vincent); incidence->addAttendee(jules); - us->setStatus(Attendee::Accepted); + us.setStatus(Attendee::Accepted); incidence->addAttendee(us); expectedEmailCount = 0; QTest::newRow("Modification. We didnt organize") << item << changeType << expectedEmailCount << invitationPolicySend << userDoesntCancel; //---------------------------------------------------------------------------------------------- // We modified an event which we're not the organizer of. And, when the "do you really want to modify", we choose "no". changeType = IncidenceChanger::ChangeTypeModify; - item = generateIncidence(uid, /**organizer=*/mia->email()); - incidence = item.payload(); + item = generateIncidence(uid, /**organizer=*/mia.email()); + incidence = item.payload(); incidence->addAttendee(vincent); incidence->addAttendee(jules); - us->setStatus(Attendee::Accepted); + us.setStatus(Attendee::Accepted); incidence->addAttendee(us); expectedEmailCount = 0; QTest::newRow("Modification. We didnt organize.2") << item << changeType << expectedEmailCount << invitationPolicyDontSend << userCancels; @@ -532,7 +532,7 @@ QFETCH(int, expectedEmailCount); QFETCH(IncidenceChanger::InvitationPolicy, invitationPolicy); QFETCH(bool, userCancels); - KCalCore::Incidence::Ptr incidence = item.payload(); + KCalendarCore::Incidence::Ptr incidence = item.payload(); m_pendingIncidenceChangerSignal = 1; FakeMessageQueueJob::sUnitTestResults.clear(); @@ -637,7 +637,7 @@ QString ITIPHandlerTest::icalData(const QString &data_filename) { - QString absolutePath = QFINDTESTDATA(QStringLiteral("itip_data/") + data_filename); + QString absolutePath = QFINDTESTDATA(QLatin1String("itip_data/") + data_filename); return QString::fromLatin1(readFile(absolutePath)); } @@ -661,12 +661,12 @@ } } -Attendee::Ptr ITIPHandlerTest::ourAttendee(const KCalCore::Incidence::Ptr &incidence) const +Attendee ITIPHandlerTest::ourAttendee(const KCalendarCore::Incidence::Ptr &incidence) const { - const KCalCore::Attendee::List attendees = incidence->attendees(); - KCalCore::Attendee::Ptr me; - for (const KCalCore::Attendee::Ptr &attendee : attendees) { - if (attendee->email() == QLatin1String(s_ourEmail)) { + const KCalendarCore::Attendee::List attendees = incidence->attendees(); + KCalendarCore::Attendee me; + for (const KCalendarCore::Attendee &attendee : attendees) { + if (attendee.email() == QLatin1String(s_ourEmail)) { me = attendee; break; } diff -Nru akonadi-calendar-19.04.3/autotests/itiphandlertest.h akonadi-calendar-19.12.3/autotests/itiphandlertest.h --- akonadi-calendar-19.04.3/autotests/itiphandlertest.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/itiphandlertest.h 2020-02-21 17:12:44.000000000 +0000 @@ -64,7 +64,7 @@ void processItip(const QString &icaldata, const QString &receiver, const QString &action, int expectedNumIncidences, Akonadi::Item::List &items); - KCalCore::Attendee::Ptr ourAttendee(const KCalCore::Incidence::Ptr &incidence) const; + KCalendarCore::Attendee ourAttendee(const KCalendarCore::Incidence::Ptr &incidence) const; public Q_SLOTS: void oniTipMessageProcessed(Akonadi::ITIPHandler::Result result, diff -Nru akonadi-calendar-19.04.3/autotests/kcalcoreserializertest.cpp akonadi-calendar-19.12.3/autotests/kcalcoreserializertest.cpp --- akonadi-calendar-19.04.3/autotests/kcalcoreserializertest.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/kcalcoreserializertest.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -18,12 +18,12 @@ */ #include -#include +#include #include #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; class KCalCoreSerializerTest : public QObject { diff -Nru akonadi-calendar-19.04.3/autotests/mailclienttest.cpp akonadi-calendar-19.12.3/autotests/mailclienttest.cpp --- akonadi-calendar-19.04.3/autotests/mailclienttest.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/mailclienttest.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -21,8 +21,8 @@ #include "mailclient_p.h" -#include -#include +#include +#include #include #include @@ -36,7 +36,7 @@ using namespace Akonadi; Q_DECLARE_METATYPE(KIdentityManagement::Identity) -Q_DECLARE_METATYPE(KCalCore::Incidence::Ptr) +Q_DECLARE_METATYPE(KCalendarCore::Incidence::Ptr) class FakeMessageQueueJob : public MailTransport::MessageQueueJob { @@ -76,7 +76,7 @@ { } - MailTransport::MessageQueueJob *createMessageQueueJob(const KCalCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, QObject *parent = nullptr) override + MailTransport::MessageQueueJob *createMessageQueueJob(const KCalendarCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, QObject *parent = nullptr) override { Q_UNUSED(incidence); Q_UNUSED(identity); @@ -113,7 +113,7 @@ void testMailAttendees_data() { - QTest::addColumn("incidence"); + QTest::addColumn("incidence"); QTest::addColumn("identity"); QTest::addColumn("bccMe"); QTest::addColumn("attachment"); @@ -125,7 +125,7 @@ QTest::addColumn("expectedCcList"); QTest::addColumn("expectedBccList"); - KCalCore::Incidence::Ptr incidence(new KCalCore::Event()); + KCalendarCore::Incidence::Ptr incidence(new KCalendarCore::Event()); KIdentityManagement::Identity identity; bool bccMe; QString attachment; @@ -133,8 +133,7 @@ MailClient::Result expectedResult = MailClient::ResultNoAttendees; const int expectedTransportId = 69372773; // from tests/unittestenv/kdehome/share/config/mailtransports const QString expectedFrom = QStringLiteral("unittests@dev.nul"); // from tests/unittestenv/kdehome/share/config/emailidentities - KCalCore::Person::Ptr organizer(new KCalCore::Person(QStringLiteral("Organizer"), - QStringLiteral("unittests@dev.nul"))); + KCalendarCore::Person organizer(QStringLiteral("Organizer"), QStringLiteral("unittests@dev.nul")); QStringList toList; QStringList toCcList; @@ -145,9 +144,8 @@ << toList << toCcList << toBccList; //---------------------------------------------------------------------------------------------- // One attendee, but without e-mail - KCalCore::Attendee::Ptr attendee(new KCalCore::Attendee(QStringLiteral("name1"), - QString())); - incidence = KCalCore::Incidence::Ptr(new KCalCore::Event()); + KCalendarCore::Attendee attendee(QStringLiteral("name1"), QString()); + incidence = KCalendarCore::Incidence::Ptr(new KCalendarCore::Event()); incidence->addAttendee(attendee); expectedResult = MailClient::ResultReallyNoAttendees; QTest::newRow("No attendees with email") << incidence << identity << bccMe << attachment << transport @@ -155,9 +153,8 @@ << toList << toCcList << toBccList; //---------------------------------------------------------------------------------------------- // One valid attendee - attendee = KCalCore::Attendee::Ptr(new KCalCore::Attendee(QStringLiteral("name1"), - QStringLiteral("test@foo.org"))); - incidence = KCalCore::Incidence::Ptr(new KCalCore::Event()); + attendee = KCalendarCore::Attendee(QStringLiteral("name1"), QStringLiteral("test@foo.org")); + incidence = KCalendarCore::Incidence::Ptr(new KCalendarCore::Event()); incidence->addAttendee(attendee); incidence->setOrganizer(organizer); expectedResult = MailClient::ResultSuccess; @@ -167,9 +164,8 @@ << toList << toCcList << toBccList; //---------------------------------------------------------------------------------------------- // One valid attendee - attendee = KCalCore::Attendee::Ptr(new KCalCore::Attendee(QStringLiteral("name1"), - QStringLiteral("test@foo.org"))); - incidence = KCalCore::Incidence::Ptr(new KCalCore::Event()); + attendee = KCalendarCore::Attendee(QStringLiteral("name1"), QStringLiteral("test@foo.org")); + incidence = KCalendarCore::Incidence::Ptr(new KCalendarCore::Event()); incidence->setOrganizer(organizer); incidence->addAttendee(attendee); QString invalidTransport = QStringLiteral("foo"); @@ -181,9 +177,8 @@ << toList << toCcList << toBccList; //---------------------------------------------------------------------------------------------- // One valid attendee, and bcc me - attendee = KCalCore::Attendee::Ptr(new KCalCore::Attendee(QStringLiteral("name1"), - QStringLiteral("test@foo.org"))); - incidence = KCalCore::Incidence::Ptr(new KCalCore::Event()); + attendee = KCalendarCore::Attendee(QStringLiteral("name1"), QStringLiteral("test@foo.org")); + incidence = KCalendarCore::Incidence::Ptr(new KCalendarCore::Event()); incidence->setOrganizer(organizer); incidence->addAttendee(attendee); expectedResult = MailClient::ResultSuccess; @@ -196,17 +191,12 @@ << toList << toCcList << toBccList; //---------------------------------------------------------------------------------------------- // Test CC list - attendee = KCalCore::Attendee::Ptr(new KCalCore::Attendee(QStringLiteral("name1"), - QStringLiteral("test@foo.org"))); - KCalCore::Attendee::Ptr optionalAttendee = - KCalCore::Attendee::Ptr(new KCalCore::Attendee(QStringLiteral("opt"), - QStringLiteral("optional@foo.org"))); - KCalCore::Attendee::Ptr nonParticipant = - KCalCore::Attendee::Ptr(new KCalCore::Attendee(QStringLiteral("non"), - QStringLiteral("non@foo.org"))); - optionalAttendee->setRole(KCalCore::Attendee::OptParticipant); - nonParticipant->setRole(KCalCore::Attendee::NonParticipant); - incidence = KCalCore::Incidence::Ptr(new KCalCore::Event()); + attendee = KCalendarCore::Attendee(QStringLiteral("name1"), QStringLiteral("test@foo.org")); + KCalendarCore::Attendee optionalAttendee(QStringLiteral("opt"), QStringLiteral("optional@foo.org")); + KCalendarCore::Attendee nonParticipant(QStringLiteral("non"), QStringLiteral("non@foo.org")); + optionalAttendee.setRole(KCalendarCore::Attendee::OptParticipant); + nonParticipant.setRole(KCalendarCore::Attendee::NonParticipant); + incidence = KCalendarCore::Incidence::Ptr(new KCalendarCore::Event()); incidence->setOrganizer(organizer); incidence->addAttendee(attendee); incidence->addAttendee(optionalAttendee); @@ -227,7 +217,7 @@ void testMailAttendees() { - QFETCH(KCalCore::Incidence::Ptr, incidence); + QFETCH(KCalendarCore::Incidence::Ptr, incidence); QFETCH(KIdentityManagement::Identity, identity); QFETCH(bool, bccMe); QFETCH(QString, attachment); @@ -272,7 +262,7 @@ void testMailOrganizer_data() { - QTest::addColumn("incidence"); + QTest::addColumn("incidence"); QTest::addColumn("identity"); QTest::addColumn("from"); QTest::addColumn("bccMe"); @@ -286,7 +276,7 @@ QTest::addColumn("expectedBccList"); QTest::addColumn("expectedSubject"); - KCalCore::IncidenceBase::Ptr incidence(new KCalCore::Event()); + KCalendarCore::IncidenceBase::Ptr incidence(new KCalendarCore::Event()); KIdentityManagement::Identity identity; const QString from = QLatin1String(s_ourEmail); bool bccMe; @@ -296,8 +286,7 @@ MailClient::Result expectedResult = MailClient::ResultSuccess; const int expectedTransportId = 69372773; // from tests/unittestenv/kdehome/share/config/mailtransports QString expectedFrom = from; // from tests/unittestenv/kdehome/share/config/emailidentities - KCalCore::Person::Ptr organizer(new KCalCore::Person(QStringLiteral("Organizer"), - QStringLiteral("unittests@dev.nul"))); + KCalendarCore::Person organizer(QStringLiteral("Organizer"), QStringLiteral("unittests@dev.nul")); incidence->setOrganizer(organizer); QStringList toList; @@ -311,7 +300,7 @@ << toList << toBccList << expectedSubject; //---------------------------------------------------------------------------------------------- expectedSubject = QStringLiteral("Free Busy Message"); - incidence = KCalCore::IncidenceBase::Ptr(new KCalCore::FreeBusy()); + incidence = KCalendarCore::IncidenceBase::Ptr(new KCalendarCore::FreeBusy()); incidence->setOrganizer(organizer); QTest::newRow("FreeBusy") << incidence << identity << from << bccMe << attachment << subject << transport << expectedResult << expectedTransportId << expectedFrom @@ -320,7 +309,7 @@ void testMailOrganizer() { - QFETCH(KCalCore::IncidenceBase::Ptr, incidence); + QFETCH(KCalendarCore::IncidenceBase::Ptr, incidence); QFETCH(KIdentityManagement::Identity, identity); QFETCH(QString, from); QFETCH(bool, bccMe); @@ -353,7 +342,7 @@ void testMailTo_data() { - QTest::addColumn("incidence"); + QTest::addColumn("incidence"); QTest::addColumn("identity"); QTest::addColumn("from"); QTest::addColumn("bccMe"); @@ -366,7 +355,7 @@ QTest::addColumn("expectedToList"); QTest::addColumn("expectedBccList"); - KCalCore::IncidenceBase::Ptr incidence(new KCalCore::Event()); + KCalendarCore::IncidenceBase::Ptr incidence(new KCalendarCore::Event()); KIdentityManagement::Identity identity; const QString from = QLatin1String(s_ourEmail); bool bccMe; @@ -376,8 +365,7 @@ MailClient::Result expectedResult = MailClient::ResultSuccess; const int expectedTransportId = 69372773; // from tests/unittestenv/kdehome/share/config/mailtransports QString expectedFrom = from; // from tests/unittestenv/kdehome/share/config/emailidentities - KCalCore::Person::Ptr organizer(new KCalCore::Person(QStringLiteral("Organizer"), - QStringLiteral("unittests@dev.nul"))); + KCalendarCore::Person organizer(QStringLiteral("Organizer"), QStringLiteral("unittests@dev.nul")); QStringList toList; toList << QLatin1String(s_ourEmail); QStringList toBccList; @@ -389,7 +377,7 @@ void testMailTo() { - QFETCH(KCalCore::IncidenceBase::Ptr, incidence); + QFETCH(KCalendarCore::IncidenceBase::Ptr, incidence); QFETCH(KIdentityManagement::Identity, identity); QFETCH(QString, from); QFETCH(bool, bccMe); diff -Nru akonadi-calendar-19.04.3/autotests/todopurgertest.cpp akonadi-calendar-19.12.3/autotests/todopurgertest.cpp --- akonadi-calendar-19.04.3/autotests/todopurgertest.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/todopurgertest.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -33,7 +33,7 @@ #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; Q_DECLARE_METATYPE(QSet) @@ -62,7 +62,7 @@ todo->setSummary(QStringLiteral("summary")); - item.setPayload(todo); + item.setPayload(todo); ItemCreateJob *job = new ItemCreateJob(item, m_collection, this); m_pendingCreations++; AKVERIFYEXEC(job); @@ -143,7 +143,7 @@ } } -void TodoPurgerTest::calendarIncidenceDeleted(const Incidence::Ptr &incidence, const KCalCore::Calendar *calendar) +void TodoPurgerTest::calendarIncidenceDeleted(const Incidence::Ptr &incidence, const KCalendarCore::Calendar *calendar) { --m_pendingDeletions; if (m_pendingDeletions == 0 && !m_pendingPurgeSignal) { diff -Nru akonadi-calendar-19.04.3/autotests/todopurgertest.h akonadi-calendar-19.12.3/autotests/todopurgertest.h --- akonadi-calendar-19.04.3/autotests/todopurgertest.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/todopurgertest.h 2020-02-21 17:12:44.000000000 +0000 @@ -20,7 +20,7 @@ #ifndef TODOPURGER_TEST_H_ #define TODOPURGER_TEST_H_ -#include +#include #include #include #include @@ -30,7 +30,7 @@ class TodoPurger; } -class TodoPurgerTest : public QObject, KCalCore::Calendar::CalendarObserver +class TodoPurgerTest : public QObject, KCalendarCore::Calendar::CalendarObserver { Q_OBJECT private Q_SLOTS: @@ -39,8 +39,8 @@ void testPurge(); public: - void calendarIncidenceAdded(const KCalCore::Incidence::Ptr &incidence) override; - void calendarIncidenceDeleted(const KCalCore::Incidence::Ptr &incidence, const KCalCore::Calendar *calendar) override; + void calendarIncidenceAdded(const KCalendarCore::Incidence::Ptr &incidence) override; + void calendarIncidenceDeleted(const KCalendarCore::Incidence::Ptr &incidence, const KCalendarCore::Calendar *calendar) override; public Q_SLOTS: void onTodosPurged(bool success, int numDeleted, int numIgnored); diff -Nru akonadi-calendar-19.04.3/autotests/unittestbase.cpp akonadi-calendar-19.12.3/autotests/unittestbase.cpp --- akonadi-calendar-19.04.3/autotests/unittestbase.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/unittestbase.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -23,8 +23,8 @@ #include "../src/fetchjobcalendar.h" #include "mailclient_p.h" -#include -#include +#include +#include #include #include #include @@ -37,7 +37,7 @@ #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; UnitTestBase::UnitTestBase() { @@ -94,8 +94,8 @@ FetchJobCalendar::Ptr calendar = FetchJobCalendar::Ptr(new FetchJobCalendar()); connect(calendar.data(), &FetchJobCalendar::loadFinished, this, &UnitTestBase::onLoadFinished); waitForIt(); - KCalCore::ICalFormat format; - QString dump = format.toString(calendar.staticCast()); + KCalendarCore::ICalFormat format; + QString dump = format.toString(calendar.staticCast()); qDebug() << dump; calendar->deleteLater(); return calendar->items(); @@ -107,7 +107,7 @@ stopWaiting(); } -void UnitTestBase::compareCalendars(const KCalCore::Calendar::Ptr &expectedCalendar) +void UnitTestBase::compareCalendars(const KCalendarCore::Calendar::Ptr &expectedCalendar) { FetchJobCalendar::Ptr calendar = FetchJobCalendar::Ptr(new FetchJobCalendar()); connect(calendar.data(), &FetchJobCalendar::loadFinished, this, &UnitTestBase::onLoadFinished); @@ -119,29 +119,33 @@ const Incidence::List expectedIncidences = expectedCalendar->incidences(); // First, replace the randomly generated UIDs with the UID that came in the invitation e-mail... - for(const KCalCore::Incidence::Ptr &incidence : incidences) { + for(const KCalendarCore::Incidence::Ptr &incidence : incidences) { incidence->setUid(incidence->schedulingID()); qDebug() << "We have incidece with uid=" << incidence->uid() << "; instanceidentifier=" << incidence->instanceIdentifier(); - foreach(const KCalCore::Attendee::Ptr &attendee, incidence->attendees()) { - attendee->setUid(attendee->email()); + auto attendees = incidence->attendees(); + for (auto &attendee : attendees) { + attendee.setUid(attendee.email()); } + incidence->setAttendees(attendees); } // ... so we can compare them - for(const KCalCore::Incidence::Ptr &incidence : expectedIncidences) { + for(const KCalendarCore::Incidence::Ptr &incidence : expectedIncidences) { incidence->setUid(incidence->schedulingID()); qDebug() << "We expect incidece with uid=" << incidence->uid() << "; instanceidentifier=" << incidence->instanceIdentifier(); - foreach(const KCalCore::Attendee::Ptr &attendee, incidence->attendees()) { - attendee->setUid(attendee->email()); + auto attendees = incidence->attendees(); + for (auto &attendee : attendees) { + attendee.setUid(attendee.email()); } + incidence->setAttendees(attendees); } QCOMPARE(incidences.count(), expectedIncidences.count()); - foreach(const KCalCore::Incidence::Ptr &expectedIncidence, expectedIncidences) { - KCalCore::Incidence::Ptr incidence; + for (const KCalendarCore::Incidence::Ptr &expectedIncidence : expectedIncidences) { + KCalendarCore::Incidence::Ptr incidence; for (int i=0; iinstanceIdentifier() == expectedIncidence->instanceIdentifier()) { incidence = incidences.at(i); @@ -179,8 +183,8 @@ Item UnitTestBase::generateIncidence(const QString &uid, const QString &organizer) { Item item; - item.setMimeType(KCalCore::Event::eventMimeType()); - KCalCore::Incidence::Ptr incidence = KCalCore::Incidence::Ptr(new KCalCore::Event()); + item.setMimeType(KCalendarCore::Event::eventMimeType()); + KCalendarCore::Incidence::Ptr incidence = KCalendarCore::Incidence::Ptr(new KCalendarCore::Event()); if (!uid.isEmpty()) { incidence->setUid(uid); @@ -190,7 +194,7 @@ incidence->setDtStart(now); incidence->setDateTime(now.addSecs(3600), Incidence::RoleEnd); incidence->setSummary(QStringLiteral("summary")); - item.setPayload(incidence); + item.setPayload(incidence); if (!organizer.isEmpty()) { incidence->setOrganizer(organizer); diff -Nru akonadi-calendar-19.04.3/autotests/unittestbase.h akonadi-calendar-19.12.3/autotests/unittestbase.h --- akonadi-calendar-19.04.3/autotests/unittestbase.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/autotests/unittestbase.h 2020-02-21 17:12:44.000000000 +0000 @@ -20,7 +20,7 @@ #ifndef UNITTEST_BASE_H #define UNITTEST_BASE_H -#include +#include #include #include @@ -49,7 +49,7 @@ protected: - void compareCalendars(const KCalCore::Calendar::Ptr &expectedCalendar); + void compareCalendars(const KCalendarCore::Calendar::Ptr &expectedCalendar); static QByteArray readFile(const QString &filename); static Akonadi::Item generateIncidence(const QString &uid, const QString &organizer = QString()); diff -Nru akonadi-calendar-19.04.3/CMakeLists.txt akonadi-calendar-19.12.3/CMakeLists.txt --- akonadi-calendar-19.04.3/CMakeLists.txt 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/CMakeLists.txt 2020-03-03 00:32:52.000000000 +0000 @@ -1,12 +1,17 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.11.3") +set(PIM_VERSION "5.13.3") project(Akonadi-Calendar VERSION ${PIM_VERSION}) # ECM setup -set(KF5_MIN_VERSION "5.56.0") +set(KF5_MIN_VERSION "5.63.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) +set(QT_REQUIRED_VERSION "5.11.0") + +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(GenerateExportHeader) include(ECMGenerateHeaders) @@ -14,21 +19,16 @@ include(ECMSetupVersion) include(FeatureSummary) -include(KDEInstallDirs) -include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) set(AKONADICALENDAR_LIB_VERSION ${PIM_VERSION}) -set(CALENDARCORE_LIB_VERSION "5.11.3") -set(AKONADICONTACT_LIB_VERSION "5.11.3") -set(AKONADI_LIB_VERSION "5.11.3") -set(MAILTRANSPORT_LIB_VERSION "5.11.3") -set(KCONTACTS_LIB_VERSION "5.11.3") -set(CALENDARUTILS_LIB_VERSION "5.11.3") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.11.3") +set(AKONADICONTACT_LIB_VERSION "5.13.3") +set(AKONADI_LIB_VERSION "5.13.3") +set(MAILTRANSPORT_LIB_VERSION "5.13.3") +set(CALENDARUTILS_LIB_VERSION "5.13.3") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.13.3") ecm_setup_version(PROJECT VARIABLE_PREFIX AKONADICALENDAR VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/akonadi-calendar_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiCalendarConfigVersion.cmake" @@ -47,12 +47,11 @@ find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5MailTransportAkonadi ${MAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED) -find_package(KF5CalendarCore ${CALENDARCORE_LIB_VERSION} CONFIG REQUIRED) +find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5CalendarUtils ${CALENDARUTILS_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Akonadi ${AKONADI_LIB_VERSION} CONFIG REQUIRED) @@ -61,13 +60,13 @@ ########### Targets ########### -# workaround for https://bugreports.qt.io/browse/QTBUG-74665 (bug in qt5.13 reevaluate it) -if (${Qt5Widgets_VERSION} STRGREATER "5.13") - MESSAGE(STATUS "Qt version: ${Qt5Widgets_VERSION} DISABLE compile without deprecated methods. bug QTBUG-74665") -else() - add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) +if (EXISTS "${CMAKE_SOURCE_DIR}/.git") + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) endif() +add_definitions(-DQT_NO_FOREACH) + add_subdirectory(src) add_subdirectory(serializers) if (BUILD_TESTING) @@ -96,7 +95,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/akonadi-calendar_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -install( FILES akonadi-calendar.renamecategories akonadi-calendar.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) +install(FILES akonadi-calendar.renamecategories akonadi-calendar.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ki18n_install(po) diff -Nru akonadi-calendar-19.04.3/debian/changelog akonadi-calendar-19.12.3/debian/changelog --- akonadi-calendar-19.04.3/debian/changelog 2020-03-23 18:15:16.000000000 +0000 +++ akonadi-calendar-19.12.3/debian/changelog 2020-04-11 12:55:59.000000000 +0000 @@ -1,3 +1,11 @@ +akonadi-calendar (4:19.12.3-0ubuntu1) focal; urgency=medium + + * Move qdebug categories files to new location. + * New upstream release (19.12.3) + * Update symbols from build logs. + + -- Rik Mills Sat, 11 Apr 2020 13:55:59 +0100 + akonadi-calendar (4:19.04.3-0ubuntu2) focal; urgency=medium * No-change rebuild for libgcc-s1 package name change. diff -Nru akonadi-calendar-19.04.3/debian/control akonadi-calendar-19.12.3/debian/control --- akonadi-calendar-19.04.3/debian/control 2019-07-23 17:52:55.000000000 +0000 +++ akonadi-calendar-19.12.3/debian/control 2020-04-11 12:55:59.000000000 +0000 @@ -6,17 +6,17 @@ Build-Depends: cmake (>= 2.8.12~), debhelper (>= 9), extra-cmake-modules (>= 5.31.0~), - libkf5akonadi-dev (>= 4:19.04.3~), - libkf5akonadicontact-dev (>= 4:19.04.3~), - libkf5calendarcore-dev (>= 4:19.04.3~), - libkf5calendarutils-dev (>= 4:19.04.3~), + libkf5akonadi-dev (>= 4:19.12.3~), + libkf5akonadicontact-dev (>= 4:19.12.3~), + libkf5calendarcore-dev (>= 4:19.08.3~), + libkf5calendarutils-dev (>= 4:19.12.3~), libkf5codecs-dev (>= 5.31.0~), - libkf5contacteditor-dev (>= 4:19.04.3~), - libkf5contacts-dev (>= 4:19.04.3~), - libkf5identitymanagement-dev (>= 19.04.3~), + libkf5contacteditor-dev (>= 4:19.12.3~), + libkf5contacts-dev (>= 4:19.08.3~), + libkf5identitymanagement-dev (>= 19.12.3~), libkf5kdelibs4support-dev (>= 5.31.0~), libkf5kio-dev (>= 5.31.0~), - libkf5mailtransport-dev (>= 19.04.3~), + libkf5mailtransport-dev (>= 19.12.3~), libkf5wallet-dev (>= 5.31.0~), pkg-kde-tools (>> 0.15.15), qtbase5-dev (>= 5.6.1~), @@ -25,13 +25,23 @@ Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/akonadi-calendar Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/akonadi-calendar +Package: libkf5akonadicalendar-data +Architecture: all +Multi-Arch: foreign +Breaks: kdepim-runtime (<< 4:18.03.70~), ${kde-l10n:all} +Replaces: kdepim-runtime (<< 4:18.03.70~), ${kde-l10n:all} +Depends: ${misc:Depends} +Description: library providing calendar helpers for Akonadi items - data files + This library offers helper functions to integrate the use of Akonadi calendar + items in applications. + Package: libkf5akonadicalendar-dev Section: libdevel Architecture: any -Depends: libkf5akonadi-dev (>= 4:19.04.3~), +Depends: libkf5akonadi-dev (>= 4:19.12.3~), libkf5akonadicalendar5abi2 (= ${binary:Version}), - libkf5akonadicontact-dev (>= 4:19.04.3~), - libkf5calendarcore-dev (>= 4:19.04.3~), + libkf5akonadicontact-dev (>= 4:19.12.3~), + libkf5calendarcore-dev (>= 4:19.08.3~), ${misc:Depends}, Description: akonadi-calendar - development files This library offers helper functions to integrate the use of Akonadi calendar @@ -46,19 +56,9 @@ Multi-Arch: same Depends: libkf5akonadicalendar-data (= ${source:Version}), ${misc:Depends}, - ${shlibs:Depends} -Breaks: kdepim-runtime (<< 4:18.03.70~), + ${shlibs:Depends}, +Breaks: kdepim-runtime (<< 4:18.03.70~) Replaces: kdepim-runtime (<< 4:18.03.70~) Description: library providing calendar helpers for Akonadi items This library offers helper functions to integrate the use of Akonadi calendar items in applications. - -Package: libkf5akonadicalendar-data -Architecture: all -Multi-Arch: foreign -Breaks: kdepim-runtime (<< 4:18.03.70~), ${kde-l10n:all} -Replaces: kdepim-runtime (<< 4:18.03.70~), ${kde-l10n:all} -Depends: ${misc:Depends} -Description: library providing calendar helpers for Akonadi items - data files - This library offers helper functions to integrate the use of Akonadi calendar - items in applications. diff -Nru akonadi-calendar-19.04.3/debian/libkf5akonadicalendar5abi2.symbols akonadi-calendar-19.12.3/debian/libkf5akonadicalendar5abi2.symbols --- akonadi-calendar-19.04.3/debian/libkf5akonadicalendar5abi2.symbols 2019-07-23 17:52:55.000000000 +0000 +++ akonadi-calendar-19.12.3/debian/libkf5akonadicalendar5abi2.symbols 2020-04-11 12:55:59.000000000 +0000 @@ -1,14 +1,14 @@ -# SymbolsHelper-Confirmed: 4:19.04.3 amd64 arm64 armhf i386 ppc64el s390x +# SymbolsHelper-Confirmed: 4:19.12.3 amd64 arm64 armhf ppc64el s390x libKF5AkonadiCalendar.so.5abi2 libkf5akonadicalendar5abi2 #MINVER# ABI_5_2@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi10MailClient11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi10MailClient11qt_metacastEPKc@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi10MailClient13mailAttendeesERK14QSharedPointerIN8KCalCore13IncidenceBaseEERKN19KIdentityManagement8IdentityEbRK7QStringSD_@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi10MailClient13mailOrganizerERK14QSharedPointerIN8KCalCore13IncidenceBaseEERKN19KIdentityManagement8IdentityERK7QStringbSD_SD_SD_@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi10MailClient13mailAttendeesERK14QSharedPointerIN13KCalendarCore13IncidenceBaseEERKN19KIdentityManagement8IdentityEbRK7QStringSD_@ABI_5_2 4:19.12.3 + _ZN7Akonadi10MailClient13mailOrganizerERK14QSharedPointerIN13KCalendarCore13IncidenceBaseEERKN19KIdentityManagement8IdentityERK7QStringbSD_SD_SD_@ABI_5_2 4:19.12.3 _ZN7Akonadi10MailClient16staticMetaObjectE@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi10MailClient22handleQueueJobFinishedEP4KJob@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi10MailClient4sendERK14QSharedPointerIN8KCalCore13IncidenceBaseEERKN19KIdentityManagement8IdentityERK7QStringSD_SD_SD_SD_bbSD_SD_@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi10MailClient6mailToERK14QSharedPointerIN8KCalCore13IncidenceBaseEERKN19KIdentityManagement8IdentityERK7QStringbSD_SD_SD_@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi10MailClient4sendERK14QSharedPointerIN13KCalendarCore13IncidenceBaseEERKN19KIdentityManagement8IdentityERK7QStringSD_SD_SD_SD_bbSD_SD_@ABI_5_2 4:19.12.3 + _ZN7Akonadi10MailClient6mailToERK14QSharedPointerIN13KCalendarCore13IncidenceBaseEERKN19KIdentityManagement8IdentityERK7QStringbSD_SD_SD_@ABI_5_2 4:19.12.3 _ZN7Akonadi10MailClient8finishedENS0_6ResultERK7QString@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi10MailClientC1EPNS_27ITIPHandlerComponentFactoryEP7QObject@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi10MailClientC2EPNS_27ITIPHandlerComponentFactoryEP7QObject@ABI_5_2 4:17.07.70+git20170920.1507 @@ -50,12 +50,12 @@ _ZN7Akonadi11ITIPHandler11qt_metacastEPKc@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi11ITIPHandler11setCalendarERK14QSharedPointerINS_12CalendarBaseEE@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi11ITIPHandler15iTipMessageSentENS0_6ResultERK7QString@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi11ITIPHandler15sendAsICalendarERK14QSharedPointerIN8KCalCore9IncidenceEEP7QWidget@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi11ITIPHandler15sendiTIPMessageEN8KCalCore10iTIPMethodERK14QSharedPointerINS1_9IncidenceEEP7QWidget@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi11ITIPHandler15sendAsICalendarERK14QSharedPointerIN13KCalendarCore9IncidenceEEP7QWidget@ABI_5_2 4:19.12.3 + _ZN7Akonadi11ITIPHandler15sendiTIPMessageEN13KCalendarCore10iTIPMethodERK14QSharedPointerINS1_9IncidenceEEP7QWidget@ABI_5_2 4:19.12.3 _ZN7Akonadi11ITIPHandler15sentAsICalendarENS0_6ResultERK7QString@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi11ITIPHandler16staticMetaObjectE@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi11ITIPHandler18processiTIPMessageERK7QStringS3_S3_@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi11ITIPHandler18publishInformationERK14QSharedPointerIN8KCalCore9IncidenceEEP7QWidget@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi11ITIPHandler18publishInformationERK14QSharedPointerIN13KCalendarCore9IncidenceEEP7QWidget@ABI_5_2 4:19.12.3 _ZN7Akonadi11ITIPHandler20iTipMessageProcessedENS0_6ResultERK7QString@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi11ITIPHandler20informationPublishedENS0_6ResultERK7QString@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi11ITIPHandler21setShowDialogsOnErrorEb@ABI_5_2 4:17.07.70+git20170920.1507 @@ -67,24 +67,23 @@ _ZN7Akonadi11ITIPHandlerD0Ev@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi11ITIPHandlerD1Ev@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi11ITIPHandlerD2Ev@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi12CalendarBase10addJournalERK14QSharedPointerIN8KCalCore7JournalEE@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi12CalendarBase10deleteTodoERK14QSharedPointerIN8KCalCore4TodoEE@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi12CalendarBase11deleteEventERK14QSharedPointerIN8KCalCore5EventEE@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi12CalendarBase10addJournalERK14QSharedPointerIN13KCalendarCore7JournalEE@ABI_5_2 4:19.12.3 + _ZN7Akonadi12CalendarBase10deleteTodoERK14QSharedPointerIN13KCalendarCore4TodoEE@ABI_5_2 4:19.12.3 + _ZN7Akonadi12CalendarBase11deleteEventERK14QSharedPointerIN13KCalendarCore5EventEE@ABI_5_2 4:19.12.3 _ZN7Akonadi12CalendarBase11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi12CalendarBase11qt_metacastEPKc@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi12CalendarBase12addIncidenceERK14QSharedPointerIN8KCalCore9IncidenceEE@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi12CalendarBase13deleteJournalERK14QSharedPointerIN8KCalCore7JournalEE@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi12CalendarBase12addIncidenceERK14QSharedPointerIN13KCalendarCore9IncidenceEE@ABI_5_2 4:19.12.3 + _ZN7Akonadi12CalendarBase13deleteJournalERK14QSharedPointerIN13KCalendarCore7JournalEE@ABI_5_2 4:19.12.3 _ZN7Akonadi12CalendarBase14createFinishedEbRK7QString@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi12CalendarBase14deleteFinishedEbRK7QString@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi12CalendarBase14endBatchAddingEv@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi12CalendarBase14modifyFinishedEbRK7QString@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi12CalendarBase14setWeakPointerERK12QWeakPointerIS0_E@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi12CalendarBase15deleteIncidenceERK14QSharedPointerIN8KCalCore9IncidenceEE@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi12CalendarBase15modifyIncidenceERK14QSharedPointerIN8KCalCore9IncidenceEE@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi12CalendarBase15deleteIncidenceERK14QSharedPointerIN13KCalendarCore9IncidenceEE@ABI_5_2 4:19.12.3 + _ZN7Akonadi12CalendarBase15modifyIncidenceERK14QSharedPointerIN13KCalendarCore9IncidenceEE@ABI_5_2 4:19.12.3 _ZN7Akonadi12CalendarBase16startBatchAddingEv@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi12CalendarBase16staticMetaObjectE@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi12CalendarBase7addTodoERK14QSharedPointerIN8KCalCore4TodoEE@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi12CalendarBase8addEventERK14QSharedPointerIN8KCalCore5EventEE@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi12CalendarBase7addTodoERK14QSharedPointerIN13KCalendarCore4TodoEE@ABI_5_2 4:19.12.3 + _ZN7Akonadi12CalendarBase8addEventERK14QSharedPointerIN13KCalendarCore5EventEE@ABI_5_2 4:19.12.3 _ZN7Akonadi12CalendarBaseC1EP7QObject@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi12CalendarBaseC1EPNS_19CalendarBasePrivateEP7QObject@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi12CalendarBaseC2EP7QObject@ABI_5_2 4:17.07.70+git20170920.1507 @@ -101,7 +100,7 @@ _ZN7Akonadi12ICalImporter26importIntoExistingResourceERK4QUrlNS_10CollectionE@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi12ICalImporterC1EPNS_16IncidenceChangerEP7QObject@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi12ICalImporterC2EPNS_16IncidenceChangerEP7QObject@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi13PublishDialog11addAttendeeERK14QSharedPointerIN8KCalCore8AttendeeEE@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi13PublishDialog11addAttendeeERKN13KCalendarCore8AttendeeE@ABI_5_2 4:19.12.3 _ZN7Akonadi13PublishDialog11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi13PublishDialog11qt_metacastEPKc@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi13PublishDialog16staticMetaObjectE@ABI_5_2 4:17.07.70+git20170920.1507 @@ -118,12 +117,12 @@ _ZN7Akonadi15FreeBusyManager11setCalendarERK14QSharedPointerINS_11ETMCalendarEE@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi15FreeBusyManager12loadFreeBusyERK7QString@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi15FreeBusyManager12mailFreeBusyEiP7QWidget@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi15FreeBusyManager12saveFreeBusyERK14QSharedPointerIN8KCalCore8FreeBusyEERKS1_INS2_6PersonEE@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi15FreeBusyManager12saveFreeBusyERK14QSharedPointerIN13KCalendarCore8FreeBusyEERKNS2_6PersonE@ABI_5_2 4:19.12.3 _ZN7Akonadi15FreeBusyManager15cancelRetrievalEv@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi15FreeBusyManager15publishFreeBusyEP7QWidget@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi15FreeBusyManager16retrieveFreeBusyERK7QStringbP7QWidget@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi15FreeBusyManager16staticMetaObjectE@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi15FreeBusyManager17freeBusyRetrievedERK14QSharedPointerIN8KCalCore8FreeBusyEERK7QString@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi15FreeBusyManager17freeBusyRetrievedERK14QSharedPointerIN13KCalendarCore8FreeBusyEERK7QString@ABI_5_2 4:19.12.3 _ZN7Akonadi15FreeBusyManager4selfEv@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi15FreeBusyManagerC1Ev@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi15FreeBusyManagerC2Ev@ABI_5_2 4:17.07.70+git20170920.1507 @@ -150,9 +149,9 @@ _ZN7Akonadi16IncidenceChanger14createFinishedEiRKNS_4ItemENS0_10ResultCodeERK7QString@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi16IncidenceChanger14deleteFinishedEiRK7QVectorIxENS0_10ResultCodeERK7QString@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi16IncidenceChanger14modifyFinishedEiRKNS_4ItemENS0_10ResultCodeERK7QString@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi16IncidenceChanger15createIncidenceERK14QSharedPointerIN8KCalCore9IncidenceEERKNS_10CollectionEP7QWidget@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi16IncidenceChanger15createIncidenceERK14QSharedPointerIN13KCalendarCore9IncidenceEERKNS_10CollectionEP7QWidget@ABI_5_2 4:19.12.3 _ZN7Akonadi16IncidenceChanger15deleteIncidenceERKNS_4ItemEP7QWidget@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi16IncidenceChanger15modifyIncidenceERKNS_4ItemERK14QSharedPointerIN8KCalCore9IncidenceEEP7QWidget@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi16IncidenceChanger15modifyIncidenceERKNS_4ItemERK14QSharedPointerIN13KCalendarCore9IncidenceEEP7QWidget@ABI_5_2 4:19.12.3 _ZN7Akonadi16IncidenceChanger16deleteIncidencesERK7QVectorINS_4ItemEEP7QWidget@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi16IncidenceChanger16staticMetaObjectE@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi16IncidenceChanger17setHistoryEnabledEb@ABI_5_2 4:17.07.70+git20170920.1507 @@ -177,8 +176,8 @@ _ZN7Akonadi17CalendarClipboard11cutFinishedEbRK7QString@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi17CalendarClipboard11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi17CalendarClipboard11qt_metacastEPKc@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi17CalendarClipboard12cutIncidenceERK14QSharedPointerIN8KCalCore9IncidenceEENS0_4ModeE@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi17CalendarClipboard13copyIncidenceERK14QSharedPointerIN8KCalCore9IncidenceEENS0_4ModeE@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi17CalendarClipboard12cutIncidenceERK14QSharedPointerIN13KCalendarCore9IncidenceEENS0_4ModeE@ABI_5_2 4:19.12.3 + _ZN7Akonadi17CalendarClipboard13copyIncidenceERK14QSharedPointerIN13KCalendarCore9IncidenceEENS0_4ModeE@ABI_5_2 4:19.12.3 _ZN7Akonadi17CalendarClipboard16staticMetaObjectE@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi17CalendarClipboardC1ERK14QSharedPointerINS_12CalendarBaseEEPNS_16IncidenceChangerEP7QObject@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi17CalendarClipboardC2ERK14QSharedPointerINS_12CalendarBaseEEPNS_16IncidenceChangerEP7QObject@ABI_5_2 4:17.07.70+git20170920.1507 @@ -194,7 +193,7 @@ _ZN7Akonadi19GroupwareUiDelegateD1Ev@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi19GroupwareUiDelegateD2Ev@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi20BlockAlarmsAttribute11deserializeERK10QByteArray@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi20BlockAlarmsAttribute14blockAlarmTypeEN8KCalCore5Alarm4TypeEb@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi20BlockAlarmsAttribute14blockAlarmTypeEN13KCalendarCore5Alarm4TypeEb@ABI_5_2 4:19.12.3 _ZN7Akonadi20BlockAlarmsAttribute15blockEverythingEb@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi20BlockAlarmsAttributeC1Ev@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi20BlockAlarmsAttributeC2Ev@ABI_5_2 4:17.07.70+git20170920.1507 @@ -209,19 +208,19 @@ _ZN7Akonadi20FreeBusyProviderBaseD2Ev@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi25ITIPHandlerDialogDelegate11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi25ITIPHandlerDialogDelegate11qt_metacastEPKc@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi25ITIPHandlerDialogDelegate12dialogClosedEiN8KCalCore10iTIPMethodERK14QSharedPointerINS1_9IncidenceEE@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi25ITIPHandlerDialogDelegate12dialogClosedEiN13KCalendarCore10iTIPMethodERK14QSharedPointerINS1_9IncidenceEE@ABI_5_2 4:19.12.3 _ZN7Akonadi25ITIPHandlerDialogDelegate16staticMetaObjectE@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi25ITIPHandlerDialogDelegate26openDialogIncidenceCreatedENS0_9RecipientERK7QStringNS0_6ActionERK8KGuiItemS8_@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi25ITIPHandlerDialogDelegate26openDialogIncidenceDeletedENS0_9RecipientERK7QStringNS0_6ActionERK8KGuiItemS8_@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi25ITIPHandlerDialogDelegate27openDialogIncidenceModifiedEbNS0_9RecipientERK7QStringNS0_6ActionERK8KGuiItemS8_@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi25ITIPHandlerDialogDelegate27openDialogSchedulerFinishedERK7QStringNS0_6ActionERK8KGuiItemS7_@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi25ITIPHandlerDialogDelegateC1ERK14QSharedPointerIN8KCalCore9IncidenceEENS2_10iTIPMethodEP7QWidget@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi25ITIPHandlerDialogDelegateC2ERK14QSharedPointerIN8KCalCore9IncidenceEENS2_10iTIPMethodEP7QWidget@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi25ITIPHandlerDialogDelegateC1ERK14QSharedPointerIN13KCalendarCore9IncidenceEENS2_10iTIPMethodEP7QWidget@ABI_5_2 4:19.12.3 + _ZN7Akonadi25ITIPHandlerDialogDelegateC2ERK14QSharedPointerIN13KCalendarCore9IncidenceEENS2_10iTIPMethodEP7QWidget@ABI_5_2 4:19.12.3 _ZN7Akonadi27ITIPHandlerComponentFactory11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi27ITIPHandlerComponentFactory11qt_metacastEPKc@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi27ITIPHandlerComponentFactory16staticMetaObjectE@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi27ITIPHandlerComponentFactory21createMessageQueueJobERK14QSharedPointerIN8KCalCore13IncidenceBaseEERKN19KIdentityManagement8IdentityEP7QObject@ABI_5_2 4:17.07.70+git20170920.1507 - _ZN7Akonadi27ITIPHandlerComponentFactory30createITIPHanderDialogDelegateERK14QSharedPointerIN8KCalCore9IncidenceEENS2_10iTIPMethodEP7QWidget@ABI_5_2 4:17.07.70+git20170920.1507 + _ZN7Akonadi27ITIPHandlerComponentFactory21createMessageQueueJobERK14QSharedPointerIN13KCalendarCore13IncidenceBaseEERKN19KIdentityManagement8IdentityEP7QObject@ABI_5_2 4:19.12.3 + _ZN7Akonadi27ITIPHandlerComponentFactory30createITIPHanderDialogDelegateERK14QSharedPointerIN13KCalendarCore9IncidenceEENS2_10iTIPMethodEP7QWidget@ABI_5_2 4:19.12.3 _ZN7Akonadi27ITIPHandlerComponentFactoryC1EP7QObject@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi27ITIPHandlerComponentFactoryC2EP7QObject@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi27ITIPHandlerComponentFactoryD0Ev@ABI_5_2 4:17.07.70+git20170920.1507 @@ -247,6 +246,7 @@ _ZN7Akonadi29StandardCalendarActionManagerD0Ev@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi29StandardCalendarActionManagerD1Ev@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi29StandardCalendarActionManagerD2Ev@ABI_5_2 4:17.07.70+git20170920.1507 + (optional=templinst|arch=!s390x)_ZN7Akonadi4Item14setPayloadImplI14QSharedPointerIN13KCalendarCore9IncidenceEEEENSt9enable_ifIXntsrNS_8Internal12PayloadTraitIT_EE13isPolymorphicEvE4typeERKS9_@ABI_5_2 4:19.12.3 (optional=templinst)_ZN7Akonadi4Item14setPayloadImplI14QSharedPointerIN8KCalCore9IncidenceEEEENSt9enable_ifIXntsrNS_8Internal12PayloadTraitIT_EE13isPolymorphicEvE4typeERKS9_@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi7History11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_2 4:17.07.70+git20170920.1507 _ZN7Akonadi7History11qt_metacastEPKc@ABI_5_2 4:17.07.70+git20170920.1507 @@ -302,16 +302,15 @@ _ZNK7Akonadi12CalendarBase10childItemsERK7QString@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi12CalendarBase10childItemsEx@ABI_5_2 4:19.04.3 _ZNK7Akonadi12CalendarBase10metaObjectEv@ABI_5_2 4:17.07.70+git20170920.1507 - _ZNK7Akonadi12CalendarBase11weakPointerEv@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi12CalendarBase15childIncidencesERK7QString@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi12CalendarBase15childIncidencesEx@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi12CalendarBase16incidenceChangerEv@ABI_5_2 4:17.07.70+git20170920.1507 - _ZNK7Akonadi12CalendarBase4itemERK14QSharedPointerIN8KCalCore9IncidenceEE@ABI_5_2 4:17.07.70+git20170920.1507 + _ZNK7Akonadi12CalendarBase4itemERK14QSharedPointerIN13KCalendarCore9IncidenceEE@ABI_5_2 4:19.12.3 _ZNK7Akonadi12CalendarBase4itemERK7QString@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi12CalendarBase4itemEx@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi12CalendarBase5itemsEx@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi12CalendarBase8isLoadedEv@ABI_5_2 4:17.07.70+git20170920.1507 - _ZNK7Akonadi12CalendarBase8itemListERK7QVectorI14QSharedPointerIN8KCalCore9IncidenceEEE@ABI_5_2 4:17.07.70+git20170920.1507 + _ZNK7Akonadi12CalendarBase8itemListERK7QVectorI14QSharedPointerIN13KCalendarCore9IncidenceEEE@ABI_5_2 4:19.12.3 _ZNK7Akonadi12ICalImporter10metaObjectEv@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi12ICalImporter12errorMessageEv@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi13PublishDialog10metaObjectEv@ABI_5_2 4:17.07.70+git20170920.1507 @@ -335,7 +334,7 @@ _ZNK7Akonadi17CalendarClipboard14pasteAvailableEv@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi19GroupwareUiDelegate10metaObjectEv@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi20BlockAlarmsAttribute10serializedEv@ABI_5_2 4:17.07.70+git20170920.1507 - _ZNK7Akonadi20BlockAlarmsAttribute18isAlarmTypeBlockedEN8KCalCore5Alarm4TypeE@ABI_5_2 4:17.07.70+git20170920.1507 + _ZNK7Akonadi20BlockAlarmsAttribute18isAlarmTypeBlockedEN13KCalendarCore5Alarm4TypeE@ABI_5_2 4:19.12.3 _ZNK7Akonadi20BlockAlarmsAttribute19isEverythingBlockedEv@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi20BlockAlarmsAttribute4typeEv@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi20BlockAlarmsAttribute5cloneEv@ABI_5_2 4:17.07.70+git20170920.1507 @@ -348,13 +347,20 @@ _ZNK7Akonadi29StandardCalendarActionManager19selectedCollectionsEv@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi29StandardCalendarActionManager6actionENS0_4TypeE@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi29StandardCalendarActionManager6actionENS_21StandardActionManager4TypeE@ABI_5_2 4:17.07.70+git20170920.1507 + (optional=templinst)_ZNK7Akonadi4Item10hasPayloadI14QSharedPointerIN13KCalendarCore9IncidenceEEEEbv@ABI_5_2 4:19.12.3 (optional=templinst|arch=ppc64el)_ZNK7Akonadi4Item10hasPayloadI14QSharedPointerIN8KCalCore4TodoEEEEbv@ABI_5_2 4:18.04.3 (optional=templinst)_ZNK7Akonadi4Item10hasPayloadI14QSharedPointerIN8KCalCore9IncidenceEEEEbv@ABI_5_2 4:17.07.70+git20170920.1507 + (optional=templinst)_ZNK7Akonadi4Item11payloadImplI14QSharedPointerIN13KCalendarCore9IncidenceEEEENSt9enable_ifIXntsrNS_8Internal12PayloadTraitIT_EE13isPolymorphicES9_E4typeEv@ABI_5_2 4:19.12.3 (optional=templinst)_ZNK7Akonadi4Item11payloadImplI14QSharedPointerIN8KCalCore9IncidenceEEEENSt9enable_ifIXntsrNS_8Internal12PayloadTraitIT_EE13isPolymorphicES9_E4typeEv@ABI_5_2 4:17.07.70+git20170920.1507 + (optional=templinst|arch=!s390x)_ZNK7Akonadi4Item14hasPayloadImplI14QSharedPointerIN13KCalendarCore4TodoEEEENSt9enable_ifIXsrNS_8Internal12PayloadTraitIT_EE13isPolymorphicEbE4typeEPKi@ABI_5_2 4:19.12.3 + (optional=templinst)_ZNK7Akonadi4Item14hasPayloadImplI14QSharedPointerIN13KCalendarCore9IncidenceEEEENSt9enable_ifIXntsrNS_8Internal12PayloadTraitIT_EE13isPolymorphicEbE4typeEv@ABI_5_2 4:19.12.3 (optional=templinst)_ZNK7Akonadi4Item14hasPayloadImplI14QSharedPointerIN8KCalCore4TodoEEEENSt9enable_ifIXsrNS_8Internal12PayloadTraitIT_EE13isPolymorphicEbE4typeEPKi@ABI_5_2 4:17.07.70+git20170920.1507 (optional=templinst)_ZNK7Akonadi4Item14hasPayloadImplI14QSharedPointerIN8KCalCore9IncidenceEEEENSt9enable_ifIXntsrNS_8Internal12PayloadTraitIT_EE13isPolymorphicEbE4typeEv@ABI_5_2 4:17.07.70+git20170920.1507 + (optional=templinst)_ZNK7Akonadi4Item14tryToCloneImplI14QSharedPointerIN13KCalendarCore9IncidenceEEN5boost10shared_ptrIS4_EEEENSt9enable_ifIXntsrSt7is_sameIT_T0_E5valueEbE4typeEPSB_PKi@ABI_5_2 4:19.12.3 + (optional=templinst)_ZNK7Akonadi4Item14tryToCloneImplI14QSharedPointerIN13KCalendarCore9IncidenceEESt10shared_ptrIS4_EEENSt9enable_ifIXntsrSt7is_sameIT_T0_E5valueEbE4typeEPSA_PKi@ABI_5_2 4:19.12.3 (optional=templinst)_ZNK7Akonadi4Item14tryToCloneImplI14QSharedPointerIN8KCalCore9IncidenceEEN5boost10shared_ptrIS4_EEEENSt9enable_ifIXntsrSt7is_sameIT_T0_E5valueEbE4typeEPSB_PKi@ABI_5_2 4:17.07.70+git20170920.1507 (optional=templinst)_ZNK7Akonadi4Item14tryToCloneImplI14QSharedPointerIN8KCalCore9IncidenceEESt10shared_ptrIS4_EEENSt9enable_ifIXntsrSt7is_sameIT_T0_E5valueEbE4typeEPSA_PKi@ABI_5_2 4:17.07.70+git20170920.1507 + (optional=templinst|arch=!ppc64el)_ZNK7Akonadi4Item7payloadI14QSharedPointerIN13KCalendarCore9IncidenceEEEET_v@ABI_5_2 4:19.12.3 (optional=templinst|arch=!ppc64el)_ZNK7Akonadi4Item7payloadI14QSharedPointerIN8KCalCore9IncidenceEEEET_v@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi7History10metaObjectEv@ABI_5_2 4:17.07.70+git20170920.1507 _ZNK7Akonadi7History13redoAvailableEv@ABI_5_2 4:17.07.70+git20170920.1507 @@ -431,6 +437,6 @@ (c++)"non-virtual thunk to Akonadi::ETMCalendar::~ETMCalendar()@ABI_5_2" 4:17.07.70+git20170920.1507 (c++)"non-virtual thunk to Akonadi::FetchJobCalendar::~FetchJobCalendar()@ABI_5_2" 4:17.07.70+git20170920.1507 (c++)"non-virtual thunk to Akonadi::FreeBusyManager::loadFreeBusy(QString const&)@ABI_5_2" 4:17.07.70+git20170920.1507 - (c++)"non-virtual thunk to Akonadi::FreeBusyManager::saveFreeBusy(QSharedPointer const&, QSharedPointer const&)@ABI_5_2" 4:17.07.70+git20170920.1507 + (c++)"non-virtual thunk to Akonadi::FreeBusyManager::saveFreeBusy(QSharedPointer const&, KCalendarCore::Person const&)@ABI_5_2" 4:19.12.3 (c++)"non-virtual thunk to Akonadi::FreeBusyManager::~FreeBusyManager()@ABI_5_2" 4:17.07.70+git20170920.1507 (c++)"non-virtual thunk to Akonadi::PublishDialog::~PublishDialog()@ABI_5_2" 4:17.07.70+git20170920.1507 diff -Nru akonadi-calendar-19.04.3/debian/libkf5akonadicalendar-data.install akonadi-calendar-19.12.3/debian/libkf5akonadicalendar-data.install --- akonadi-calendar-19.04.3/debian/libkf5akonadicalendar-data.install 2019-07-23 17:52:55.000000000 +0000 +++ akonadi-calendar-19.12.3/debian/libkf5akonadicalendar-data.install 2020-04-11 12:55:59.000000000 +0000 @@ -1,4 +1,4 @@ -etc/xdg/akonadi-calendar.categories -etc/xdg/akonadi-calendar.renamecategories usr/share/akonadi/plugins/serializer/akonadi_serializer_kcalcore.desktop usr/share/locale +usr/share/qlogging-categories5/akonadi-calendar.categories +usr/share/qlogging-categories5/akonadi-calendar.renamecategories diff -Nru akonadi-calendar-19.04.3/debian/libkf5akonadicalendar-data.maintscript akonadi-calendar-19.12.3/debian/libkf5akonadicalendar-data.maintscript --- akonadi-calendar-19.04.3/debian/libkf5akonadicalendar-data.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ akonadi-calendar-19.12.3/debian/libkf5akonadicalendar-data.maintscript 2020-04-11 12:55:59.000000000 +0000 @@ -0,0 +1,2 @@ +rm_conffile /etc/xdg/akonadi-calendar.categories +rm_conffile /etc/xdg/akonadi-calendar.renamecategories diff -Nru akonadi-calendar-19.04.3/KF5AkonadiCalendarConfig.cmake.in akonadi-calendar-19.12.3/KF5AkonadiCalendarConfig.cmake.in --- akonadi-calendar-19.04.3/KF5AkonadiCalendarConfig.cmake.in 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/KF5AkonadiCalendarConfig.cmake.in 2020-02-21 17:12:44.000000000 +0000 @@ -1,7 +1,7 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) find_dependency(KF5Akonadi "@AKONADI_LIB_VERSION@") -find_dependency(KF5CalendarCore "@CALENDARCORE_LIB_VERSION@") +find_dependency(KF5CalendarCore "@KF5_MIN_VERSION@") find_dependency(KF5I18n "@KF5_MIN_VERSION@") find_dependency(KF5WidgetsAddons "@KF5_MIN_VERSION@") diff -Nru akonadi-calendar-19.04.3/metainfo.yaml akonadi-calendar-19.12.3/metainfo.yaml --- akonadi-calendar-19.04.3/metainfo.yaml 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/metainfo.yaml 2020-02-21 17:12:44.000000000 +0000 @@ -12,7 +12,7 @@ libraries: - qmake: AkonadiCalendar cmake: "KF5::AkonadiCalendar" - cmakename: KF5AkonadiCalendar +cmakename: KF5AkonadiCalendar public_lib: true group: kdepim diff -Nru akonadi-calendar-19.04.3/po/ar/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/ar/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/ar/libakonadi-calendar5.po 2019-07-09 00:19:23.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ar/libakonadi-calendar5.po 2020-03-03 00:32:47.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2018-01-31 10:37+0300\n" "Last-Translator: Safa Alfulaij \n" "Language-Team: Arabic \n" @@ -18,7 +18,7 @@ "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" "X-Generator: Lokalize 2.0\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "تعذّر العثور على الحدوث لتحديثه، أغلب الظّنّ أنّه حُذف حديثًا." @@ -91,49 +91,49 @@ msgid "Copy All" msgstr "انسخ الكلّ" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "ملخّص" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "تاريخ ووقت البدء" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "تاريخ ووقت الانتهاء" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "النوع" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "تاريخ الاستحقاق ووقته" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "الأولويّة" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "الاكتمال" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -281,7 +281,7 @@ "النّطاق لمعرّف المستخدم الذي تبحث عنه. فمثلًا (إن ضُبط هذا الخيار) البحث عنه " "بيانات متفرّغ/مشغول لِ‍ joe@mydomain.com على الخادوم www.yourdomain.com سيفشل." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -290,17 +290,17 @@ "فشل تنزيل بيانات متفرّغ/مشغول من: %1\n" "السّبب: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "خطأ في جلب متفرّغ/مشغول" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "فشل تحليل معلومات متفرّغ/مشغول التي جُلبت من: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -313,22 +313,22 @@ "صحيح. قال النّظام: %2.

رجاءً افحص المسار أو تواصل مع مدير " "النّظام.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "أُرسلت معلومات متفرّغ/مشغول بنجاح." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "يُرسل متفرّغ/مشغول" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "تعذّر نشر بيانات متفرّغ/مشغول: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -339,17 +339,17 @@ "حواريّ ضبط «منظّمك»، في صفحة ”متفرّغ/مشغول“.

راسل مدير النّظام لتعرف " "المسار بالضّبط وتفاصيل الحساب.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "لا مسار رفع متفرّغ/مشغول" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr " مسار ’%1‘ الهدف الموفّر غير صالح." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "المسار غير صالح" @@ -453,17 +453,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "حُذف عنصر التّقويم بالفعل، أو أنّه يجري حذفه." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "لا يمكن إجراء العمليّة بسبب تقييدات ACL" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "التّجميعة المنتقاة غير صالحة" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -472,19 +472,19 @@ "التّجميعة المبدئيّة غير صالحة أو أنّها لا تملك قوائم ACL صحيحة وقد استخدمت " "DestinationPolicyNeverAsk" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "معرّف العنصر متكرّر في عمليّة لمجموعة" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " "rolled back." msgstr "فشل تغيير ينتمي إلى مجموعة تغييرات. يتراجع عن كلّ التّغييرات." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "خطأ مجهول" @@ -514,28 +514,28 @@ msgid "Invalid incidence" msgstr "الحدوث غير صالح" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "الإجراء غير صالح: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "خطأ في إرسال مقترح التّعداد" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "تعذّر بدء المحرّر لتحرير مقترح التّعداد" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "ليس للعنصر ’%1‘ حضور. لهذا لن تُرسل رسالة جماعيّة." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "لم تُرسل الرّسالة" @@ -736,7 +736,7 @@ "لقد قبلت مسبقًا دعوة إلى هذا الحدث. أتريد إرسال ردًّا محدّثًا إلى المنظّم لرفض " "الدّعوة؟" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "مقترح التّعداد: %1" @@ -782,7 +782,7 @@ msgid "Error queuing message in outbox: %1" msgstr "خطأ أثناء الاستعلام عن الرّسالة في صندوق الصّادر: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "خطأ في إرسال البريد: " @@ -947,12 +947,12 @@ msgid "This field contains the email address of the recipient" msgstr "يحتوي هذا الحقل عنوان بريد المستلم الإلكترونيّ" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(اسم فارغ)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(بريد فارغ)" @@ -967,7 +967,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "هذا ليس تحديثًا. الحدوث الذي عُثر عليه عُدّل بعد هذا." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "خطأ أثناء تعديل الحدوث" @@ -1024,49 +1024,49 @@ "تعذّرت إزالة الحدث أو المهمّة من التّقويم. لربّما حُذف/حُذفت فعلًا أو أنّك لا تملكه/" "تملكها. أو ربّما لأنّه/لأنّها ينتمي/تنتمي إلى تقويم معطّل أو للقراءة فقط." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "خطأ عامّ" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "يريد %1 حضور %2 ولكنّه لم يُدعَ." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "يريد %1 حضور %2 بدلًا عن %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "حاضر غير مدعوّ" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "اقبل حضوره" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "ارفض حضوره" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "رفض المنظّم حضورك هذا الاجتماع." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1074,35 +1074,35 @@ "an update message?" msgstr "أُضيف حاضر إلى الحدوث. أتريد بَرْد الحضور برسالة تحديث؟" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "أُضيف الحاضر" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "أرسل رسائل" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "لا تُرسل شيئًا" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "لا حدوث لجدولته." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "لا خبيئة متفرّغ/مشغول" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "خطأ أثناء حفظ كائن متفرّغ/مشغول" diff -Nru akonadi-calendar-19.04.3/po/ar/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/ar/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/ar/libakonadi-calendar5-serializer.po 2019-07-09 00:19:23.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ar/libakonadi-calendar5-serializer.po 2020-03-03 00:32:47.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2018-01-28 16:42+0300\n" "Last-Translator: Safa Alfulaij \n" "Language-Team: Arabic \n" diff -Nru akonadi-calendar-19.04.3/po/bs/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/bs/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/bs/libakonadi-calendar5.po 2019-07-09 00:19:23.000000000 +0000 +++ akonadi-calendar-19.12.3/po/bs/libakonadi-calendar5.po 2020-03-03 00:32:47.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdepimlibs\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2013-12-30 16:56+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: Bosnian \n" @@ -20,7 +20,7 @@ "X-Launchpad-Export-Date: 2013-12-31 05:22+0000\n" "X-Generator: Launchpad (build 16877)\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -94,49 +94,49 @@ msgid "Copy All" msgstr "Kopiraj sve" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Sumarno" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Početni datum i vrijeme" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Krajnji datum i vrijeme" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Tip" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Datum i vrijeme roka" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioritet" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Završeno" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -288,7 +288,7 @@ "slobodnom / zauzetom za joe@mydomain.com na poslužitelju www.yourdomain.com " "neće uspjeti." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -297,18 +297,18 @@ "Neuspjelo preuzimanje podataka o slobodnom/zauzezom: %1\n" "Razlog: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Greška u preuzimanju slobodnog/zauzetog" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Greška u analizi informacije o slobodnom/zauzetom koja je preuzeta s %1." -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -321,22 +321,22 @@ "Sistem je rekao: %2.

Molim provjerite URL ili kontaktirajte " "sistem administratora.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "informacije o slobodnom/zauzetom su uspješno poslane." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Slanje informacija o slobodnom/zauzetom" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Ne mogu da objavim informacije o slobodnom/zauzetom: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -348,17 +348,17 @@ "\"Slobodan/Zauzet\" stranici.

Kontaktirajte sistem administratora za " "tačan URL detalje oi nalogu.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Nema URL za slanje informacije o slobodnom/zauzetom" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Odredišni URL '%1' koji je naveden je nevažećo." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Neispravan URL" @@ -463,18 +463,18 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "Kalendarska stavka je već bila obrisana ili se trenutno briše" -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "" "Operacija se ne može obaviti zbog ograničenja na listama prava pristupa" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Izabrana kolekcija je nevažeća" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -483,12 +483,12 @@ "Podrazumijevana kolekcija je nevažeća ili nema odgovarajuću listu prava " "pristupa i pravilo da se na odredištu ne postavlja pitanje je korišteno" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Dupla oznaka stavke u grupnoh operaciji" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -497,7 +497,7 @@ "Jedna promjena koja pripada grupi promjena je neuspjela. Sve promjene su " "vraćene" -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Nepoznata greška" @@ -527,28 +527,28 @@ msgid "Invalid incidence" msgstr "Pogrešna pojava" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Neispravna akcija: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Gerška slanja kontra prijedloga" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Ne mogu pokrenuti editor za uređivanje kontra prijedloga" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "Stavka '%1' nema prisutnij. Stoga se grupna poruka neće slati." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Poruka nije poslana" @@ -755,7 +755,7 @@ "Prethodno ste prihvatili poziv na ovaj događaj. Želite li poslati ažurirani " "odgovor organizatoru da odbijate poziv?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Kontra prijedlog %1" @@ -802,7 +802,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Greška u stavljanju u red poruke u odlaznoj pošti %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Gerška slanaj elektronske pošte " @@ -976,12 +976,12 @@ msgid "This field contains the email address of the recipient" msgstr "Ovo polje sadrži adresu elektronske pošte primaoca" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(PraznoIme)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(PrazanEmail)" @@ -996,7 +996,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "Ovo nije ažuriranje. Nađeni incident je izmijenjen nedavno" -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Greška pri izmjeni incidenta" @@ -1064,49 +1064,49 @@ "obrisan ili niste njegov vlasnik. Ili možda pripada kalendaru koji je samo " "za čitanje ili onemogućen." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Generička greška" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 želi da prisustvuje %2 ali nije pozvan." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 želi da prisustvuje %2 u ime %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Nepozvan učesnik" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Prihvati prisustvo" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Odbij prisustvo" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Organizator je odbio vaše učešće na sastanku" -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1116,35 +1116,35 @@ "Učesnik je dodan na incident. Želite li poslati elektronskom poštom " "učesnicima ažurnu poruku." -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Dodan učesnik" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Pošalji poruke" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Ne moj slati" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Nema incidenata za zakazivanje" -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Nema skrovišta za slobodno/zazeto" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Greška pri snimanju objekta o slobodnom/zauzetom" diff -Nru akonadi-calendar-19.04.3/po/bs/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/bs/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/bs/libakonadi-calendar5-serializer.po 2019-07-09 00:19:23.000000000 +0000 +++ akonadi-calendar-19.12.3/po/bs/libakonadi-calendar5-serializer.po 2020-03-03 00:32:47.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins.po\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2015-02-04 16:00+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: bs \n" diff -Nru akonadi-calendar-19.04.3/po/ca/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/ca/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/ca/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ca/libakonadi-calendar5.po 2020-03-03 00:32:47.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2017-12-30 17:36+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -21,7 +21,7 @@ "X-Accelerator-Marker: &\n" "X-Generator: Lokalize 2.0\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -97,49 +97,49 @@ msgid "Copy All" msgstr "Copia-ho tot" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Resum" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Data i hora inicials" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Data i hora finals" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Tipus" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Data i hora de venciment" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioritat" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "% completat" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -293,7 +293,7 @@ "cerca de les dades de lliure/ocupat de jordi@meudomini.com en el servidor " "www.teudomini.com no funcionarà." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -302,19 +302,19 @@ "Ha fallat en descarregar la informació de lliure/ocupat des de: %1\n" "Motiu: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Error en la recuperació de lliure/ocupat" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Ha fallat en analitzar la informació de lliure/ocupat que es va recuperar " "des de: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -327,22 +327,22 @@ "incorrecte. El sistema ha indicat: %2.

Comproveu l'URL o " "contacteu amb l'administrador del sistema.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "La informació de lliure/ocupat s'ha enviat amb èxit." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "S'està enviant la informació de lliure/ocupat" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "No s'han pogut publicar les dades per a lliure/ocupat: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -354,17 +354,17 @@ "«Lliure/Ocupat».

Pregunteu a l'administrador del sistema l'URL exacte " "i els detalls del compte.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "No hi ha cap URL de pujada per a lliure/ocupat" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "L'URL proporcionat de destinació «%1» no és vàlid." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "URL no vàlid" @@ -472,17 +472,17 @@ msgstr "" "Aquest element de calendari ja s'ha suprimit, o s'està suprimint ara mateix." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "L'operació no es pot portar a terme per restriccions de l'ACL" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "La col·lecció seleccionada no és vàlida" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -491,12 +491,12 @@ "La col·lecció per defecte no és vàlida o no té les ACL adequades i s'ha " "utilitzat «DestinationPolicyNeverAsk»" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "ID d'element duplicat en una operació de grup" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -505,7 +505,7 @@ "Ha fallat un canvi que pertany a un grup de canvis. Tots els canvis es " "desfaran." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Error desconegut" @@ -535,22 +535,22 @@ msgid "Invalid incidence" msgstr "Incidència no vàlida" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Acció no vàlida: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Error en enviar la contraproposta" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "No s'ha pogut iniciar l'editor per editar la contraproposta" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -558,7 +558,7 @@ "L'element «%1» no té cap assistent. Per tant, no s'enviarà cap missatge de " "treball en grup." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "El missatge no s'ha enviat" @@ -768,7 +768,7 @@ "Prèviament heu acceptat una invitació a aquest esdeveniment. Voleu enviar " "una resposta actualitzada a l'organitzador declinant la invitació?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Contraproposta: %1" @@ -814,7 +814,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Error en enviar el missatge a la cua de la safata de sortida: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Error enviant el correu: " @@ -992,12 +992,12 @@ msgid "This field contains the email address of the recipient" msgstr "Aquest camp conté l'adreça de correu electrònic del destinatari" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(NomBuit)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(CorreuElectrònicBuit)" @@ -1014,7 +1014,7 @@ "Això no és una actualització. La incidència trobada s'ha modificat més " "recentment." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Error en modificar la incidència" @@ -1073,49 +1073,49 @@ "suprimit o no sou el propietari. O potser pertany a un calendari desactivat " "o de només lectura." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Error genèric" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 vol assistir a %2 però no ha estat invitat." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 vol assistir a %2 en lloc de %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Assistent no invitat" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Accepta l'assistència" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Rebutja l'assistència" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "L'organitzador ha rebutjat la vostra assistència a aquesta reunió." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1125,35 +1125,35 @@ "S'ha afegit un assistent a la incidència. Voleu enviar als assistents un " "missatge d'actualització?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "S'ha afegit l'assistent" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Envia els missatges" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "No els enviïs" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Sense incidències a planificar." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "No hi ha memòria cau de lliure/ocupat" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Error en desar un objecte de lliure/ocupat" diff -Nru akonadi-calendar-19.04.3/po/ca/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/ca/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/ca/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ca/libakonadi-calendar5-serializer.po 2020-03-03 00:32:48.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar5-serializer\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2015-05-27 12:28+0200\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -196,378 +196,3 @@ #, kde-format msgid "Conflicting Todo" msgstr "Pendent amb conflictes" - -#~ msgid "Changed Contact" -#~ msgstr "Contacte canviat" - -#~ msgid "Conflicting Contact" -#~ msgstr "Contacte amb conflictes" - -#~ msgid "Emails" -#~ msgstr "Correus electrònics" - -#~ msgid "Phone Numbers" -#~ msgstr "Números de telèfon" - -#~ msgid "Addresses" -#~ msgstr "Adreces" - -#~ msgid "Changed Contact Group" -#~ msgstr "Grup de contactes canviat" - -#~ msgid "Conflicting Contact Group" -#~ msgstr "Grup de contactes amb conflictes" - -#~ msgid "Name" -#~ msgstr "Nom" - -#~ msgid "Member" -#~ msgstr "Membre" - -#~ msgctxt "@title:column" -#~ msgid "Changed Alarm" -#~ msgstr "Alarma canviada" - -#~ msgctxt "@title:column" -#~ msgid "Conflicting Alarm" -#~ msgstr "Alarma amb conflictes" - -#~ msgctxt "@label" -#~ msgid "Item revision" -#~ msgstr "Revisió de l'element" - -#~ msgctxt "@label Unique identifier" -#~ msgid "UID" -#~ msgstr "UID" - -#~ msgctxt "@label" -#~ msgid "Alarm type" -#~ msgstr "Tipus d'alarma" - -#~ msgctxt "@label" -#~ msgid "Alarm status" -#~ msgstr "Estat de l'alarma" - -#~ msgctxt "@label" -#~ msgid "Template name" -#~ msgstr "Nom de la plantilla" - -#~ msgctxt "@label" -#~ msgid "Creation time" -#~ msgstr "Hora de creació" - -#~ msgctxt "@label" -#~ msgid "Start time" -#~ msgstr "Hora d'inici" - -#~ msgctxt "@label Start delay configured in an alarm template" -#~ msgid "Template after time" -#~ msgstr "Retard des d'una plantilla" - -#~ msgctxt "@label" -#~ msgid "Recurs" -#~ msgstr "Repeteix" - -#~ msgctxt "@label" -#~ msgid "Recurrence" -#~ msgstr "Recurrència" - -#~ msgctxt "@label" -#~ msgid "Sub-repetition" -#~ msgstr "Subrepetició" - -#~ msgctxt "@label" -#~ msgid "Sub-repetition interval" -#~ msgstr "Interval de subrepetició" - -#~ msgctxt "@label" -#~ msgid "Sub-repetition count" -#~ msgstr "Comptador de subrepeticions" - -#~ msgctxt "@label" -#~ msgid "Next sub-repetition" -#~ msgstr "Subrepetició següent" - -#~ msgctxt "@label" -#~ msgid "Work time only" -#~ msgstr "Només horari laboral" - -#~ msgctxt "@label" -#~ msgid "Holidays excluded" -#~ msgstr "Festius exclosos" - -#~ msgctxt "@label" -#~ msgid "Next recurrence" -#~ msgstr "Recurrència següent" - -#~ msgctxt "@label" -#~ msgid "Late cancel" -#~ msgstr "Cancel·lació retardada" - -#~ msgctxt "@label Automatically close window" -#~ msgid "Auto close" -#~ msgstr "Tancament automàtic" - -#~ msgctxt "@label" -#~ msgid "Copy to KOrganizer" -#~ msgstr "Copia al KOrganizer" - -#~ msgctxt "@label" -#~ msgid "Enabled" -#~ msgstr "Activat" - -#~ msgctxt "@label" -#~ msgid "Read-only" -#~ msgstr "Només lectura" - -#~ msgctxt "@label Whether alarm should be archived" -#~ msgid "Archive" -#~ msgstr "Arxiu" - -#~ msgctxt "@label" -#~ msgid "Revision" -#~ msgstr "Revisió" - -#~ msgctxt "@label" -#~ msgid "Custom properties" -#~ msgstr "Propietats personalitzades" - -#~ msgctxt "@label" -#~ msgid "Message text" -#~ msgstr "Text del missatge" - -#~ msgctxt "@label File to provide text for message" -#~ msgid "Message file" -#~ msgstr "Fitxer del missatge" - -#~ msgctxt "@label" -#~ msgid "Foreground color" -#~ msgstr "Color de primer pla" - -#~ msgctxt "@label" -#~ msgid "Background color" -#~ msgstr "Color de fons" - -#~ msgctxt "@label" -#~ msgid "Font" -#~ msgstr "Tipus de lletra" - -#~ msgctxt "@label Shell command to execute before alarm" -#~ msgid "Pre-alarm action" -#~ msgstr "Acció de prealarma" - -#~ msgctxt "@label" -#~ msgid "Pre-alarm action cancel" -#~ msgstr "Cancel·la l'acció de la prealarma" - -#~ msgctxt "@label" -#~ msgid "Pre-alarm action no error" -#~ msgstr "Acció de prealarma sense error" - -#~ msgctxt "@label Shell command to execute after alarm" -#~ msgid "Post-alarm action" -#~ msgstr "Acció de postalarma" - -#~ msgctxt "@label" -#~ msgid "Confirm acknowledgement" -#~ msgstr "Confirma l'acceptació" - -#~ msgctxt "@label" -#~ msgid "KMail serial number" -#~ msgstr "Número de sèrie del KMail" - -#~ msgctxt "@label Audio method" -#~ msgid "Sound" -#~ msgstr "So" - -#~ msgctxt "@label Whether audio should repeat" -#~ msgid "Sound repeat" -#~ msgstr "Repetició del so" - -#~ msgctxt "@label" -#~ msgid "Sound volume" -#~ msgstr "Volum del so" - -#~ msgctxt "@label" -#~ msgid "Sound fade volume" -#~ msgstr "Volum d'esvaïment del so" - -#~ msgctxt "@label" -#~ msgid "Sound fade time" -#~ msgstr "Temps d'esvaïment del so" - -#~ msgctxt "@label Whether the alarm has a reminder" -#~ msgid "Reminder" -#~ msgstr "Recordatori" - -#~ msgctxt "@label Whether reminder is on first recurrence only" -#~ msgid "Reminder once only" -#~ msgstr "Recordatori únic" - -#~ msgctxt "@label Deferral type" -#~ msgid "Deferral" -#~ msgstr "Ajornament" - -#~ msgctxt "@label" -#~ msgid "Deferral time" -#~ msgstr "Temps d'ajornament" - -#~ msgctxt "@label Default deferral delay" -#~ msgid "Deferral default" -#~ msgstr "Ajornament per defecte" - -#~ msgctxt "@label Whether deferral time is date-only by default" -#~ msgid "Deferral default date only" -#~ msgstr "Ajornament per omissió només per data" - -#~ msgctxt "@label A shell command" -#~ msgid "Command" -#~ msgstr "Ordre" - -#~ msgctxt "@label" -#~ msgid "Log file" -#~ msgstr "Fitxer de registre" - -#~ msgctxt "@label Execute in terminal window" -#~ msgid "Execute in terminal" -#~ msgstr "Executa en un terminal" - -#~ msgctxt "@label" -#~ msgid "Email subject" -#~ msgstr "Assumpte del correu electrònic" - -#~ msgctxt "@label Email address" -#~ msgid "Email sender ID" -#~ msgstr "ID del remitent del correu electrònic" - -#~ msgctxt "@label Email address" -#~ msgid "Email to" -#~ msgstr "Adreça A" - -#~ msgctxt "@label true/false" -#~ msgid "Email bcc" -#~ msgstr "Adreça BCC" - -#~ msgctxt "@label" -#~ msgid "Email body" -#~ msgstr "Cos del correu" - -#~ msgctxt "@label" -#~ msgid "Email attachments" -#~ msgstr "Adjunts del correu" - -#~ msgctxt "@info Alarm type" -#~ msgid "Display (text)" -#~ msgstr "Mostra (text)" - -#~ msgctxt "@info Alarm type" -#~ msgid "Display (file)" -#~ msgstr "Mostra (fitxer)" - -#~ msgctxt "@info Alarm type" -#~ msgid "Display (command)" -#~ msgstr "Mostra (ordre)" - -#~ msgctxt "@info Alarm type" -#~ msgid "Command" -#~ msgstr "Ordre" - -#~ msgctxt "@info Alarm type" -#~ msgid "Email" -#~ msgstr "Correu electrònic" - -#~ msgctxt "@info Alarm type" -#~ msgid "Audio" -#~ msgstr "Àudio" - -#~ msgctxt "@info Alarm type" -#~ msgid "Active" -#~ msgstr "Activa" - -#~ msgctxt "@info Alarm type" -#~ msgid "Archived" -#~ msgstr "Arxivada" - -#~ msgctxt "@info Alarm type" -#~ msgid "Template" -#~ msgstr "Plantilla" - -#~ msgctxt "@info Repeat at login" -#~ msgid "At login until %1" -#~ msgstr "En entrar fins %1" - -#~ msgctxt "@info" -#~ msgid "%1" -#~ msgstr "%1" - -#~ msgctxt "@info Using default font" -#~ msgid "Default" -#~ msgstr "Per defecte" - -#~ msgctxt "@info" -#~ msgid "Reminder" -#~ msgstr "Recordatori" - -#~ msgctxt "@info" -#~ msgid "Speak" -#~ msgstr "Pronuncia" - -#~ msgctxt "@info" -#~ msgid "Beep" -#~ msgstr "Timbre" - -#~ msgctxt "@info Percentage" -#~ msgid "%1%%" -#~ msgstr "%1%%" - -#~ msgctxt "@info" -#~ msgid "1 Second" -#~ msgid_plural "%1 Seconds" -#~ msgstr[0] "1 segon" -#~ msgstr[1] "%1 segons" - -#~ msgctxt "@info Error indication" -#~ msgid "error!" -#~ msgstr "error!" - -#~ msgctxt "@info General purpose status indication: yes or no" -#~ msgid "Yes" -#~ msgstr "Sí" - -#~ msgctxt "@info General purpose status indication: yes or no" -#~ msgid "No" -#~ msgstr "No" - -#~ msgctxt "@info" -#~ msgid "1 Minute" -#~ msgid_plural "%1 Minutes" -#~ msgstr[0] "1 minut" -#~ msgstr[1] "%1 minuts" - -#~ msgctxt "@info" -#~ msgid "1 Hour" -#~ msgid_plural "%1 Hours" -#~ msgstr[0] "1 hora" -#~ msgstr[1] "%1 hores" - -#~ msgctxt "@info" -#~ msgid "1 Day" -#~ msgid_plural "%1 Days" -#~ msgstr[0] "1 dia" -#~ msgstr[1] "%1 dies" - -#~ msgctxt "@info/plain Alarm type" -#~ msgid "Command" -#~ msgstr "Ordre" - -#~ msgctxt "@info/plain" -#~ msgid "Reminder" -#~ msgstr "Recordatori" - -#~ msgctxt "@info/plain General purpose status indication: yes or no" -#~ msgid "Yes" -#~ msgstr "Sí" - -#~ msgctxt "@info/plain General purpose status indication: yes or no" -#~ msgid "No" -#~ msgstr "No" diff -Nru akonadi-calendar-19.04.3/po/ca@valencia/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/ca@valencia/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/ca@valencia/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ca@valencia/libakonadi-calendar5.po 2020-03-03 00:32:48.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2017-12-30 17:36+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -21,7 +21,7 @@ "X-Accelerator-Marker: &\n" "X-Generator: Lokalize 2.0\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -97,49 +97,49 @@ msgid "Copy All" msgstr "Copia-ho tot" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Resum" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Data i hora inicials" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Data i hora finals" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Tipus" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Data i hora de venciment" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioritat" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "% completat" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -293,7 +293,7 @@ "cerca de les dades de lliure/ocupat de jordi@meudomini.com en el servidor " "www.teudomini.com no funcionarà." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -302,19 +302,19 @@ "Ha fallat en descarregar la informació de lliure/ocupat des de: %1\n" "Motiu: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Error en la recuperació de lliure/ocupat" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Ha fallat en analitzar la informació de lliure/ocupat que es va recuperar " "des de: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -327,22 +327,22 @@ "incorrecte. El sistema ha indicat: %2.

Comproveu l'URL o " "contacteu amb l'administrador del sistema.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "La informació de lliure/ocupat s'ha enviat amb èxit." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "S'està enviant la informació de lliure/ocupat" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "No s'han pogut publicar les dades per a lliure/ocupat: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -354,17 +354,17 @@ "«Lliure/Ocupat».

Pregunteu a l'administrador del sistema l'URL exacte " "i els detalls del compte.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "No hi ha cap URL de pujada per a lliure/ocupat" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "L'URL proporcionat de destinació «%1» no és vàlid." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "URL no vàlid" @@ -472,17 +472,17 @@ msgstr "" "Aquest element de calendari ja s'ha suprimit, o s'està suprimint ara mateix." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "L'operació no es pot portar a terme per restriccions de l'ACL" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "La col·lecció seleccionada no és vàlida" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -491,12 +491,12 @@ "La col·lecció per defecte no és vàlida o no té les ACL adequades i s'ha " "utilitzat «DestinationPolicyNeverAsk»" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "ID d'element duplicat en una operació de grup" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -505,7 +505,7 @@ "Ha fallat un canvi que pertany a un grup de canvis. Tots els canvis es " "desfaran." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Error desconegut" @@ -535,22 +535,22 @@ msgid "Invalid incidence" msgstr "Incidència no vàlida" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Acció no vàlida: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Error en enviar la contraproposta" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "No s'ha pogut iniciar l'editor per editar la contraproposta" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -558,7 +558,7 @@ "L'element «%1» no té cap assistent. Per tant, no s'enviarà cap missatge de " "treball en grup." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "El missatge no s'ha enviat" @@ -768,7 +768,7 @@ "Prèviament heu acceptat una invitació a aquest esdeveniment. Voleu enviar " "una resposta actualitzada a l'organitzador declinant la invitació?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Contraproposta: %1" @@ -814,7 +814,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Error en enviar el missatge a la cua de la safata d'eixida: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Error enviant el correu: " @@ -992,12 +992,12 @@ msgid "This field contains the email address of the recipient" msgstr "Aquest camp conté l'adreça de correu electrònic del destinatari" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(NomBuit)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(CorreuElectrònicBuit)" @@ -1014,7 +1014,7 @@ "Això no és una actualització. La incidència trobada s'ha modificat més " "recentment." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Error en modificar la incidència" @@ -1073,49 +1073,49 @@ "suprimit o no sou el propietari. O potser pertany a un calendari desactivat " "o de només lectura." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Error genèric" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 vol assistir a %2 però no ha estat invitat." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 vol assistir a %2 en lloc de %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Assistent no invitat" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Accepta l'assistència" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Rebutja l'assistència" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "L'organitzador ha rebutjat la vostra assistència a aquesta reunió." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1125,35 +1125,35 @@ "S'ha afegit un assistent a la incidència. Voleu enviar als assistents un " "missatge d'actualització?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "S'ha afegit l'assistent" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Envia els missatges" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "No els envies" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Sense incidències a planificar." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "No hi ha memòria cau de lliure/ocupat" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Error en guardar un objecte de lliure/ocupat" diff -Nru akonadi-calendar-19.04.3/po/ca@valencia/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/ca@valencia/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/ca@valencia/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ca@valencia/libakonadi-calendar5-serializer.po 2020-03-03 00:32:48.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar5-serializer\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2015-05-27 12:28+0200\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -196,378 +196,3 @@ #, kde-format msgid "Conflicting Todo" msgstr "Pendent amb conflictes" - -#~ msgid "Changed Contact" -#~ msgstr "Contacte canviat" - -#~ msgid "Conflicting Contact" -#~ msgstr "Contacte amb conflictes" - -#~ msgid "Emails" -#~ msgstr "Correus electrònics" - -#~ msgid "Phone Numbers" -#~ msgstr "Números de telèfon" - -#~ msgid "Addresses" -#~ msgstr "Adreces" - -#~ msgid "Changed Contact Group" -#~ msgstr "Grup de contactes canviat" - -#~ msgid "Conflicting Contact Group" -#~ msgstr "Grup de contactes amb conflictes" - -#~ msgid "Name" -#~ msgstr "Nom" - -#~ msgid "Member" -#~ msgstr "Membre" - -#~ msgctxt "@title:column" -#~ msgid "Changed Alarm" -#~ msgstr "Alarma canviada" - -#~ msgctxt "@title:column" -#~ msgid "Conflicting Alarm" -#~ msgstr "Alarma amb conflictes" - -#~ msgctxt "@label" -#~ msgid "Item revision" -#~ msgstr "Revisió de l'element" - -#~ msgctxt "@label Unique identifier" -#~ msgid "UID" -#~ msgstr "UID" - -#~ msgctxt "@label" -#~ msgid "Alarm type" -#~ msgstr "Tipus d'alarma" - -#~ msgctxt "@label" -#~ msgid "Alarm status" -#~ msgstr "Estat de l'alarma" - -#~ msgctxt "@label" -#~ msgid "Template name" -#~ msgstr "Nom de la plantilla" - -#~ msgctxt "@label" -#~ msgid "Creation time" -#~ msgstr "Hora de creació" - -#~ msgctxt "@label" -#~ msgid "Start time" -#~ msgstr "Hora d'inici" - -#~ msgctxt "@label Start delay configured in an alarm template" -#~ msgid "Template after time" -#~ msgstr "Retard des d'una plantilla" - -#~ msgctxt "@label" -#~ msgid "Recurs" -#~ msgstr "Repeteix" - -#~ msgctxt "@label" -#~ msgid "Recurrence" -#~ msgstr "Recurrència" - -#~ msgctxt "@label" -#~ msgid "Sub-repetition" -#~ msgstr "Subrepetició" - -#~ msgctxt "@label" -#~ msgid "Sub-repetition interval" -#~ msgstr "Interval de subrepetició" - -#~ msgctxt "@label" -#~ msgid "Sub-repetition count" -#~ msgstr "Comptador de subrepeticions" - -#~ msgctxt "@label" -#~ msgid "Next sub-repetition" -#~ msgstr "Subrepetició següent" - -#~ msgctxt "@label" -#~ msgid "Work time only" -#~ msgstr "Només horari laboral" - -#~ msgctxt "@label" -#~ msgid "Holidays excluded" -#~ msgstr "Festius exclosos" - -#~ msgctxt "@label" -#~ msgid "Next recurrence" -#~ msgstr "Recurrència següent" - -#~ msgctxt "@label" -#~ msgid "Late cancel" -#~ msgstr "Cancel·lació retardada" - -#~ msgctxt "@label Automatically close window" -#~ msgid "Auto close" -#~ msgstr "Tancament automàtic" - -#~ msgctxt "@label" -#~ msgid "Copy to KOrganizer" -#~ msgstr "Copia al KOrganizer" - -#~ msgctxt "@label" -#~ msgid "Enabled" -#~ msgstr "Activat" - -#~ msgctxt "@label" -#~ msgid "Read-only" -#~ msgstr "Només lectura" - -#~ msgctxt "@label Whether alarm should be archived" -#~ msgid "Archive" -#~ msgstr "Arxiu" - -#~ msgctxt "@label" -#~ msgid "Revision" -#~ msgstr "Revisió" - -#~ msgctxt "@label" -#~ msgid "Custom properties" -#~ msgstr "Propietats personalitzades" - -#~ msgctxt "@label" -#~ msgid "Message text" -#~ msgstr "Text del missatge" - -#~ msgctxt "@label File to provide text for message" -#~ msgid "Message file" -#~ msgstr "Fitxer del missatge" - -#~ msgctxt "@label" -#~ msgid "Foreground color" -#~ msgstr "Color de primer pla" - -#~ msgctxt "@label" -#~ msgid "Background color" -#~ msgstr "Color de fons" - -#~ msgctxt "@label" -#~ msgid "Font" -#~ msgstr "Tipus de lletra" - -#~ msgctxt "@label Shell command to execute before alarm" -#~ msgid "Pre-alarm action" -#~ msgstr "Acció de prealarma" - -#~ msgctxt "@label" -#~ msgid "Pre-alarm action cancel" -#~ msgstr "Cancel·la l'acció de la prealarma" - -#~ msgctxt "@label" -#~ msgid "Pre-alarm action no error" -#~ msgstr "Acció de prealarma sense error" - -#~ msgctxt "@label Shell command to execute after alarm" -#~ msgid "Post-alarm action" -#~ msgstr "Acció de postalarma" - -#~ msgctxt "@label" -#~ msgid "Confirm acknowledgement" -#~ msgstr "Confirma l'acceptació" - -#~ msgctxt "@label" -#~ msgid "KMail serial number" -#~ msgstr "Número de sèrie del KMail" - -#~ msgctxt "@label Audio method" -#~ msgid "Sound" -#~ msgstr "So" - -#~ msgctxt "@label Whether audio should repeat" -#~ msgid "Sound repeat" -#~ msgstr "Repetició del so" - -#~ msgctxt "@label" -#~ msgid "Sound volume" -#~ msgstr "Volum del so" - -#~ msgctxt "@label" -#~ msgid "Sound fade volume" -#~ msgstr "Volum d'esvaïment del so" - -#~ msgctxt "@label" -#~ msgid "Sound fade time" -#~ msgstr "Temps d'esvaïment del so" - -#~ msgctxt "@label Whether the alarm has a reminder" -#~ msgid "Reminder" -#~ msgstr "Recordatori" - -#~ msgctxt "@label Whether reminder is on first recurrence only" -#~ msgid "Reminder once only" -#~ msgstr "Recordatori únic" - -#~ msgctxt "@label Deferral type" -#~ msgid "Deferral" -#~ msgstr "Ajornament" - -#~ msgctxt "@label" -#~ msgid "Deferral time" -#~ msgstr "Temps d'ajornament" - -#~ msgctxt "@label Default deferral delay" -#~ msgid "Deferral default" -#~ msgstr "Ajornament per defecte" - -#~ msgctxt "@label Whether deferral time is date-only by default" -#~ msgid "Deferral default date only" -#~ msgstr "Ajornament per omissió només per data" - -#~ msgctxt "@label A shell command" -#~ msgid "Command" -#~ msgstr "Ordre" - -#~ msgctxt "@label" -#~ msgid "Log file" -#~ msgstr "Fitxer de registre" - -#~ msgctxt "@label Execute in terminal window" -#~ msgid "Execute in terminal" -#~ msgstr "Executa en un terminal" - -#~ msgctxt "@label" -#~ msgid "Email subject" -#~ msgstr "Assumpte del correu electrònic" - -#~ msgctxt "@label Email address" -#~ msgid "Email sender ID" -#~ msgstr "ID del remitent del correu electrònic" - -#~ msgctxt "@label Email address" -#~ msgid "Email to" -#~ msgstr "Adreça A" - -#~ msgctxt "@label true/false" -#~ msgid "Email bcc" -#~ msgstr "Adreça BCC" - -#~ msgctxt "@label" -#~ msgid "Email body" -#~ msgstr "Cos del correu" - -#~ msgctxt "@label" -#~ msgid "Email attachments" -#~ msgstr "Adjunts del correu" - -#~ msgctxt "@info Alarm type" -#~ msgid "Display (text)" -#~ msgstr "Mostra (text)" - -#~ msgctxt "@info Alarm type" -#~ msgid "Display (file)" -#~ msgstr "Mostra (fitxer)" - -#~ msgctxt "@info Alarm type" -#~ msgid "Display (command)" -#~ msgstr "Mostra (ordre)" - -#~ msgctxt "@info Alarm type" -#~ msgid "Command" -#~ msgstr "Ordre" - -#~ msgctxt "@info Alarm type" -#~ msgid "Email" -#~ msgstr "Correu electrònic" - -#~ msgctxt "@info Alarm type" -#~ msgid "Audio" -#~ msgstr "Àudio" - -#~ msgctxt "@info Alarm type" -#~ msgid "Active" -#~ msgstr "Activa" - -#~ msgctxt "@info Alarm type" -#~ msgid "Archived" -#~ msgstr "Arxivada" - -#~ msgctxt "@info Alarm type" -#~ msgid "Template" -#~ msgstr "Plantilla" - -#~ msgctxt "@info Repeat at login" -#~ msgid "At login until %1" -#~ msgstr "En entrar fins %1" - -#~ msgctxt "@info" -#~ msgid "%1" -#~ msgstr "%1" - -#~ msgctxt "@info Using default font" -#~ msgid "Default" -#~ msgstr "Per defecte" - -#~ msgctxt "@info" -#~ msgid "Reminder" -#~ msgstr "Recordatori" - -#~ msgctxt "@info" -#~ msgid "Speak" -#~ msgstr "Pronuncia" - -#~ msgctxt "@info" -#~ msgid "Beep" -#~ msgstr "Timbre" - -#~ msgctxt "@info Percentage" -#~ msgid "%1%%" -#~ msgstr "%1%%" - -#~ msgctxt "@info" -#~ msgid "1 Second" -#~ msgid_plural "%1 Seconds" -#~ msgstr[0] "1 segon" -#~ msgstr[1] "%1 segons" - -#~ msgctxt "@info Error indication" -#~ msgid "error!" -#~ msgstr "error!" - -#~ msgctxt "@info General purpose status indication: yes or no" -#~ msgid "Yes" -#~ msgstr "Sí" - -#~ msgctxt "@info General purpose status indication: yes or no" -#~ msgid "No" -#~ msgstr "No" - -#~ msgctxt "@info" -#~ msgid "1 Minute" -#~ msgid_plural "%1 Minutes" -#~ msgstr[0] "1 minut" -#~ msgstr[1] "%1 minuts" - -#~ msgctxt "@info" -#~ msgid "1 Hour" -#~ msgid_plural "%1 Hours" -#~ msgstr[0] "1 hora" -#~ msgstr[1] "%1 hores" - -#~ msgctxt "@info" -#~ msgid "1 Day" -#~ msgid_plural "%1 Days" -#~ msgstr[0] "1 dia" -#~ msgstr[1] "%1 dies" - -#~ msgctxt "@info/plain Alarm type" -#~ msgid "Command" -#~ msgstr "Ordre" - -#~ msgctxt "@info/plain" -#~ msgid "Reminder" -#~ msgstr "Recordatori" - -#~ msgctxt "@info/plain General purpose status indication: yes or no" -#~ msgid "Yes" -#~ msgstr "Sí" - -#~ msgctxt "@info/plain General purpose status indication: yes or no" -#~ msgid "No" -#~ msgstr "No" diff -Nru akonadi-calendar-19.04.3/po/cs/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/cs/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/cs/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/cs/libakonadi-calendar5.po 2020-03-03 00:32:48.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2018-01-09 14:43+0100\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Lokalize 2.0\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -88,49 +88,49 @@ msgid "Copy All" msgstr "Zkopírovat vše" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Shrnutí" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Počáteční datum a čas" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Konečný datum a čas" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Typ" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Konečný datum a čas" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Priorita" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Dokončeno" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -274,7 +274,7 @@ "joe@mydomain.com on the server www.yourdomain.com will fail." msgstr "" -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -283,17 +283,17 @@ "Stažení dat aktivit z %1 selhalo\n" "Důvod: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Chyba při získávání aktivit" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "Analýza informací o aktivitě získaných z %1 selhala" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -306,22 +306,22 @@ "odpověděl: %2.

Zkontrolujte prosím URL nebo kontaktujte svého " "administrátora.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Informace o aktivitě byly úspěšně odeslány." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Odesílá se aktivita" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Nelze publikovat informace o aktivitě: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -333,17 +333,17 @@ "\"Aktivita\".

Kontaktujte administrátora vašeho systému pro přesné " "zadání URL a podrobnosti účtu.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Žádné URL pro publikování aktivity" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Cílové URL '%1' je neplatné." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Neplatné URL" @@ -447,36 +447,36 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "" -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " "DestinationPolicyNeverAsk was used" msgstr "" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " "rolled back." msgstr "" -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Neznámá chyba" @@ -506,28 +506,28 @@ msgid "Invalid incidence" msgstr "Neplatný výskyt" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Neplatná činnost: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "" @@ -727,7 +727,7 @@ "an updated response to the organizer declining the invitation?" msgstr "" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Protinávrh: %1" @@ -773,7 +773,7 @@ msgid "Error queuing message in outbox: %1" msgstr "" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Chyba při odesílání pošty: " @@ -936,12 +936,12 @@ msgid "This field contains the email address of the recipient" msgstr "" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(PrázdnéJméno)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(PrázdnýEmail)" @@ -956,7 +956,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "" -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "" @@ -1005,49 +1005,49 @@ "only or disabled calendar." msgstr "" -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Obecná chyba" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 se chce zúčastnit %2, ale nebyl(a) pozván(a)." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 se chce zúčastnit %2 ve jménu %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Nepozvaný účastník" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Přijmout účast" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Odmítnout účast" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Organizátor zamítl vaši účast na této schůzce." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1055,35 +1055,35 @@ "an update message?" msgstr "" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Účastník přidán" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Odeslat zprávy" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Neodesílat" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "" -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "" diff -Nru akonadi-calendar-19.04.3/po/cs/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/cs/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/cs/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/cs/libakonadi-calendar5-serializer.po 2020-03-03 00:32:48.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-10-21 14:56+0200\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" diff -Nru akonadi-calendar-19.04.3/po/da/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/da/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/da/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/da/libakonadi-calendar5.po 2020-03-03 00:32:48.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2016-07-11 21:52+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" @@ -17,7 +17,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -93,49 +93,49 @@ msgid "Copy All" msgstr "Kopiér alle" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Resumé" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Startdato og -tidspunkt" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Slutdato og -tidspunkt" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Type" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Forfaldsdato og -tidspunkt" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioritet" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Gennemført" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -285,7 +285,7 @@ "eksempel, hvis denne indstilling er aktiveret, så vil det ikke lykkes at " "finde ledig/optaget-data for john@mitdomæne.dk på serveren www.ditdomæne.dk." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -294,18 +294,18 @@ "Kunne ikke downloade ledig/optaget-information fra: %1\n" "Årsag: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Fejl ved hentning af ledig/opdaget" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Kunne ikke fortolke ledig/optaget-informationen der blev hentet fra: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -318,22 +318,22 @@ "en forkert URL. Systemet sagde: %2.

Kontrollér URL'en eller " "kontakt din systemadministrator.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Afsendelse af ledig/optaget-information gennemført." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Sender ledig/optaget" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Kan ikke offentliggøre ledig/optaget-information: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -345,17 +345,17 @@ "

Kontakt din systemadministrator vedrørende den præcise URL og " "kontodetaljerne.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Ingen upload-URL til ledig/optaget" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Den angvine mål-URL \"%1\" er ugyldig." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Ugyldig URL" @@ -461,17 +461,17 @@ "Kalenderelementet var allerede slettet, eller er ved at blive slettet i " "øjeblikket." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Operationen kan ikke udføres pga. ACL-begrænsninger" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Den valgte samling er ugyldig" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -480,12 +480,12 @@ "Standardsamlingen er ugyldig eller har ikke de rette ACL'er og der blev " "brugt DestinationPolicyNeverAsk" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Dupliker element-id i en gruppeoperation" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -494,7 +494,7 @@ "En ændring der hører til en gruppe af ændringer mislykkedes. Alle ændringer " "rulles tilbage." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Ukendt fejl" @@ -524,22 +524,22 @@ msgid "Invalid incidence" msgstr "Ugyldig forekomst" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Ugyldig handling: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Fejl ved afsendelse af modforslag" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Kunne ikke starte editor til redigering af modforslag" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -547,7 +547,7 @@ "Elementet \"%1\" har ingen deltagere. Derfor vil der ikke blive sendt nogen " "groupware-besked." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Besked ikke sendt" @@ -753,7 +753,7 @@ "Du havde tidligere accepteret en invitation til denne begivenhed. Vil du " "sende et opdateret svar til organisatoren hvor invitationen afslås?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Modforslag: %1" @@ -799,7 +799,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Fejl ved i-kø-sætning af brev i udbakken: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Fejl ved afsendelse af e-mail: " @@ -976,12 +976,12 @@ msgid "This field contains the email address of the recipient" msgstr "Dette felt indeholder modtagerens e-mailadresse" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(TomtNavn)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(TomE-mail)" @@ -998,7 +998,7 @@ "Dette er ikke en opdatering. Den fundne forekomst er blevet ændret for " "kortere tid siden." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Fejl under ændring af forekomst" @@ -1058,49 +1058,49 @@ "allerede blevet slettet, den ejes ikke af dig eller den hører til en " "skrivebeskyttet eller deaktiveret kalender." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Generisk fejl" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 ønsker at deltage i %2 men blev ikke inviteret." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 ønsker at deltage i %2 på vegne af %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Ikke-inviteret deltager" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Acceptér deltagelse" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Afslå deltagelse" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Organisatoren afslog din deltagelse i dette møde." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1110,35 +1110,35 @@ "En deltager blev føjet til forekomsten. Vil du sende en opdateringsbesked " "til deltagerne via e-mail?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Deltager tilføjet" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Send breve" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Send ikke" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Ingen forekomst til skemalægning." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Ingen ledig/opdaget-cache" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Fejl under gemning af ledig/opdaget-objekt" diff -Nru akonadi-calendar-19.04.3/po/da/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/da/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/da/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/da/libakonadi-calendar5-serializer.po 2020-03-03 00:32:48.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2015-12-08 19:03+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" diff -Nru akonadi-calendar-19.04.3/po/de/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/de/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/de/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/de/libakonadi-calendar5.po 2020-03-03 00:32:48.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2018-11-05 16:58+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -95,49 +95,49 @@ msgid "Copy All" msgstr "Alle kopieren" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Zusammenfassung" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Anfangsdatum und -zeit" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Enddatum und -zeit" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Typ" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Fälligkeitsdatum und -zeit" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Priorität" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Beendet" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -290,7 +290,7 @@ "Suche von Frei/Belegt-Informationen des Benutzers thomas@meinedomain.de auf " "dem Server anderedomain.de fehlschlagen." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -299,18 +299,18 @@ "Frei/Belegt-Information sind nicht von „%1“ heruntergeladen worden. Grund: " "„%2“" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Fehlernachricht bei Frei/Belegt-Informationen" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Frei/Belegt-Informationen empfangen von „%1“ sind nicht verarbeitet worden." -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -324,22 +324,22 @@ "lautet: %2.

Bitte überprüfen Sie die Adresse oder wenden Sie " "sich an Ihren Systemadministrator.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Die Frei/Belegt-Informationen wurden erfolgreich gesendet." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Frei/Belegt-Informationen versenden " -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Das Auslesen der Frei/Belegt-Informationen ist nicht möglich: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -351,17 +351,17 @@ "Seite „Frei/Belegt“ an.

Fragen Sie Ihren Systemadministrator nach der " "genauen Adresse und den Zugangsdaten.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Keine Adresse zur Veröffentlichung von Frei/Belegt-Informationen" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Die angegebene Zieladresse „%1“ ist ungültig" -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Ungültige Adresse" @@ -469,19 +469,19 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "Der Kalender wurde bereits gelöscht oder wird gerade gelöscht." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "" "Die Aktion kann aufgrund von Beschränkungen in der Zugriffskontrollliste " "(ACL) nicht ausgeführt werden" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Die gewählte Sammlung ist ungültig" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -490,12 +490,12 @@ "Die Standard-Sammlung ist ungültig oder hat falsche Berechnungen und " "DestinationPolicyNeverAsk wurde benutzt" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Doppelte Kennung eines Eintrags in einer Gruppenoperation" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -504,7 +504,7 @@ "Eine von mehreren, zu einer Gruppe gehörenden, Änderungen ist " "fehlgeschlagen. Alle Änderungen werden zurückgenommen." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Unbekannter Fehler" @@ -534,23 +534,23 @@ msgid "Invalid incidence" msgstr "Ungültiges Ereignis" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Ungültige Aktion: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Fehler beim Senden des Gegenvorschlags" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "" "Es kann kein Editor zur Bearbeitung des Gegenvorschlags gestartet werden" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -558,7 +558,7 @@ "Der Eintrag „%1“ hat keine Teilnehmer. Daher wird keine Groupware-Nachricht " "versendet." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Nachricht wurde nicht versendet" @@ -768,7 +768,7 @@ "Sie haben vorher eine Einladung zu diesem Termin akzeptiert. Möchten Sie dem " "Organisator mitteilen, dass Sie den Termin absagen?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Gegenvorschlag: %1" @@ -817,7 +817,7 @@ msgstr "" "Fehler beim Einfügen der Nachricht in die Warteschlange des Postausgangs: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Fehler beim Senden der E-Mail: " @@ -996,12 +996,12 @@ msgid "This field contains the email address of the recipient" msgstr "Dieses Feld enthält die E-Mail-Adresse des Empfängers." -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(Leerer Name)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(Leere E-Mail)" @@ -1018,7 +1018,7 @@ "Dies ist keine Aktualisierung, Das gefundene Ereignis wurde erst kürzlich " "geändert." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Fehler beim Bearbeiten des Ereignisses" @@ -1080,49 +1080,49 @@ "Eventuell gehört es auch zu einem deaktivierten Kalender oder einem, aus dem " "nur gelesen werden kann." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Allgemeiner Fehler" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 möchte an %2 teilnehmen, wurde aber nicht eingeladen." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 möchte für %3 an %2 teilnehmen." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Nicht eingeladener Teilnehmer" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Teilnahme zulassen" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Teilnahme abgelehnen" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Der Organisator verweigert Ihnen die Teilnahme an diesem Meeting." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1132,35 +1132,35 @@ "Dem Ereignis wurde ein Teilnehmer hinzugefügt. Möchten Sie allen Teilnehmern " "eine Aktualisierung per E-Mail senden?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Teilnehmer hinzugefügt" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Nachrichten senden" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Nicht senden" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Es wurde ein Ereignis zur Einplanung gefunden." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Kein Frei/Belegt-Zwischenspeicher" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Fehler beim Speichern des Frei/Belegt-Objekts" diff -Nru akonadi-calendar-19.04.3/po/de/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/de/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/de/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/de/libakonadi-calendar5-serializer.po 2020-03-03 00:32:48.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-09-10 14:36+0200\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" diff -Nru akonadi-calendar-19.04.3/po/el/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/el/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/el/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/el/libakonadi-calendar5.po 2020-03-03 00:32:48.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2012-10-25 20:49+0300\n" "Last-Translator: Stelios \n" "Language-Team: Greek \n" @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.4\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -95,49 +95,49 @@ msgid "Copy All" msgstr "Αντιγραφή χρονικού" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, fuzzy, kde-format #| msgctxt "@title:window" #| msgid "Add Calendar" @@ -277,24 +277,24 @@ "joe@mydomain.com on the server www.yourdomain.com will fail." msgstr "" -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" "Reason: %2" msgstr "" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -303,22 +303,22 @@ "contact your system administrator.

" msgstr "" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "" -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -326,17 +326,17 @@ "your system administrator for the exact URL and the account details.

" msgstr "" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "" -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "" @@ -444,36 +444,36 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "" -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " "DestinationPolicyNeverAsk was used" msgstr "" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " "rolled back." msgstr "" -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "" @@ -505,29 +505,29 @@ msgid "Invalid incidence" msgstr "" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, fuzzy, kde-format #| msgid "Could not create calendar: %1" msgid "Error sending counter proposal" msgstr "Αδυναμία δημιουργίας ημερολογίου: %1" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "" @@ -709,7 +709,7 @@ "an updated response to the organizer declining the invitation?" msgstr "" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "" @@ -756,7 +756,7 @@ msgid "Error queuing message in outbox: %1" msgstr "" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, fuzzy, kde-format #| msgid "Could not create calendar: %1" msgid "Error sending e-mail: " @@ -921,12 +921,12 @@ msgid "This field contains the email address of the recipient" msgstr "" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "" @@ -941,7 +941,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "" -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, fuzzy, kde-format #| msgid "Edit the selected incidence." msgid "Error modifying incidence" @@ -993,49 +993,49 @@ "only or disabled calendar." msgstr "" -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "" -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "" -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "" -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1043,35 +1043,35 @@ "an update message?" msgstr "" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "" -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "" diff -Nru akonadi-calendar-19.04.3/po/el/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/el/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/el/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/el/libakonadi-calendar5-serializer.po 2020-03-03 00:32:48.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-11-13 20:24+0200\n" "Last-Translator: Dimitris Kardarakos \n" "Language-Team: American English \n" diff -Nru akonadi-calendar-19.04.3/po/en_GB/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/en_GB/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/en_GB/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/en_GB/libakonadi-calendar5.po 2020-03-03 00:32:48.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2017-12-29 15:41+0000\n" "Last-Translator: Steve Allewell \n" "Language-Team: British English \n" @@ -17,7 +17,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "Could not find incidence to update, it probably was deleted recently." @@ -90,49 +90,49 @@ msgid "Copy All" msgstr "Copy All" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Summary" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Start Date and Time" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "End Date and Time" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Type" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Due Date and Time" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Priority" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Complete" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -282,7 +282,7 @@ "example, if this option is set, then looking for the free/busy data of " "joe@mydomain.com on the server www.yourdomain.com will fail." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -291,17 +291,17 @@ "Failed to download free/busy data from: %1\n" "Reason: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Free/busy retrieval error" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "Failed to parse free/busy information that was retrieved from: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -314,22 +314,22 @@ "incorrect URL. The system said: %2.

Please check the URL or " "contact your system administrator.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "The free/busy information was successfully sent." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Sending Free/Busy" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Unable to publish the free/busy data: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -341,17 +341,17 @@ "p>

Contact your system administrator for the exact URL and the account " "details.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "No Free/Busy Upload URL" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "The target URL '%1' provided is invalid." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Invalid URL" @@ -455,17 +455,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "That calendar item was already deleted, or currently being deleted." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Operation can not be performed due to ACL restrictions" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "The chosen collection is invalid" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -474,12 +474,12 @@ "Default collection is invalid or doesn't have proper ACLs and " "DestinationPolicyNeverAsk was used" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Duplicate item ID in a group operation" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -488,7 +488,7 @@ "One change belonging to a group of changes failed. All changes are being " "rolled back." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Unknown error" @@ -518,29 +518,29 @@ msgid "Invalid incidence" msgstr "Invalid incidence" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Invalid action: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Error sending counter proposal" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Could not start editor to edit counter proposal" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" "The item '%1' has no attendees. Therefore no groupware message will be sent." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Message Not Sent" @@ -745,7 +745,7 @@ "You had previously accepted an invitation to this event. Do you want to send " "an updated response to the organiser declining the invitation?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Counter proposal: %1" @@ -791,7 +791,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Error queuing message in outbox: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Error sending e-mail: " @@ -968,12 +968,12 @@ msgid "This field contains the email address of the recipient" msgstr "This field contains the email address of the recipient" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(EmptyName)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(EmptyEmail)" @@ -988,7 +988,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "This is not an update. The found incidence was modified more recently." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Error modifying incidence" @@ -1048,49 +1048,49 @@ "already been deleted or is not owned by you. Or it might belong to a read-" "only or disabled calendar." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Generic Error" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 wants to attend %2 but was not invited." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 wants to attend %2 on behalf of %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Uninvited attendee" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Accept Attendance" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Reject Attendance" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "The organiser rejected your attendance at this meeting." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1100,35 +1100,35 @@ "An attendee was added to the incidence. Do you want to email the attendees " "an update message?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Attendee Added" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Send Messages" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Do Not Send" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "No incidence for scheduling." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "No Free Busy Cache" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Error saving freebusy object" diff -Nru akonadi-calendar-19.04.3/po/en_GB/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/en_GB/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/en_GB/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/en_GB/libakonadi-calendar5-serializer.po 2020-03-03 00:32:48.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-08-22 14:45+0100\n" "Last-Translator: Steve Allewell \n" "Language-Team: British English \n" diff -Nru akonadi-calendar-19.04.3/po/es/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/es/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/es/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/es/libakonadi-calendar5.po 2020-03-03 00:32:48.000000000 +0000 @@ -4,22 +4,23 @@ # Cristina Yenyxe González García , 2010. # Javier Vinal , 2011, 2013, 2014, 2015, 2016, 2018. # Javier Viñal , 2013. +# Eloy Cuadra , 2019. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" -"PO-Revision-Date: 2018-01-02 23:04+0100\n" -"Last-Translator: Javier Vinal \n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" +"PO-Revision-Date: 2019-12-26 22:27+0100\n" +"Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" "Language: es\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 2.0\n" +"X-Generator: Lokalize 19.12.0\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -95,49 +96,49 @@ msgid "Copy All" msgstr "Copiar todo" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Resumen" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Fecha y hora inicial" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Fecha y hora final" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Tipo" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Fecha y hora de vencimiento" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioridad" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Terminada" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -288,7 +289,7 @@ "búsqueda de los datos de disponibilidad de joe@mydomain.com en el servidor " "www.yourdomain.com fallará." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -297,19 +298,19 @@ "Ha fallado al descargar los datos de disponibilidad desde %1\n" "Motivo: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Error de recuperación de disponibilidad" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Ha fallado al analizar la información de disponibilidad que se recuperó " "desde %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -322,22 +323,22 @@ "URL incorrecto. El sistema dijo: %2.

Por favor, verifique el " "URL o contacte con su administrador del sistema.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "La información de disponibilidad se envió correctamente." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Enviando disponibilidad" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "No es posible publicar los datos de disponibilidad: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -349,17 +350,17 @@ "página «Disponibilidad».

Contacte con su administrador del sistema " "para el URL exacto y los detalles de las cuentas.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "No hay URL de envío de disponibilidad" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "El URL destino «%1» proporcionada no es válida." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "URL no válida" @@ -466,17 +467,17 @@ "El elemento de calendario ya estaba borrado, o se estaba borrando en este " "momento." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "La operación no se puede ejecutar debido a restricciones de ACL" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "La colección elegida no es válida" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -485,12 +486,12 @@ "La colección predeterminada no es válida o no dispone de ACL apropiadas y se " "usó DestinationPolicyNeverAsk" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Elemento duplicado en una operación de grupo" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -499,7 +500,7 @@ "Un cambio perteneciente a un grupo de cambios ha fallado. Todos los cambios " "se están deshaciendo." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Error desconocido" @@ -529,22 +530,22 @@ msgid "Invalid incidence" msgstr "Incidencia no válida" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Acción no válida: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Error al enviar contrapropuesta" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "No se ha podido iniciar el editor para editar la contrapropuesta" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -552,7 +553,7 @@ "El elemento «%1» no tiene asistentes. Por lo tanto, no se enviará ningún " "mensaje de colaboración." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Mensaje no enviado" @@ -765,7 +766,7 @@ "Usted ha aceptado previamente una invitación a este evento. ¿Quiere usted " "enviar una respuesta actualizada al organizador declinando la invitación?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Propuesta de contador: %1" @@ -811,7 +812,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Error al encolar mensaje en la bandeja de salida: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Error al enviar correo: " @@ -819,7 +820,7 @@ #: publishdialog.cpp:46 #, kde-format msgid "Select Addresses" -msgstr "Direcciones seleccionadas" +msgstr "Seleccionar direcciones" #: publishdialog.cpp:80 #, kde-format @@ -990,12 +991,12 @@ msgid "This field contains the email address of the recipient" msgstr "Este campo contiene la dirección de correo del destinatario" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(Nombre-vacío)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(Correo-vacío)" @@ -1012,7 +1013,7 @@ "Esto no es una actualización. La incidencia encontrada se modificó más " "recientemente." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Error al modificar incidencia" @@ -1072,49 +1073,49 @@ "borrado o usted no es su propietario. O puede que pertenezca a un calendario " "de solo-lectura o desactivado." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Error genérico" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 quiere asistir a %2 pero no ha sido invitado." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 quiere asistir a %2 en representación de %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Asistente no invitado" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Asistencia aceptada" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Asistencia rechazada" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "El organizador rechazó su asistencia a esta reunión." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1124,35 +1125,35 @@ "Se añadió un asistente a la incidencia. ¿Quiere usted enviar a los " "asistentes un correo actualizado?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Asistente añadido" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Enviar mensajes" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "No enviar" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Sin incidencias para la planificación." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Sin caché de disponibilidad" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Error al guardar objeto de disponibilidad" diff -Nru akonadi-calendar-19.04.3/po/es/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/es/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/es/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/es/libakonadi-calendar5-serializer.po 2020-03-03 00:32:48.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2015-12-22 13:09+0100\n" "Last-Translator: Javier Vinal \n" "Language-Team: Spanish \n" diff -Nru akonadi-calendar-19.04.3/po/et/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/et/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/et/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/et/libakonadi-calendar5.po 2020-03-03 00:32:48.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2016-07-26 20:40+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" @@ -17,7 +17,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -92,49 +92,49 @@ msgid "Copy All" msgstr "Kopeeri kõik" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Kokkuvõte" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Alguse kuupäev ja kellaaeg" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Lõpu kuupäev ja kellaaeg" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Tüüp" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Tähtaja kuupäev ja kellaaeg" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Tähtsus" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Valmis" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -284,7 +284,7 @@ "valik on sisse lülitatud, siis näiteks vaba/hõivatud andmete otsimine " "jaan@minudomeen.ee kohta serverist www.sinudomeen.ee ei anna tulemust." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -293,17 +293,17 @@ "Vaba/hõivatud andmete allalaadimine asukohast %1 nurjus.\n" "Põhjus: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Vaba/hõivatud info hankimise viga" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "Asukohast %1 hangitud vaba/hõivatud info parsimine nurjus" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -316,22 +316,22 @@ "vigase URL-i. Süsteem teatas igatahes: %2.

Palun kontrolli " "URL-i või võta ühendust süsteemiadministraatoriga.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Teave vaba/hõivatud aja kohta saadeti edukalt edasi." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Vaba/hõivatud teabe saatmine" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Vaba/hõivatud andmete avaldamine nurjus: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -343,17 +343,17 @@ "p>

Küsi oma süsteemiadministraatori käest täpne URL ja konto üksikasjad." -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Vaba/hõivatud info avaldamise URL puudub" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Antud siht-URL \"%1\" on vigane." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Vigane URL" @@ -457,17 +457,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "See kalendrielement on juba kustutatud või seda praegu kustutatakse." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Pääsuloendi piirangute tõttu ei saa toimingut teostada" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Valitud kogu on vigane" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -476,12 +476,12 @@ "Vaikimisi kogu on vigane või puudub korralik pääsuloend ja kasutati valikut " "DestinationPolicyNeverAsk" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Topelt elemendi ID rühmatoimingus" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -489,7 +489,7 @@ msgstr "" "Üks muudatuste rühma kuuluv muudatus nurjus. Kõik muudatused võetakse tagasi." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Tundmatu tõrge" @@ -519,29 +519,29 @@ msgid "Invalid incidence" msgstr "Vigane sündmus" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Vigane toiming: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Tõrge vastuettepaneku saatmisel" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Redaktori käivitamine vastuettepaneku muutmiseks nurjus" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" "Elemendil \"%1\" pole osalejaid. Seepärast ei saadeta ka grupitöö sõnumit." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Kirja ei saadetud" @@ -745,7 +745,7 @@ "Sa oled vastu võtnud selle sündmuse kutse. Kas soovid saata värskendatud " "vastuse korraldajale ja lükata kutse tagasi?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Vastuettepanek: %1" @@ -791,7 +791,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Tõrge kirja seadmisel järjekorda väljuvate kirjade kaustas: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Tõrge kirja saatmisel: " @@ -961,12 +961,12 @@ msgid "This field contains the email address of the recipient" msgstr "See väli sisaldab saaja e-posti aadressi" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(nime pole)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(e-posti aadressi pole)" @@ -981,7 +981,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "See ei ole uuendus. Leitud sündmust on ka hiljem uuendatud." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Tõrge sündmuse muutmisel" @@ -1040,49 +1040,49 @@ "juba kustutatud või ei kuulu sulle või sisaldub kirjutuskaitstud või " "keelatud kalendris." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Üldine tõrge" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 soovib, et %2 toimuks tema osavõtul, aga teda ei ole kutsutud." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 soovib %3 nimel, et %2 toimuks tema osavõtul." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Kutsumata osaleja" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Nõus osalemisega" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Pole osalemisega nõus" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Korraldaja lükkas sinu osalemise soovi sellel kohtumisel tagasi." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1091,35 +1091,35 @@ msgstr "" "Sündmusele lisati osaleja. Kas soovid saata osalejatele uuendatud sõnumi?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Osaleja lisatud" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Saada kirjad" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Ära saada" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Pole ühtegi sündmust ajakavva panna." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Vaba/hõivatud puhver puudub" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Tõrge vaba/hõivatud objekti salvestamisel" diff -Nru akonadi-calendar-19.04.3/po/et/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/et/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/et/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/et/libakonadi-calendar5-serializer.po 2020-03-03 00:32:49.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2016-01-14 23:34+0200\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" diff -Nru akonadi-calendar-19.04.3/po/fi/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/fi/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/fi/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/fi/libakonadi-calendar5.po 2020-03-03 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Tommi Nieminen , 2011, 2013, 2016, 2017. +# Tommi Nieminen , 2011, 2013, 2016, 2017, 2020. # Lasse Liehu , 2013, 2014, 2015. # # KDE Finnish translation sprint participants: @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2017-12-25 20:28+0200\n" "Last-Translator: Tommi Nieminen \n" "Language-Team: Finnish \n" @@ -18,9 +18,9 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-POT-Import-Date: 2012-12-01 22:25:18+0000\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.3\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -94,49 +94,49 @@ msgid "Copy All" msgstr "Kopioi kaikki" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Yhteenveto" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Aloituspäivä ja -aika" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Päättymispäivä ja -aika" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Tyyppi" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Määräpäivä ja -aika" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioriteetti" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Valmis" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -288,7 +288,7 @@ "käyttäjän jussi@jokinalue.fi varaustietojen haku palvelimelta www.muualue.fi " "epäonnistuu." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -297,17 +297,17 @@ "Varaustietojen nouto epäonnistui palvelimelta: %1\n" "Syy: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Varaustiedon noutovirhe" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "Ei onnistuttu jäsentämään varaustietoa, joka noudettiin lähteestä: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -320,22 +320,22 @@ "Järjestelmä vastasi: %2.

Tarkista verkko-osoite tai ota " "yhteys järjestelmäsi ylläpitäjään.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Varaustiedot lähetettiin onnistuneesti." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Lähetetään varaustietoja" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Varaustietojen julkaisu epäonnistui: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -346,17 +346,17 @@ "Korganizerin asetusikkunan Varaustiedot-sivulla.

Tarkan osoitteen ja " "tilin tiedot saat järjestelmäsi ylläpitäjältä.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Ei varaustietojen lähetysosoitetta" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Annettu kohdeverkko-osoite ”%1” on virheellinen." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Virheellinen verkko-osoite" @@ -461,17 +461,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "Kalenterimerkintä oli jo poistettu tai sitä parhaillaan poistettiin." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Toimintoa ei voi suorittaa ACL-rajoitusten takia." -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Valittu kokoelma on virheellinen" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -480,12 +480,12 @@ "Oletuskokoelma on virheellinen tai sillä ei ole oikeaa ACL:ää ja käytettiiin " "DestinationPolicyNeverAsk-asetusta" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Merkinnän tunniste toistuu ryhmätoimenpiteessä" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -493,7 +493,7 @@ msgstr "" "Yksi muutosryhmään kuuluva muutos epäonnistui. Kaikki muutokset kumotaan." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Tuntematon virhe" @@ -523,29 +523,29 @@ msgid "Invalid incidence" msgstr "Virheellinen esiintymä" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Virheellinen toiminto: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Virhe lähetettäessä ehdotusta" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Muokkainta ei saatu käynnistettyä vastaehdotuksen muokkausta varten" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" "Tietueella ”%1” ei ole osallistujia, joten työryhmäviestiä ei lähetetä." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Viestiä ei lähetetty" @@ -750,7 +750,7 @@ "Olet aiemmin hyväksynyt kutsun tähän tapahtumaan. Haluatko lähettää " "järjestäjälle päivitetyn vastauksen, jossa hylkäät kutsun?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Vastaehdotus: %1" @@ -796,7 +796,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Virhe vietäessä viestiä lähteneiden jonoon: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Virhe lähetettäessä sähköpostia: " @@ -971,12 +971,12 @@ msgid "This field contains the email address of the recipient" msgstr "Tämä kenttä sisältää vastaanottajan sähköpostiosoitteen" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(Tyhjä nimi)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(Tyhjä sähköposti)" @@ -991,7 +991,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "Tämä ei ole päivitys. Löydetty esiintymä on uudempi." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Virhe muutettaessa esiintymää" @@ -1050,49 +1050,49 @@ "poistettu, et omista sitä tai se kuuluu vain luettavaan tai käytöstä " "poistettuun kalenteriin." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Yleisvirhe" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 haluaa osallistua tapahtumaan %2 mutta häntä ei ole kutsuttu." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 haluaa osallistua tapahtumaan %2 henkilön %3 puolesta." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Kutsumaton osallistuja" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Hyväksy osallistuminen" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Hylkää osallistuminen" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Järjestäjä hylkäsi osallistumisesi tähän tapaamiseen." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1102,35 +1102,35 @@ "Esiintymään lisättiin osallistuja. Haluatko lähettää osallistujille " "päivitysviestin?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Osallistuja lisätty" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Lähetä viestit" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Älä lähetä" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Ei ajastettavaa esiintymää." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Ei varaustietovälimuistia" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Virhe tallennettaessa varaustietokohdetta" diff -Nru akonadi-calendar-19.04.3/po/fi/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/fi/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/fi/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/fi/libakonadi-calendar5-serializer.po 2020-03-03 00:32:49.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-08-31 15:11+0300\n" "Last-Translator: Larso\n" "Language-Team: Finnish \n" diff -Nru akonadi-calendar-19.04.3/po/fr/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/fr/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/fr/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/fr/libakonadi-calendar5.po 2020-03-03 00:32:49.000000000 +0000 @@ -5,12 +5,13 @@ # Geoffray Levasseur , 2013. # xavier , 2013. # Vincent Pinon , 2017, 2018. +# Simon Depiets , 2019. # msgid "" msgstr "" "Project-Id-Version: libakonadi-calendar\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2018-01-06 21:16+0100\n" "Last-Translator: Vincent Pinon \n" "Language-Team: French \n" @@ -19,12 +20,12 @@ "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 20.03.70\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -100,49 +101,49 @@ msgid "Copy All" msgstr "Tout copier" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Résumé" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Date et heure de début" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Date et heure de fin" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Type" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Date et heure d'échéance" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Priorité" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Terminé" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -304,7 +305,7 @@ "est sélectionnée, la recherche des données de disponibilité " "« joseph@mondomaine.com » sur le serveur « www.votredomaine.com » échouera." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -313,18 +314,18 @@ "Impossible de télécharger les données de disponibilité depuis : %1\n" "Raison : %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Erreur lors de l'extraction des informations de disponibilité" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Impossible d'analyser les informations de disponibilité extraites de : %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -338,22 +339,22 @@ "système a répondu : %2.

Veuillez vérifier l'URL ou contacter " "votre administrateur système.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Les informations de disponibilité ont été envoyées avec succès." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Envoi des informations de disponibilité" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Impossible de publier les données de disponibilité : %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -366,17 +367,17 @@ "votre administrateur système pour connaître l'URL exacte et les détails du " "compte.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Aucune URL pour l'envoi des informations de disponibilité" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "L'URL cible « %1 » fournie est non valable." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "URL mal formée" @@ -488,19 +489,19 @@ msgstr "" "Cet élément de calendrier a déjà été effacé ou est en cours d'effacement." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "" "L'opération ne peut être effectuée en raison de restrictions des listes de " "contrôlé d'accès (ACL)" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "La collection choisie est non valable" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -509,12 +510,12 @@ "La connexion par défaut est non valable ou ne possède pas ses propres listes " "de droits d'accès alors que « DestinationPolicyNeverAsk » était utilisé" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Identifiant d'élément dupliqué dans une opération de groupe" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -523,7 +524,7 @@ "Une modification appartenant à un groupe de modification a échoué. Toutes " "les modifications déjà effectuées vont être annulées." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Erreur inconnue" @@ -553,23 +554,23 @@ msgid "Invalid incidence" msgstr "Incidence non valable" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Action non valable : %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Erreur lors de l'envoi de la proposition de compteur" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "" "Impossible de démarrer l'éditeur pour modifier la proposition de compteur" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -577,7 +578,7 @@ "L'élément « %1 » ne comporte aucun participant. Par conséquent, aucun " "message de logiciel de groupe de travail ne sera envoyé." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Message non envoyé" @@ -794,7 +795,7 @@ "Vous avez précédemment accepté une invitation à cet évènement. Voulez-vous " "envoyer à l'organisateur une réponse mise à jour pour décliner l'invitation ?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Contre-proposition : %1" @@ -844,7 +845,7 @@ "Erreur lors de la mise en file d'attente des messages dans la boîte " "d'envoi : %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Erreur lors de l'envoi du courrier électronique : " @@ -1024,12 +1025,12 @@ msgid "This field contains the email address of the recipient" msgstr "Ce champ contient l'adresse de courrier électronique du destinataire" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(Nom Vide)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(Adresse Vide)" @@ -1046,7 +1047,7 @@ "Ceci n'est pas une mise à jour. L'incidence trouvée a été modifiée plus " "récemment." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Erreur pendant la modification de l'incidence" @@ -1107,49 +1108,49 @@ "t-il été déjà supprimé ou bien appartient-il à quelqu'un d'autre ? À moins " "qu'il n'appartienne à un agenda désactivé ou en lecture seule." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Erreur générique" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 souhaite inviter %2 mais celui-ci n'est pas invité." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 souhaite inviter %2 au nom de %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Participant non invité" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Accepter la présence" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Refuser la présence" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "L'organisateur a refusé votre présence à cette réunion." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1159,35 +1160,35 @@ "Un participant a été ajouté à l'évènement. Voulez-vous envoyer un courrier " "électronique aux autres participants pour les prévenir ?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Participant ajouté" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Envoyer des messages" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Ne pas envoyer" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Aucune incidence pour la planification." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Aucun cache de disponibilité" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Erreur lors de l'enregistrement de l'objet de disponibilité" diff -Nru akonadi-calendar-19.04.3/po/fr/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/fr/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/fr/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/fr/libakonadi-calendar5-serializer.po 2020-03-03 00:32:49.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2015-01-25 19:11+0100\n" "Last-Translator: Maxime Corteel \n" "Language-Team: French \n" diff -Nru akonadi-calendar-19.04.3/po/ga/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/ga/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/ga/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ga/libakonadi-calendar5.po 2020-03-03 00:32:49.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2011-12-28 12:28-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -17,7 +17,7 @@ "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n < 11 ? " "3 : 4\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -86,49 +86,49 @@ msgid "Copy All" msgstr "Cóipeáil Uile" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Achoimre" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -266,24 +266,24 @@ "joe@mydomain.com on the server www.yourdomain.com will fail." msgstr "" -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" "Reason: %2" msgstr "" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -292,22 +292,22 @@ "contact your system administrator.

" msgstr "" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "" -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -315,17 +315,17 @@ "your system administrator for the exact URL and the account details.

" msgstr "" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "" -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "" @@ -429,36 +429,36 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "" -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " "DestinationPolicyNeverAsk was used" msgstr "" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " "rolled back." msgstr "" -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "" @@ -488,28 +488,28 @@ msgid "Invalid incidence" msgstr "" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "" @@ -690,7 +690,7 @@ "an updated response to the organizer declining the invitation?" msgstr "" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "" @@ -736,7 +736,7 @@ msgid "Error queuing message in outbox: %1" msgstr "" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "" @@ -899,12 +899,12 @@ msgid "This field contains the email address of the recipient" msgstr "" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "" @@ -919,7 +919,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "" -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "" @@ -968,49 +968,49 @@ "only or disabled calendar." msgstr "" -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "" -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "" -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "" -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1018,35 +1018,35 @@ "an update message?" msgstr "" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "" -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "" diff -Nru akonadi-calendar-19.04.3/po/ga/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/ga/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/ga/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ga/libakonadi-calendar5-serializer.po 2020-03-03 00:32:49.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2011-12-28 12:28-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" diff -Nru akonadi-calendar-19.04.3/po/gl/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/gl/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/gl/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/gl/libakonadi-calendar5.po 2020-03-03 00:32:49.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2018-04-22 16:16+0100\n" "Last-Translator: Adrian Chaves \n" "Language-Team: Galician \n" @@ -18,12 +18,8 @@ "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-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -99,49 +95,49 @@ msgid "Copy All" msgstr "Copiar todo" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Resumo" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Data e hora de inicio" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Data e hora de remate" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Tipo" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Data e hora de vencemento" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioridade" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Completado" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -294,7 +290,7 @@ "dispoñibilidade de pepe@undominio.com no servidor www.outrodominio.com ha " "fallar." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -303,18 +299,18 @@ "Non se puideron descargar os datos de dispoñibilidade de: %1\n" "Motivo: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Erro de obtención da dispoñibilidade" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Non se puido analizar a información de dispoñibilidade obtida desde: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -327,22 +323,22 @@ "un URL incorrecto. O sistema dixo: %2.

Comprobe o URL ou " "contacte co administrador do sistema.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "A información da dispoñibilidade enviouse correctamente." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Estase a enviar a dispoñibilidade" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Non se poden publicar os datos de dispoñibilidade: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -354,17 +350,17 @@ "páxina de «Dispoñibilidade».

Contacte co administrador do sistema para " "coñecer o URL exacto e os detalles da conta.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Non hai URL de envío da dispoñibilidade" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "O URL obxectivo «%1» que se forneceu é incorrecto." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "URL incorrecto" @@ -474,17 +470,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "Ese elemento do calendario xa estaba eliminado, ou está a eliminarse." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "A operación non se pode efectuar debido a restricións na ACL" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "A colección escollida é incorrecta" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -493,12 +489,12 @@ "A colección predeterminada ou é incorrecta ou non ten ACL axeitadas e á vez " "usouse DestinationPolicyNeverAsk" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "ID de elemento duplicado nunha operación de grupo" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -507,7 +503,7 @@ "Fallou un cambio dun grupo de cambios. Estanse a regresar todos os cambios " "ao estado orixinal." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Erro descoñecido" @@ -537,22 +533,22 @@ msgid "Invalid incidence" msgstr "Incidencia incorrecta" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Acción incorrecta: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Produciuse un erro ao enviar a contraproposta" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Non se puido iniciar o editor para editar a contraproposta" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -560,7 +556,7 @@ "O elemento «%1» non ten asistentes, polo que o software colaborativo non vai " "enviar ningunha mensaxe." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Mensaxe non enviada" @@ -768,7 +764,7 @@ "Anteriormente aceptara unha invitación a este evento. Quere enviar unha " "resposta actualizada ao organizador rexeitando a invitación?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Contraproposta: %1" @@ -815,7 +811,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Produciuse un erro ao poñer na cola a mensaxe na caixa de saída: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Produciuse un erro ao enviar o correo: " @@ -991,12 +987,12 @@ msgid "This field contains the email address of the recipient" msgstr "Este campo contén o enderezo de correo do destinatario" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(Nome baleiro)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(Correo baleiro)" @@ -1013,7 +1009,7 @@ "Esta non é unha actualización. A incidencia que se atopou modificouse máis " "recentemente." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Produciuse un erro ao modificar a incidencia" @@ -1073,49 +1069,49 @@ "eliminase ou que vostede non sexa o dono. Ou podería pertencer a un " "calendario só para ler ou desactivado." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Erro xenérico" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 quere asistir a %2 pero non se convidou." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 quere asistir a %2 en representación de %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Asistente non convidado" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Aceptar a asistencia" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Rexeitar a asistencia" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "O organizador rexeitou a súa asistencia a esta reunión." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1125,35 +1121,35 @@ "Engadiuse un asistente á incidencia. Quere enviarlles aos asistentes unha " "mensaxe de actualización?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Engadiuse un asistente" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Enviar mensaxes" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Non enviar" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Non hai incidencia ningunha para a planificación." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Non hai caché de dispoñibilidade" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Produciuse un erro ao gardar un obxecto freebusy" diff -Nru akonadi-calendar-19.04.3/po/gl/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/gl/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/gl/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/gl/libakonadi-calendar5-serializer.po 2020-03-03 00:32:49.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2017-10-04 21:00+0100\n" "Last-Translator: Adrián Chaves (Gallaecio) \n" "Language-Team: Galician \n" @@ -16,15 +16,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.2\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.2\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" #: akonadi_serializer_kcalcore.cpp:168 #, kde-format diff -Nru akonadi-calendar-19.04.3/po/hu/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/hu/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/hu/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/hu/libakonadi-calendar5.po 2020-03-03 00:32:49.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2015-09-08 10:03+0200\n" "Last-Translator: Kristóf Kiszel \n" "Language-Team: Hungarian \n" @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "Nem található frissítendő előfordulás, valószínűleg nemrég törölték." @@ -92,49 +92,49 @@ msgid "Copy All" msgstr "Összes másolása" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Összegzés" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Kezdés dátuma és időpontja" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Befejezés dátuma és időpontja" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Típus" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Lejárat dátuma és időpontja" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioritás" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Befejezettség" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -284,7 +284,7 @@ "egy jkovacs@egyiktart.hu nevű felhasználó adatait letölteni a www.masiktart." "hu címről." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -293,19 +293,19 @@ "Nem sikerült letölteni a szabad/elfoglalt adatokat innen: „%1”\n" "Ok: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Szabad/elfoglalt lekérési hiba" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Nem sikerült a szabad/elfoglalt információk feldolgozása, amelyek innen " "lettek lekérve: „%1”" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -318,22 +318,22 @@ "megfelelő. A hibaüzenet: %2.

Javítsa ki az URL-t vagy kérjen " "segítséget a rendszergazdától.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "A szabad/elfoglalt információk sikeresen elküldésre kerültek." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Szabad/Elfoglalt küldése" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Nem lehet közzétenni a szabad/elfoglalt adatot: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -345,17 +345,17 @@ "elfoglalt” oldalon.

A pontos URL és a fiók részleteiért vegye fel a " "kapcsolatot a rendszergazdájával.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Nincs szabad/elfoglalt feltöltési URL" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "A(z) „%1” által szolgáltatott cél URL érvénytelen." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Érvénytelen URL" @@ -459,17 +459,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "A naptárelem már törölve lett vagy jelenleg törlés alatt van." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "A művelet nem hajtható végre ACL korlátozások miatt" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "A választott gyűjtemény érvénytelen" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -478,12 +478,12 @@ "Az alapértelmezett gyűjtemény érvénytelen vagy nincsenek megfelelő ACL-jei " "és a DestinationPolicyNeverAsk volt használatban" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Kettőzött elemazonosító egy csoportműveletben" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -492,7 +492,7 @@ "Egy módosítások csoportjához tartozó módosítás nem sikerült. Minden " "módosítás vissza lesz állítva." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Ismeretlen hiba" @@ -522,22 +522,22 @@ msgid "Invalid incidence" msgstr "Érvénytelen előfordulás" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Érvénytelen művelet: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Hiba az ellenjavaslat küldésekor" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Nem sikerült elindítani a szerkesztőt az ellenjavaslat szerkesztéséhez" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -545,7 +545,7 @@ "A(z) „%1” elemnek nincsenek résztvevői. Ezért nem lesz csoportmunka üzenet " "elküldve." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Az üzenet nincs elküldve" @@ -751,7 +751,7 @@ "Korábban elfogadott egy meghívást az eseményre. Szeretne frissített választ " "küldeni a szervezőnek a meghívás lemondásáról?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Ellenjavaslat: %1" @@ -797,7 +797,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Hiba az üzenet lekérdezésekor a postázandó levelekben: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Hiba az e-mail küldésekor:" @@ -974,12 +974,12 @@ msgid "This field contains the email address of the recipient" msgstr "Ez a mező a címzett e-mail címét tartalmazza" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(Üres név)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(Üres e-mail)" @@ -994,7 +994,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "Ez nem egy frissítés. A talált esemény újabban lett módosítva." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Hiba az előfordulás módosításakor" @@ -1053,49 +1053,49 @@ "vagy nem Ön a tulajdonosa. Előfordulhat, hogy egy letiltott vagy írásvédett " "naptárhoz tartozik." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Általános hiba" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 részt szeretne venni a(z) %2 találkozón, de nem kapott meghívást." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 részt szeretne venni a(z) %2 találkozón %3 nevében." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Meghívó nélküli résztvevő" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Részvétel elfogadása" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Részvétel elutasítása" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "A szervező elutasította az Ön részvételi kérését." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1105,35 +1105,35 @@ "Egy résztvevő hozzá lett adva az eseményhez. Akar küldeni egy frissített e-" "mail üzenetet a résztvevőknek?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Résztvevő hozzáadva" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Üzenetek elküldése" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Nincs küldés" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Nincs esemény az ütemezéshez." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Nincs szabad/elfoglalt gyorsítótár" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Hiba a szabad/elfoglalt objektum mentése közben" diff -Nru akonadi-calendar-19.04.3/po/hu/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/hu/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/hu/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/hu/libakonadi-calendar5-serializer.po 2020-03-03 00:32:49.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-09-04 15:54+0200\n" "Last-Translator: Kristóf Kiszel \n" "Language-Team: Hungarian \n" diff -Nru akonadi-calendar-19.04.3/po/ia/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/ia/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/ia/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ia/libakonadi-calendar5.po 2020-03-03 00:32:49.000000000 +0000 @@ -1,23 +1,23 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# g.sora , 2011, 2012, 2013. +# g.sora , 2011, 2012, 2013, 2020. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" -"PO-Revision-Date: 2013-10-31 13:45+0100\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" +"PO-Revision-Date: 2020-02-07 23:44+0100\n" "Last-Translator: Giovanni Sora \n" -"Language-Team: Interlingua \n" +"Language-Team: Interlingua \n" "Language: ia\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 1.5\n" +"X-Generator: Lokalize 2.0\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -93,49 +93,49 @@ msgid "Copy All" msgstr "Copia toto" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Summario" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Data e tempore de initio" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Data e tempore de fin" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Typo" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Tempore e data de expiration" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioritate" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Complete" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -289,7 +289,7 @@ "datos de libere/occupate de pusillo@midominio.com sur le servitor www." "tudominio.com fallera." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -298,19 +298,19 @@ "Il falleva discargar datos de libere/occupate ex: %1\n" "Motivation: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Error de recuperation de libere/occupate" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Il falleva analysar information de libere/occupate que esseva recuperate ex: " "%1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -323,22 +323,22 @@ "specificate un URL incorrecte. Le systema diceva: %2.

Pro " "favor, verifica le URL o continge tu gerente de systema.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Le information de libere/occupate esseva inviate successosemente." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Inviante Libere/Occupate" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Incapace de publicar datos de libere/occupate: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -350,17 +350,17 @@ "in le pagina de \"Libere/Occupate\".

Continge tu gerente de systema " "pro le exacte URL e detalios de conto.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Necun URL de incargar Libere/Occupate" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Le URL objectivo '%1' fornite es invalide. " -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "URL invalide" @@ -452,11 +452,10 @@ "Error durante que il essayava deler elemento de calendario. Error esseva: %1" #: incidencechanger.cpp:390 -#, fuzzy, kde-format -#| msgid "Unknown error" +#, kde-format msgctxt "errormessage for a job ended with an unexpected result" msgid "An unknown error occurred" -msgstr "Error Incognite" +msgstr "Il occurreva un error incognite" #: incidencechanger.cpp:428 #, kde-format @@ -471,17 +470,17 @@ msgstr "" "Le elemento de calendario ja esseva delite, o il es currentemente delite." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Opertaion non pote esser executate debite al restrictiones de ACL." -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Le collection seligite es invalide" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -490,12 +489,12 @@ "Collection predefinite es invalide o non ha proprie ACLs e il esseva usate " "DestinationPolicyNeverAsk (regulamento de destination jammais demanda)" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Elemento duplicate in un operation de gruppo" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -504,7 +503,7 @@ "Un cambiamento pertinente a un gruppo de cambios falleva. Omne cambios " "essera retro ducite." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Error Incognite" @@ -534,22 +533,22 @@ msgid "Invalid incidence" msgstr "Incidentia invalide" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Action invalide: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Error quando on inviava contra proposition." -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Il non pote initiar editor pro modificar contra proposition" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -557,21 +556,19 @@ "Le elemento \"%1\" non ha participantes. Ergo necun message de groupware " "essera inviate." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Message non inviate" #: itiphandler.h:110 itiphandler.h:128 itiphandler.h:144 itiphandler.h:157 -#, fuzzy, kde-format -#| msgid "Send Email" +#, kde-format msgctxt "@action:button dialog positive answer" msgid "Send Email" msgstr "Invia e-posta" #: itiphandler.h:111 itiphandler.h:129 itiphandler.h:145 itiphandler.h:158 -#, fuzzy, kde-format -#| msgid "Do Not Send" +#, kde-format msgctxt "@action:button dialog negative answer" msgid "Do Not Send" msgstr "Non invia" @@ -754,8 +751,7 @@ "Tu vole inviar un actualisation de stato al organisator de iste jornal?" #: itiphandlerhelper_p.cpp:397 itiphandlerhelper_p.cpp:418 -#, fuzzy, kde-format -#| msgid "Send Update" +#, kde-format msgctxt "@action:button dialog positive answer" msgid "Send Update" msgstr "Invia actualisation" @@ -769,7 +765,7 @@ "Tu previemente dava acceptation a un invitation pro iste evento. Tu vole " "inviar un responsa actualisate al organisator declinante le invitation?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Contra proposition: %1" @@ -780,8 +776,7 @@ msgstr "Il falleva a inviar e-posta de gruppo planificate" #: itiphandlerhelper_p.cpp:479 -#, fuzzy, kde-format -#| msgid "Abort Update" +#, kde-format msgctxt "@action:button dialog positive answer to abort question" msgid "Abort Update" msgstr "Aborta actualisation" @@ -817,7 +812,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Error quando on poneva in cauda message in cassetta de exito: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Error quando on inviava e-posta: " @@ -871,10 +866,9 @@ msgstr "" #: publishdialog.cpp:148 -#, fuzzy, kde-format -#| msgid "Publishing" +#, kde-format msgid "Publishing Error" -msgstr "Publicante" +msgstr "Errior de publication" #. i18n: ectx: property (toolTip), widget (QListWidget, mListWidget) #: publishdialog_base.ui:38 @@ -978,9 +972,7 @@ #. i18n: ectx: property (text), widget (QLabel, TextLabel2) #: publishdialog_base.ui:136 -#, fuzzy, kde-format -#| msgctxt "recipient email" -#| msgid "Email:" +#, kde-format msgctxt "recipient email" msgid "E&mail:" msgstr "E-posta:" @@ -997,12 +989,12 @@ msgid "This field contains the email address of the recipient" msgstr "Iste campo contine le adresse de e-posta del destinatario" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(EmptyName)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(EmptyEmail)" @@ -1019,7 +1011,7 @@ "Isto non es un actualisation. Le incidentia trovate esseva modificate plus " "recentemente." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Error durante que on modificava incidentia" @@ -1089,49 +1081,49 @@ "ha essite delite o non es in tu possession. O illo pote pertiner a un " "calendario in stato de lege-solmente o disactivate." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Error generic" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 desira participar in %2 ma non esseva invitate." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 desira participar in %2 in le nomine de %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Participante non invitate" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Accepta participation" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Refusa participation" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Le organisator refusava tu participation in iste incontro." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1141,35 +1133,35 @@ "Un participante esseva addite al evento. Vole tu inviar al participantes un " "message actualisate de e-posta?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Participante addite" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Invia messages" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Non invia" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "necun incidentia de planificar" -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Necun cache de Libere Occupate" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Error durante que on salveguarda objecto de libere/occupate" @@ -1474,17 +1466,14 @@ msgstr "Il falleva a collar" #: standardcalendaractionmanager.cpp:246 -#, fuzzy, kde-format -#| msgid "Update Calendar" -#| msgid_plural "Update %1 Calendars" +#, kde-format msgid "Update Available Calendars" -msgstr "Actualisa calendario" +msgstr "Actualisa calendarios disponibile" #: standardcalendaractionmanager.cpp:248 -#, fuzzy, kde-format -#| msgid "Updates the content of all folders of the selected calendars." +#, kde-format msgid "Updates the tree of available calendars." -msgstr "Actualisa le contento de tote dossieres del calendarios seligite." +msgstr "Actualisa le arbore de calendarios disponibile." #: standardcalendaractionmanager.cpp:358 standardcalendaractionmanager.cpp:362 #, kde-format diff -Nru akonadi-calendar-19.04.3/po/ia/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/ia/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/ia/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ia/libakonadi-calendar5-serializer.po 2020-03-03 00:32:49.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2011-11-29 19:38+0100\n" "Last-Translator: g.sora \n" "Language-Team: Interlingua \n" diff -Nru akonadi-calendar-19.04.3/po/it/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/it/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/it/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/it/libakonadi-calendar5.po 2020-03-03 00:32:49.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # Federico Zenith , 2011, 2013, 2014. -# Luigi Toscano , 2015, 2016, 2017. +# Luigi Toscano , 2015, 2016, 2017, 2019. # msgid "" msgstr "" "Project-Id-Version: libakonadi-calendar\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2017-12-11 23:40+0100\n" "Last-Translator: Luigi Toscano \n" "Language-Team: Italian \n" @@ -16,9 +16,9 @@ "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 19.08.1\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -94,49 +94,49 @@ msgid "Copy All" msgstr "Copia tutto" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Sommario" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Inizio" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Fine" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Tipo" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Scadenza" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Priorità" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Completo" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -289,7 +289,7 @@ "opzione è attiva, non sarà possibile cercare i dati libero/occupato di " "pippo@miodominio.it sul server www.tuodominio.it." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -298,18 +298,18 @@ "Scaricamento non riuscito dei dati libero/occupato da: %1\n" "Motivo: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Errore di recupero libero/occupato" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Analisi non riuscita delle informazioni libero/occupato recuperate da: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -322,22 +322,22 @@ "scritto male l'URL. Il sistema ha detto: %2.

Controlla l'URL " "o contatta l'amministratore di sistema.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Le informazioni libero/occupato sono state inviate correttamente." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Invio libero/occupato" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Impossibile pubblicare i dati libero/occupato: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -349,17 +349,17 @@ "«Libero/occupato»

Contatta l'amministratore di sistema per l'URL " "esatto e i dettagli dell'account.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Manca l'URL di invio libero/occupato" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "L'URL di destinazione «%1» non è valido." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "URL non valido" @@ -466,17 +466,17 @@ msgstr "" "Quell'elemento del calendario era già eliminato, o in corso di eliminazione." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "L'operazione non può essere effettuata a causa di restrizioni ACL" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "La raccolta scelta non è valida" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -485,12 +485,12 @@ "La raccolta predefinita non è valida, o non ha le giuste ACL ed è stato " "usato DestinationPolicyNeverAsk" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Identificativo di elemento duplicato in un'operazione di gruppo" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -499,7 +499,7 @@ "Una modifica in un gruppo di modifiche non è riuscita. Verranno annullate " "tutte le modifiche." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Errore sconosciuto" @@ -529,22 +529,22 @@ msgid "Invalid incidence" msgstr "Occorrenza non valida" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Azione non valida: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Errore nell'invio della controproposta" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Impossibile avviare l'editor per redigere la controproposta" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -552,7 +552,7 @@ "L'elemento «%1» non ha partecipanti. Non sarà quindi inviato nessun " "messaggio di groupware." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Messaggio non inviato" @@ -762,7 +762,7 @@ "Prima avevi accettato un invito per questo evento. Vuoi inviare una risposta " "aggiornata all'organizzatore per rifiutare l'invito?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Controproposta: %1" @@ -808,7 +808,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Errore nel mettere in coda i messaggi in uscita: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Errore nell'invio della posta: " @@ -983,12 +983,12 @@ msgid "This field contains the email address of the recipient" msgstr "Questo campo contiene l'indirizzo di posta del destinatario" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(NomeVuoto)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(IndirizzoVuoto)" @@ -1005,7 +1005,7 @@ "Questo non è un aggiornamento. L'occorrenza trovata è stata modificata più " "recentemente." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Errore nella modifica dell'occorrenza" @@ -1064,49 +1064,49 @@ "è già stato rimosso o non è di tua proprietà, o potrebbe appartenere a un " "calendario di sola lettura o disabilitato." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Errore generico" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 vuole partecipare, ma %2 non ha ricevuto un invito" -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 vuole partecipare a %2 a nome di %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Partecipante non invitato" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Accetta partecipazione" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Rifiuta partecipazione" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "L'organizzatore ha rifiutato la tua partecipazione a questa riunione." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1116,35 +1116,35 @@ "All'occorrenza è stato aggiunto un partecipante. Vuoi mandare un messaggio " "di aggiornamento ai partecipanti?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Partecipante aggiunto" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Invia messaggi" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Non inviare" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Nessuna occorrenza da pianificare." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Cache libero/occupato mancante" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Errore nel salvataggio dell'oggetto libero/occupato" diff -Nru akonadi-calendar-19.04.3/po/it/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/it/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/it/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/it/libakonadi-calendar5-serializer.po 2020-03-03 00:32:49.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-10-15 09:51+0200\n" "Last-Translator: Federico Zenith \n" "Language-Team: Italian \n" diff -Nru akonadi-calendar-19.04.3/po/ja/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/ja/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/ja/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ja/libakonadi-calendar5.po 2020-03-03 00:32:49.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2014-09-25 01:00-0700\n" "Last-Translator: Fumiaki Okushi \n" "Language-Team: Japanese \n" @@ -15,7 +15,7 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -85,49 +85,49 @@ msgid "Copy All" msgstr "" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -265,24 +265,24 @@ "joe@mydomain.com on the server www.yourdomain.com will fail." msgstr "" -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" "Reason: %2" msgstr "" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -291,22 +291,22 @@ "contact your system administrator.

" msgstr "" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "" -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -314,17 +314,17 @@ "your system administrator for the exact URL and the account details.

" msgstr "" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "" -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "" @@ -429,36 +429,36 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "" -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " "DestinationPolicyNeverAsk was used" msgstr "" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " "rolled back." msgstr "" -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "" @@ -490,29 +490,29 @@ msgid "Invalid incidence" msgstr "" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, fuzzy, kde-format #| msgid "Could not create calendar: %1" msgid "Error sending counter proposal" msgstr "カレンダーを作成できませんでした: %1" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "" @@ -693,7 +693,7 @@ "an updated response to the organizer declining the invitation?" msgstr "" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "" @@ -739,7 +739,7 @@ msgid "Error queuing message in outbox: %1" msgstr "" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, fuzzy, kde-format #| msgid "Could not create calendar: %1" msgid "Error sending e-mail: " @@ -904,12 +904,12 @@ msgid "This field contains the email address of the recipient" msgstr "" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "" @@ -924,7 +924,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "" -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, fuzzy, kde-format #| msgid "Could not create calendar: %1" msgid "Error modifying incidence" @@ -976,49 +976,49 @@ "only or disabled calendar." msgstr "" -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "" -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "" -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "" -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1026,35 +1026,35 @@ "an update message?" msgstr "" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "" -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "" diff -Nru akonadi-calendar-19.04.3/po/ja/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/ja/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/ja/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ja/libakonadi-calendar5-serializer.po 2020-03-03 00:32:49.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2010-11-21 15:57-0800\n" "Last-Translator: Fumiaki Okushi \n" "Language-Team: Japanese \n" diff -Nru akonadi-calendar-19.04.3/po/kk/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/kk/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/kk/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/kk/libakonadi-calendar5.po 2020-03-03 00:32:49.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2013-10-31 04:24+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" @@ -17,7 +17,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.2\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "Жаңартылатын оқиға табылмады, бәлкім жуырда өшірілген шығар." @@ -90,49 +90,49 @@ msgid "Copy All" msgstr "Бүкілін көшіріп алу" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Қортынды" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Бастау күні мен уақыты" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Аяқтау күні мен уақыты" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Түрі" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Бітіру күні мен уақыты" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Маңыздылығы" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Бітіруі" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -282,7 +282,7 @@ "кейінгі) бөлігіне нақты сәйкеістігін көрсетеді. Мәселен, myrqymbay@mydomain." "kz дегеннің Бос/істе мәліметін www.yourdomain.kz дегеннен іздеуге келмейді." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -291,17 +291,17 @@ "Мынадан Бос/Істе мәліметі жүктелмеді: %1\n" "Себебі: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Бос/Істе мәліметін алу қатесі" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "Мынадан алған Бос/Істе мәліметі талдауға келмеді: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -314,22 +314,22 @@ "Жүйе %2 дейді.

URL-ді тексеріңіз, немесе жүйе әкімшісінен " "сұраңыз.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Бос/Істе мәліметі сәтті жіберілді." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Бос/Істе мәліметті жіберу" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Бос/Істе мәліметі жарияланбады: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -340,17 +340,17 @@ "KOrganizer-ды баптау диалогының \"Бос/Істе\" бетінде орнатады.

Нақты " "URL мен тіркелгі мәліметін жүйе әкімшісінен біліңіз.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Бос/Істе мәліметін қай URL-ге беретіні көрсетілмеген" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "'%1' деп келтірілген керек URL дұрыс емес." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Жарамсыз URL" @@ -455,17 +455,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "Ол күнтізбе жазуы өшірілген, немесе өшіріліп жатыр." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "ACL шектеулер себебінен амал орындалмайды" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Таңдалған жинағы жарамсыз" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -474,12 +474,12 @@ "Әдетті жиын жарамсыз не оның ACL-і (қатынауды басқару тізімі) не дұрыс емес, " "DestinationPolicyNeverAsk қолданған" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Топтық амалда қосарланған ID кездесті" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -488,7 +488,7 @@ "Топтық өзгерістерге жататын бір өзгеріс жаңылысы. Бүкіл өзгерістер " "қайтарылады." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Беймәлім қате" @@ -518,28 +518,28 @@ msgid "Invalid incidence" msgstr "Жарамсыз оқиға" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Жарамсыз әрекет: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Қарсы ұсынысты жіберу қатесі" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Қарсы ұсынысты өзгерту үшін редактор жегілмеді" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "'%1' дегенде қатысушылары жоқ. Сондықтан топтық хат жіберілмеді." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Хат жіберілмеді" @@ -747,7 +747,7 @@ "Бұдан бұрын оқиғаға қатысам дегенсіз. Енді үәдеңізді өзгертіп, " "ұйымдастырушысына қатыспаймын деп жауап бермескіз бе?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Қарсы ұсынс: %1" @@ -794,7 +794,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Хатты шығыс жәшігіне кезекке қою қатесі: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Эл.пошта жіберу қатесі: " @@ -969,12 +969,12 @@ msgid "This field contains the email address of the recipient" msgstr "Бұл алушының эл.пошта адресі жазылатын өріс" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(Атауы бос)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(Бос эл.пошта)" @@ -989,7 +989,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "Бұл жаңартуы емес. Табылған оқиға одан да жуырда өзгертілген. " -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Оқиғаны өзгерту қатесі" @@ -1058,49 +1058,49 @@ "Сіздікі емес шығар. Немесе ол тек оқу үшін, әлде бұғатталған күнтізбедегісі " "болуы мүмкін." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Жалпы қате" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 %2 дененге қатысуы келеді, бірақ ол шақырылмаған." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 %3 дегеннің атынан %2 дененге қатысуы келеді." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Шақырылмаған қатысушы" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Қатысуға келісім бар" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Қатысуға келісім жоқ" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Ұйымдастырушысы Сіздің жиналысқа қатысуына келіспеді.." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1109,35 +1109,35 @@ msgstr "" "Бір қатысушысы қосылған. Қатысушыларға, ол туралы эл.пошта жолдаймысыз?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Қатысушысы қосылды" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Хаттарды жіберу" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Жібермеу" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Жоспарлайтын оқиға жоқ." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Бос/Істе кэші жоқ" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Бос/Істе нысаның сақтау қатесі" diff -Nru akonadi-calendar-19.04.3/po/kk/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/kk/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/kk/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/kk/libakonadi-calendar5-serializer.po 2020-03-03 00:32:50.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2013-04-25 03:55+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" diff -Nru akonadi-calendar-19.04.3/po/km/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/km/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/km/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/km/libakonadi-calendar5.po 2020-03-03 00:32:50.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2012-07-11 10:23+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer\n" @@ -19,7 +19,7 @@ "X-Generator: KBabel 1.11.4\n" "X-Language: km-KH\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -96,49 +96,49 @@ msgid "Copy All" msgstr "ចម្លង​ទិនានុប្បវត្តិ %1" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, fuzzy, kde-format #| msgctxt "@title:window" #| msgid "Add Calendar" @@ -278,24 +278,24 @@ "joe@mydomain.com on the server www.yourdomain.com will fail." msgstr "" -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" "Reason: %2" msgstr "" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -304,22 +304,22 @@ "contact your system administrator.

" msgstr "" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "" -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -327,17 +327,17 @@ "your system administrator for the exact URL and the account details.

" msgstr "" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "" -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "" @@ -445,36 +445,36 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "" -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " "DestinationPolicyNeverAsk was used" msgstr "" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " "rolled back." msgstr "" -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "" @@ -506,29 +506,29 @@ msgid "Invalid incidence" msgstr "" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, fuzzy, kde-format #| msgid "Could not create calendar: %1" msgid "Error sending counter proposal" msgstr "មិន​អាច​បង្កើត​ប្រតិទិន​បាន​ឡើយ ៖ %1" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "" @@ -710,7 +710,7 @@ "an updated response to the organizer declining the invitation?" msgstr "" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "" @@ -757,7 +757,7 @@ msgid "Error queuing message in outbox: %1" msgstr "" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, fuzzy, kde-format #| msgid "Could not create calendar: %1" msgid "Error sending e-mail: " @@ -922,12 +922,12 @@ msgid "This field contains the email address of the recipient" msgstr "" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "" @@ -942,7 +942,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "" -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, fuzzy, kde-format #| msgid "Edit the selected incidence." msgid "Error modifying incidence" @@ -994,49 +994,49 @@ "only or disabled calendar." msgstr "" -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "" -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "" -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "" -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1044,35 +1044,35 @@ "an update message?" msgstr "" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "" -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "" diff -Nru akonadi-calendar-19.04.3/po/km/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/km/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/km/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/km/libakonadi-calendar5-serializer.po 2020-03-03 00:32:50.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2011-01-05 03:25+0700\n" "Last-Translator: Seng Sutha \n" "Language-Team: Khmer [km] \n" diff -Nru akonadi-calendar-19.04.3/po/ko/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/ko/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/ko/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ko/libakonadi-calendar5.po 2020-03-03 00:32:50.000000000 +0000 @@ -1,12 +1,12 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Shinjo Park , 2015, 2016, 2018. +# Shinjo Park , 2015, 2016, 2018, 2020. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2018-08-15 12:25+0100\n" "Last-Translator: Shinjo Park \n" "Language-Team: Korean \n" @@ -15,9 +15,9 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.04.3\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -91,49 +91,49 @@ msgid "Copy All" msgstr "모두 복사하기" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "요약" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "시작 날짜와 시간" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "끝 날짜와 시간" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "종류" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "종료 기한의 날짜와 시간" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "중요도" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "완료" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -281,7 +281,7 @@ "com 사용자의 바쁨/한가함 URL이 www.yourdomain.com 하에 있으면 일치하지 않음으" "로 판단합니다." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -290,17 +290,17 @@ "바쁨/한가함 데이터를 다운로드할 수 없음: %1\n" "이유: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "바쁨/한가함 가져오기 오류" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "다음에서 가져온 바쁨/한가함 정보를 처리할 수 없음: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -313,22 +313,22 @@ "같습니다: %2

URL을 다시 한 번 확인해 본 후 시스템 관리자에게 " "문의하십시오.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "바쁨/한가함 정보를 보냈습니다." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "바쁨/한가함 보내는 중" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "바쁨/한가함 데이터를 공개할 수 없음: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -339,17 +339,17 @@ "정 대화 상자의 \"바쁨/한가함\" 페이지에 설정하십시오.

정확한 URL 및 계" "정 정보는 시스템 관리자에게 문의하십시오.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "바쁨/한가함 업로드 URL이 없음" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "입력한 대상 URL '%1'이(가) 잘못되었습니다." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "잘못된 URL" @@ -453,17 +453,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "달력 항목이 이미 삭제되었거나 삭제 중입니다." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "ACL 제한으로 인하여 작업을 수행할 수 없음" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "선택한 모음집이 잘못됨" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -472,12 +472,12 @@ "기본 모음집이 잘못되었거나 올바른 ACL이 없으며 DestinationPolicyNeverAsk가 사" "용되지 않음" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "그룹 작업 중 중복된 항목 ID가 있음" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -486,7 +486,7 @@ "변경 사항 그룹에 포함된 일부 변경 사항이 잘못되었습니다. 모든 변경 사항을 되" "돌립니다." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "알 수 없는 오류" @@ -516,28 +516,28 @@ msgid "Invalid incidence" msgstr "잘못된 반복" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "잘못된 동작: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "역제안을 보내는 중 오류 발생" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "역제안을 편집할 편집기를 시작할 수 없음" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "항목 '%1'에 참가자가 없습니다. 그룹웨어 메시지를 보내지 않을 것입니다." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "메시지 보내지 않음" @@ -741,7 +741,7 @@ "이 행사 초대장을 이전에 수락했습니다. 주최자에게 초대 거절 메시지를 보내시겠" "습니까?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "역제안: %1" @@ -787,7 +787,7 @@ msgid "Error queuing message in outbox: %1" msgstr "보낼 편지함에 메시지를 추가할 수 없음: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "이메일 보내기 오류: " @@ -955,12 +955,12 @@ msgid "This field contains the email address of the recipient" msgstr "이 필드는 수신자의 이메일 주소를 포함합니다" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(빈이름)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(빈이메일)" @@ -975,7 +975,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "업데이트가 아닙니다. 찾은 반복 항목은 더 최근에 수정되었습니다." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "반복 항목을 수정할 수 없음" @@ -1032,49 +1032,49 @@ "행사나 작업을 달력에서 삭제할 수 없습니다. 이미 삭제되었거나 소유자가 여러분" "이 아닐 수도 있습니다. 읽기 전용이나 비활성화된 달력에 있을 수도 있습니다." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "일반 오류" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 님이 %2에 참가하려고 하지만 초대받지 않았습니다." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 님이 %3 님 대신 %2에 참가하려고 합니다." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "초대받지 않은 참석자" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "참석 수락" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "참석 거부" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "주최자가 참석 요청을 거부했습니다." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1084,35 +1084,35 @@ "참석자가 반복 목록에 추가되었습니다. 다른 참석자들에게 업데이트 메시지를 보내" "시겠습니까?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "참석자 추가됨" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "메시지 보내기" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "보내지 않음" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "반복 항목이 없습니다." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "바쁨 한가함 캐시가 없음" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "바쁨 한가함 객체를 저장할 수 없음" diff -Nru akonadi-calendar-19.04.3/po/ko/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/ko/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/ko/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ko/libakonadi-calendar5-serializer.po 2020-03-03 00:32:50.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-08-30 23:21+0900\n" "Last-Translator: Shinjo Park \n" "Language-Team: Korean \n" diff -Nru akonadi-calendar-19.04.3/po/lt/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/lt/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/lt/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/lt/libakonadi-calendar5.po 2020-03-03 00:32:50.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2015-08-30 15:57+0200\n" "Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian \n" @@ -22,7 +22,7 @@ "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" "X-Generator: Lokalize 2.0\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -97,49 +97,49 @@ msgid "Copy All" msgstr "Kopijuoti viską" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Santrauka" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Pradžios data ir laikas" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Pabaigos data ir laikas" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Tipas" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Numatyta įvykdymo data ir laikas" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioritetas" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Užbaigta" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -277,7 +277,7 @@ "joe@mydomain.com on the server www.yourdomain.com will fail." msgstr "" -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -286,17 +286,17 @@ "Nepavyko atsisiųsti užimtumo duomenų iš: %1\n" "Priežastis: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Užimtumo gavimo klaida" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "Nepavyko apdoroti užimtumo informacijos gautos iš: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -305,22 +305,22 @@ "contact your system administrator.

" msgstr "" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Užimtumo informacija buvo sėkmingai išsiųsta." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Siunčiamas užimtumas" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Nepavyksta publikuoti užimtumo duomenų: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -328,17 +328,17 @@ "your system administrator for the exact URL and the account details.

" msgstr "" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Nėra užimtumo publikavimo URL" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Duotas URL „%1“ yra netvarkingas." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Neteisingas URL" @@ -443,36 +443,36 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "" -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " "DestinationPolicyNeverAsk was used" msgstr "" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " "rolled back." msgstr "" -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Nežinoma klaida" @@ -503,29 +503,29 @@ msgid "Invalid incidence" msgstr "Klaidingas veiksmas: %1" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Klaidingas veiksmas: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, fuzzy, kde-format #| msgid "Error sending e-mail: " msgid "Error sending counter proposal" msgstr "Klaida siunčiant el. laišką: " -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Žinutė neišsiųsta" @@ -706,7 +706,7 @@ "an updated response to the organizer declining the invitation?" msgstr "" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Kontrapasiūlymas: %1" @@ -752,7 +752,7 @@ msgid "Error queuing message in outbox: %1" msgstr "" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Klaida siunčiant el. laišką: " @@ -918,12 +918,12 @@ msgid "This field contains the email address of the recipient" msgstr "Šis laukas turi gavėjo el. pašto adresus" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(be vardo)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(Tuščias E.Adresas)" @@ -938,7 +938,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "" -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, fuzzy, kde-format #| msgid "Edit the selected incidence." msgid "Error modifying incidence" @@ -990,49 +990,49 @@ "only or disabled calendar." msgstr "" -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Bendra klaida" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 nori dalyvauti %2 bet nebuvo pakviesta(-s)." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 nori dalyvauti %2 vietoje %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Nekviestas dalyvis" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Priimti dalyvavimą" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Atmesti dalyvavimą" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Organizatorius jūsų pasiūlymą dalyvauti susitikime atmetė." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1040,35 +1040,35 @@ "an update message?" msgstr "" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Dalyviai pridėti" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Siųsti žinutes" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Nesiųsti" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "" -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Nėra užimtumo podėlio" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "" diff -Nru akonadi-calendar-19.04.3/po/lt/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/lt/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/lt/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/lt/libakonadi-calendar5-serializer.po 2020-03-03 00:32:50.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2011-12-11 22:03+0200\n" "Last-Translator: Remigijus Jarmalavičius \n" "Language-Team: Lithuanian \n" diff -Nru akonadi-calendar-19.04.3/po/lv/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/lv/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/lv/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/lv/libakonadi-calendar5-serializer.po 2020-03-03 00:32:50.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2012-07-12 23:17+0300\n" "Last-Translator: Einars Sprugis \n" "Language-Team: Latvian \n" diff -Nru akonadi-calendar-19.04.3/po/mr/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/mr/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/mr/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/mr/libakonadi-calendar5.po 2020-03-03 00:32:50.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2013-03-25 17:45+0530\n" "Last-Translator: Chetan Khona \n" "Language-Team: Marathi \n" @@ -17,7 +17,7 @@ "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Lokalize 1.5\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -86,49 +86,49 @@ msgid "Copy All" msgstr "" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "सारांश" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "सुरुवातीचा दिनांक व वेळ" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "शेवटचा दिनांक व वेळ" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "प्रकार" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "ठरलेला दिनांक व वेळ" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "प्राधान्यता" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "पूर्ण" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -266,24 +266,24 @@ "joe@mydomain.com on the server www.yourdomain.com will fail." msgstr "" -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" "Reason: %2" msgstr "" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -292,22 +292,22 @@ "contact your system administrator.

" msgstr "" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "" -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -315,17 +315,17 @@ "your system administrator for the exact URL and the account details.

" msgstr "" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "" -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "अवैध URL" @@ -430,36 +430,36 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "" -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " "DestinationPolicyNeverAsk was used" msgstr "" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " "rolled back." msgstr "" -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "अपरिचीत त्रुटी" @@ -489,28 +489,28 @@ msgid "Invalid incidence" msgstr "" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "" @@ -695,7 +695,7 @@ "an updated response to the organizer declining the invitation?" msgstr "" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "" @@ -741,7 +741,7 @@ msgid "Error queuing message in outbox: %1" msgstr "" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "" @@ -907,12 +907,12 @@ msgid "This field contains the email address of the recipient" msgstr "" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "" @@ -927,7 +927,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "" -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "" @@ -976,49 +976,49 @@ "only or disabled calendar." msgstr "" -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "" -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "" -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "" -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1026,35 +1026,35 @@ "an update message?" msgstr "" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "पाठवू नका" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "" -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "" diff -Nru akonadi-calendar-19.04.3/po/mr/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/mr/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/mr/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/mr/libakonadi-calendar5-serializer.po 2020-03-03 00:32:50.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2013-03-13 11:12+0530\n" "Last-Translator: Chetan Khona \n" "Language-Team: Marathi \n" diff -Nru akonadi-calendar-19.04.3/po/nb/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/nb/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/nb/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/nb/libakonadi-calendar5.po 2020-03-03 00:32:50.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2013-12-02 20:08+0100\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" @@ -19,7 +19,7 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -95,49 +95,49 @@ msgid "Copy All" msgstr "Kopier alt" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Sammendrag" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Startdato og -tidspunkt" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Sluttdato og -tidspunkt" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Type" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Forfallsdato og tidspunkt" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioritet" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Fullført" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -287,7 +287,7 @@ "For eksempel. hvis dette er slått på, så virker det ikke å lete etter ledig/" "opptatt-informasjon for per@mittdomene.no på tjeneren www.dittdomene.no." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -296,18 +296,18 @@ "Klarte ikke laste ned ledig/opptatt-data fra: %1\n" "Årsak: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Feil ved ledig/opptatt-innhenting" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Klarte ikke å tolke ledig/opptatt-informasjon som ble innhentet fra: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -320,22 +320,22 @@ "oppga feil nettadresse. Systemet sa: %2.

Se etter at " "nettadressen er riktig eller kontakt systemadministratoren din.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Ledig/opptatt-informasjon ble vellykket sendt." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Sender Ledig/Opptatt" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Klarer ikke å publisere ledig/opptatt-informasjonen: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -347,17 +347,17 @@ "der.

Kontakt din systemadministrator for å få vite nøyaktig URL og " "konto-detaljer.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Ingen URL for opplasting av ledig/opptatt-informasjon" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Oppgitt måladresse «%1» er ugyldig." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Ugyldig URL" @@ -463,17 +463,17 @@ "Den kalenderoppføringen var slettet fra før, eller er i ferd med å bli " "slettet." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Handlingen kan ikke utføres på grunn av ACL-restriksjoner" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Den oppgitte samlingen er ugyldig" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -482,12 +482,12 @@ "Standard samling er ugyldig, eller har ikke riktige ACL-er og " "DestinationPolicyNeverAsk ble brukt-" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Duplisert element i en gruppe-handling" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -495,7 +495,7 @@ msgstr "" "En endring i en gruppe endringer mislyktes, Alle endringer blir tilbakestilt." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Ukjent feil" @@ -525,22 +525,22 @@ msgid "Invalid incidence" msgstr "Ugyldig forekomst" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Ugyldig handling: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Feil under sending av motforslag" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Klarte ikke å starte redigeringsprogram for å redigere motforslag" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -548,7 +548,7 @@ "Hendelsen «%1» har ingen deltakere, derfor blir det ikke sendt ut en " "gruppemelding." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Melding ikke sendt" @@ -753,7 +753,7 @@ "Du ar tidligere tatt imot en invitasjon til denne hendelsen. Vil du sende et " "oppdatert svar til arrangøren av denne hendelsen?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Motforslag: %1" @@ -799,7 +799,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Feil mens melding ble lagt i ut-boksen: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Feil under sending av e-post: " @@ -973,12 +973,12 @@ msgid "This field contains the email address of the recipient" msgstr "Dette feltet inneholder e-postadressen til mottakeren" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(TomtNavn)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(TomE-post)" @@ -994,7 +994,7 @@ msgstr "" "Dette er ikke en oppdatering. Forekomsten som ble funnet ble endret senere." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Feil mens en forekomst ble endret" @@ -1046,49 +1046,49 @@ "er slettet allerede, eller ikke tilhører deg. Den kan også høre til en " "skrivebeskyttet eller avslått kalender." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Generisk feil" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 vil være med på %2 men var ikke invitert." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 vil være med på %2 på vegne av %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Uinvitert deltaker" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Godta deltakelse" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Nekt deltakelse" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Arrangøren avviste din deltakelse ved dette møtet." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1098,35 +1098,35 @@ "En deltaker ble lagt til forekomsten. Vil du sende deltakerne en oppdatert " "melding på e-post?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Deltaker lagt til" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Send meldinger" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Ikke send" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Ingen forekomst til planlegging." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Ikke noe mellomlager for ledig/opptatt" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Feil ved lagring av ledig/opptatt-objekt" diff -Nru akonadi-calendar-19.04.3/po/nb/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/nb/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/nb/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/nb/libakonadi-calendar5-serializer.po 2020-03-03 00:32:50.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-09-19 22:57+0200\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" diff -Nru akonadi-calendar-19.04.3/po/nds/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/nds/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/nds/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/nds/libakonadi-calendar5.po 2020-03-03 00:32:50.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2014-08-13 00:20+0200\n" "Last-Translator: Sönke Dibbern \n" "Language-Team: Low Saxon \n" @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -95,49 +95,49 @@ msgid "Copy All" msgstr "All koperen" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Tosamenfaten" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Startdatum un -Tiet" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Enndatum un -Tiet" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Typ" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Afloopdatum un -tiet" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioriteet" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Afslaten" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -287,7 +287,7 @@ "anmaakt, sleit dat Kieken na de Free-/Bunnen-Daten vun jan@miendomaen.de op " "den Server www.diendomaen.com fehl." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -296,17 +296,17 @@ "Fehler bi't Daalladen vun Free-/Bunnen-Daten vun: %1\n" "Grund: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Free-/Bunnen-Afhaal-Fehler" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "Fehler bi't Inlesen vun de vun %1 haalten Free-/Bunnen-Daten." -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -319,22 +319,22 @@ "villicht en leeg URL angeven. Dat Systeem seeg: %2.

Prööv " "bitte de URL oder snack Dien Systeempleger dor op an.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "De Free-/Bunnen-Daten wöörn mit Spood loosstüert." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Free-/Bunnen-Daten warrt loosstüert" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "De Free-/Bunnen-Daten laat sik nich apenmaken: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -346,17 +346,17 @@ "

Snack Dien Systeeempleger op de naue URL un de Anmelldaten an.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Keen Free-/Bunnen-Hoochlaad-URL" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "De angeven Teel-URL \"%1\" is leeg." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Leeg URL" @@ -460,17 +460,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "De Kalennerindrag weer al wegmaakt oder wöör jüst wegdaan." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Akschoon lett sik nich utföhren, de TVL lett dat nich to." -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "De utsöchte Sammeln gellt nich." -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -479,12 +479,12 @@ "De Standardsammeln is leeg oder hett keen propper TVL, un de Teelregel " "\"Nienich Fragen\" wöör bruukt." -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Dubbelt Indrag-ID binnen en Koppel-Akschoon" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -493,7 +493,7 @@ "Een Ännern, de en Koppel vun Ännern tohöör, is fehlslaan. All Ännern warrt " "torüchdreiht." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Nich begäng Fehler" @@ -523,22 +523,22 @@ msgid "Invalid incidence" msgstr "Leeg Begeefnis" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Leeg Akschoon: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Fehler bi't Loosstüern vun en Gegenvörslag" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Editor för't Bewerken vun en Gegenvörslag lett sik nich opropen" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -546,7 +546,7 @@ "De Indrag \"%1\" hett keen Deelnehmers, keen Arbeitkoppel-Naricht warrt " "loosstüert." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Naricht nich loosstüert" @@ -752,7 +752,7 @@ "Du hest en Inladen för dit Begeefnis vördem al annahmen. Wullt Du den " "Utrichter de opfrischte Anter tostüern, Du wiest de Inladen af?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Gegenvörslag: %1" @@ -798,7 +798,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Fehler bi't Inregen vun en Naricht na den Postutgang: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Fehler bi't Loosstüern vun Nettpost: " @@ -974,12 +974,12 @@ msgid "This field contains the email address of the recipient" msgstr "Dit Feld bargt den Adressaat sien Nettpostadress " -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(keen Naam)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(leddig Adress)" @@ -995,7 +995,7 @@ msgstr "" "Dit is keen Opfrischen. De funnen Begeefnis wöör later nochmaal ännert." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Fehler bi't Ännern vun en Begeefnis" @@ -1047,49 +1047,49 @@ "Villicht hett Een em al wegmaakt, oder villicht büst Du nich de Eegner. " "Villicht höört he ok en bloots-leesbor oder utmaakt Kalenner to." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Allmeen Fehler" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 will bi %2 dorbi wesen, man wöör nich inlaadt." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 will för %3 bi %2 dorbi wesen." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Nich inlaadt Deelnehmer" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Deelnahm tolaten" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Deelnahm afwiesen" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "De Utrichter hett Dien Deelnahm bi disse Mööt afwiest." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1099,35 +1099,35 @@ "En Deelnehmer wöör dat Begeefnis toföögt. Wullt Du de Deelnehmers per " "Nettpost en Opfrischnaricht tostüern?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Deelnehmer toföögt" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Narichten loosstüern" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Nich loosstüern" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Keen Begeefnis, dat sik planen lett" -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Keen Free-/Bunnen-Twischenspieker" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Fehler bi't Sekern vun en Free-/Bunnen-Objekt" diff -Nru akonadi-calendar-19.04.3/po/nds/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/nds/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/nds/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/nds/libakonadi-calendar5-serializer.po 2020-03-03 00:32:50.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-09-18 22:52+0200\n" "Last-Translator: Sönke Dibbern \n" "Language-Team: Low Saxon \n" diff -Nru akonadi-calendar-19.04.3/po/nl/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/nl/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/nl/libakonadi-calendar5.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/nl/libakonadi-calendar5.po 2020-03-03 00:32:50.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2018-08-30 13:03+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" @@ -17,7 +17,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -92,49 +92,49 @@ msgid "Copy All" msgstr "Alles kopiëren" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Samenvatting" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Startdatum en tijd" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Einddatum en tijd" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Type" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Datum en tijd gereed" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioriteit" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Voltooid" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -285,7 +285,7 @@ "naar vrij/bezet-gegevens van jan@mijndomein.com op de server www.uwdomein." "com mislukken." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -294,17 +294,17 @@ "Kon vrij/bezet-informatie niet downloaden van: %1\n" "Reden: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Fout bij ophalen vrij/bezet-informatie" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "Ontleden van vrij/bezet-informatie, opgehaald van '%1' is mislukt" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -317,22 +317,22 @@ "adres op. Het systeem antwoordde: %2.

Controleer het URL-" "adres, of neem contact op met uw systeembeheerder.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "De vrij/bezetinformatie is met succes verzonden." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Vrij/bezet-informatie wordt verzonden" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Kon de informatie vrij/bezet niet publiceren: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -344,17 +344,17 @@ "\"Vrij/bezet\".

Neem contact op met uw systeembeheerder voor het " "juiste URL-adres en de accountgegevens.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Geen URL-adres voor sturen van vrij/bezetinformatie" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Het opgegeven URL-adres %1 is ongeldig." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Ongeldig URL-adres" @@ -459,17 +459,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "Dat agenda-item was al verwijderd of wordt nu verwijderd." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Bewerking kan niet worden uitgevoerd vanwege ACL-restricties" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "De gekozen verzameling is ongeldig" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -478,12 +478,12 @@ "De standaard verzameling is ongeldig of heeft niet de juiste ACL's en " "DestinationPolicyNeverAsk is gebruikt" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Dubbel item-id in een groepsbewerking" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -492,7 +492,7 @@ "Één wijziging behorende bij een groep wijzigingen is mislukt. Alle " "wijzigingen worden teruggedraaid." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Onbekende fout" @@ -524,22 +524,22 @@ msgid "Invalid incidence" msgstr "Ongeldige gebeurtenis" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Ongeldige actie: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Fout bij het verzenden van tegenvoorstel" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Kon de bewerker niet starten voor het bewerken van het tegenvoorstel" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -547,7 +547,7 @@ "Het item '%1' heeft geen gebruikers. Er zal daarom geen groupware-bericht " "worden verzonden." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Bericht niet verzonden" @@ -755,7 +755,7 @@ "een nader antwoord sturen aan de organisator waarin u de uitnodiging niet " "aanvaardt?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Tegenvoorstel: %1" @@ -801,7 +801,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Fout bij het bericht in de wachtrij van postvak uit zetten: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Fout bij het verzenden van e-mail: " @@ -978,12 +978,12 @@ msgid "This field contains the email address of the recipient" msgstr "Dit veld bevat het e-mailadres van de ontvanger" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(Lege naam)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(Lege e-mail)" @@ -999,7 +999,7 @@ msgstr "" "Dit is geen bijwerken. De gevonden gebeurtenis was meer recent gewijzigd." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Fout bij wijzigen van gebeurtenis" @@ -1059,49 +1059,49 @@ "is het al verwijderd of bent u geen eigenaar. Of het zou kunnen behoren tot " "een alleen-lezen of uitgeschakelde agenda." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Algemene fout" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 wil aan %2 deelnemen maar was niet uitgenodigd." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 wil deelnemen aan %2 namens %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Niet-uitgenodigde deelnemer" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Deelname accepteren" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Deelname weigeren" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "De organisator heeft uw deelname voor deze vergadering geweigerd." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1111,35 +1111,35 @@ "Een deelnemer is toegevoegd aan het item. Wilt u aan de deelnemers een " "bericht daarover sturen?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Deelnemer toegevoegd" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Berichten verzenden" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Niet verzenden" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Geen gebeurtenis om te plannen." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Geen cache voor vrij/bezet" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Fout bij opslaan van vrij/bezet-object" diff -Nru akonadi-calendar-19.04.3/po/nl/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/nl/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/nl/libakonadi-calendar5-serializer.po 2019-07-09 00:19:24.000000000 +0000 +++ akonadi-calendar-19.12.3/po/nl/libakonadi-calendar5-serializer.po 2020-03-03 00:32:50.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-08-22 22:44+0200\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" diff -Nru akonadi-calendar-19.04.3/po/pa/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/pa/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/pa/libakonadi-calendar5-serializer.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/pa/libakonadi-calendar5-serializer.po 2020-03-03 00:32:50.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2010-12-26 09:10+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" diff -Nru akonadi-calendar-19.04.3/po/pl/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/pl/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/pl/libakonadi-calendar5.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/pl/libakonadi-calendar5.po 2020-03-03 00:32:50.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2019-01-20 07:25+0100\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" @@ -18,7 +18,7 @@ "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 19.03.70\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -94,49 +94,49 @@ msgid "Copy All" msgstr "Kopiuj wszystko" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Podsumowanie" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Początkowa data i czas" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Końcowa data i czas" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Rodzaj" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Data i czas zakończenia" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Priorytet" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Ukończenie" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -287,7 +287,7 @@ "użytkownika jan@mojadomena.pl na serwerze www.twojadomena.pl zakończy się " "niepowodzeniem." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -296,17 +296,17 @@ "Błąd przy pobieraniu informacji wolny/zajęty z: %1\n" "Powód: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Błąd odzyskiwania danych wolny/zajęty" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "Błąd przetwarzania informacji wolny/zajęty uzyskiwanej z: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -319,22 +319,22 @@ "adres URL %2.

Proszę sprawdzić adres URL lub skontaktować się " "z administratorem systemu.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Informacja wolny/zajęty została poprawnie wysłana." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Wysyłanie wolny/zajęty" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Nie można opublikować danych wolny/zajęty: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -346,17 +346,17 @@ "p>

Skontaktuj się z administratorem systemu w celu uzyskania dokładnego " "adresu URL oraz szczegółów konta.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Brak URL do wgrania wolny/zajęty" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Docelowy adres URL '%1' jest niewłaściwy." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Nieprawidłowy adres URL" @@ -460,17 +460,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "Ten element kalendarza został już usunięty, lub jest obecnie usuwany." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Nie można wykonać operacji ze względu na ograniczenia ACL" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Wybrany zbiór jest nieprawidłowy" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -479,12 +479,12 @@ "Domyślny zbiór jest nieprawidłowy lub nie ma odpowiednich ACL-ów i zostało " "użyte DestinationPolicyNeverAsk" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Powiel identyfikator elementu w operacji grupowej" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -493,7 +493,7 @@ "Jedna zmiana, należąca do grupy zmian, zawiodła. Nastąpi cofnięcie " "wszystkich zmian." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Nieznany błąd" @@ -525,22 +525,22 @@ msgid "Invalid incidence" msgstr "Nieprawidłowe wydarzenie" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Nieprawidłowe działanie: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Błąd wysyłania kontrpropozycji" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Nie można uruchomić edytora, aby edytować kontrpropozycję" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -548,7 +548,7 @@ "Element '%1' nie ma żadnych uczestników. Zatem nie zostanie wysłana żadna " "wiadomość pracy grupowej." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Nie wysłano wiadomości " @@ -756,7 +756,7 @@ "Wcześniej już zaakceptowałeś(łaś) zaproszenie do tego wydarzenia. Czy chcesz " "wysłać uaktualnioną odpowiedź do jego organizatora odrzucającą zaproszenie?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Kontrpropozycja: %1" @@ -802,7 +802,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Błąd kolejkowania wiadomości w skrzynce wyjściowej: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Błąd wysyłania poczty: " @@ -979,12 +979,12 @@ msgid "This field contains the email address of the recipient" msgstr "Pole zawiera adres poczty elektronicznej odbiorcy" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(pusta nazwa)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(pusty adres pocztowy)" @@ -1001,7 +1001,7 @@ "To nie jest uaktualnienie. Znalezione wystąpienie zostało zmodyfikowane " "jeszcze wcześniej." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Błąd zmiany wydarzenia" @@ -1061,49 +1061,49 @@ "Możliwe, że zostało już usunięte lub nie jesteś jego właścicielem. Może to " "być wydarzenie z kalendarza tylko do odczytu lub kalendarz jest wyłączony." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Błąd ogólny" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 chce wziąć udział w %2, ale nie został zaproszony/a." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 chce wziąć udział w %2 w imieniu %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Niezaproszony uczestnik" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Przyjmij uczestnictwo" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Odrzuć uczestnictwo" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Organizator odrzucił twój udział w tym spotkaniu." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1113,35 +1113,35 @@ "Do wydarzenia został dodany uczestnik. Czy chcesz wysłać pozostałym " "uczestnikom komunikat o uaktualnieniu?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Dodano uczestnika" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Wyślij wiadomości" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Nie wysyłaj" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Nie ma wystąpienia do zaplanowania." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Brak pamięci podręcznej wolny/zajęty" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Błąd zapisywania obiektów wolny/zajęty" diff -Nru akonadi-calendar-19.04.3/po/pl/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/pl/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/pl/libakonadi-calendar5-serializer.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/pl/libakonadi-calendar5-serializer.po 2020-03-03 00:32:51.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-08-23 10:44+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" diff -Nru akonadi-calendar-19.04.3/po/pt/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/pt/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/pt/libakonadi-calendar5.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/pt/libakonadi-calendar5.po 2020-03-03 00:32:51.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2017-12-10 15:34+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" @@ -15,7 +15,7 @@ "X-POFile-SpellExtra: DestinationPolicyNeverAsk NomeVazio KOrganizer ACL\n" "X-POFile-SpellExtra: Outlook nn ifb\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -91,49 +91,49 @@ msgid "Copy All" msgstr "Copiar Tudo" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Resumo" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Data e Hora Inicial" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Data e Hora Final" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Tipo" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Data e Hora Limites" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioridade" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Completo" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -284,7 +284,7 @@ "dos dados de livre/ocupado do ze@meu-dominio.com não será bem sucedido em " "'www.seu-dominio.com'." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -293,18 +293,18 @@ "Não foi possível transferir os dados de livre/ocupado de: %1\n" "Razão: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Erro de obtenção do livre/ocupado" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Não foi possível processar os dados de livre/ocupado que foram obtidos de: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -318,22 +318,22 @@ "p>

Verifique por favor o URL ou contacte o seu administrador do sistema." -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "A informação de livre/ocupado foi enviada com sucesso." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "A Enviar o Livre/Ocupado" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Não foi possível publicar os dados de livre/ocupado: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -345,17 +345,17 @@ "na página \"Livre/Ocupado\".

Contacte o seu administrador do sistema " "para saber o URL exacto e os detalhes da conta.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Não Existe um URL de Envio do Livre/Ocupado" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "O URL de destino indicado '%1' é inválido." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "URL inválido" @@ -459,17 +459,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "Este item do calendário já foi ou está a ser removido." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Não é possível efectuar a operação devido a restrições da ACL" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "A colecção escolhida é inválida" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -478,12 +478,12 @@ "A colecção predefinida é inválida ou não tem ACL's adequadas; para além " "disso, o 'DestinationPolicyNeverAsk' foi usado" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "ID de item duplicado numa operação de grupo" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -492,7 +492,7 @@ "Uma das alterações do grupo foi mal-sucedida. Todas as alterações estão a " "ser anuladas." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Erro desconhecido" @@ -522,22 +522,22 @@ msgid "Invalid incidence" msgstr "Incidência inválida" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Acção inválida: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Erro ao enviar a contra-proposta" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Não foi possível iniciar o editor para alterar a contra-proposta" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -545,7 +545,7 @@ "O item '%1' não tem participantes. Como tal, não será enviada nenhuma " "mensagem de 'groupware'." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Mensagem Não Enviada" @@ -751,7 +751,7 @@ "Aceitou anteriormente um convite para este evento. Deseja enviar uma " "resposta actualizada ao organizador, recusando o convite?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Contra-proposta: %1" @@ -797,7 +797,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Erro ao colocar a mensagem em espera na Caixa de Saída: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Erro ao enviar o e-mail: " @@ -974,12 +974,12 @@ msgid "This field contains the email address of the recipient" msgstr "Este campo contém o endereço de e-mail do destinatário" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(NomeVazio)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(MensagemVazia)" @@ -996,7 +996,7 @@ "Isto não é uma actualização. A incidência encontrada foi modificada mais " "recentemente." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Erro ao modificar a incidência" @@ -1055,49 +1055,49 @@ "tenha sido apagado, não pertença a si, ou então o calendário que o contém é " "apenas para leitura ou está desactivado." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Erro Genérico" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 deseja participar em %2 mas não foi convidado." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 deseja participar em %2 por parte de %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Participante não-convidado" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Aceitar a Participação" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Rejeitar a Participação" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "O organizador rejeitou a sua participação nesta reunião." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1107,35 +1107,35 @@ "Foi adicionado um participante à incidência. Deseja enviar uma mensagem de " "actualização por e-mail aos participantes?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Participante Adicionado" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Enviar as Mensagens" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Não Enviar" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Não existe nenhuma incidência a escalonar." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Sem 'Cache' de Livre/Ocupado" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Erro ao gravar o objecto livre/ocupado" diff -Nru akonadi-calendar-19.04.3/po/pt/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/pt/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/pt/libakonadi-calendar5-serializer.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/pt/libakonadi-calendar5-serializer.po 2020-03-03 00:32:51.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-08-22 14:11+0100\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" diff -Nru akonadi-calendar-19.04.3/po/pt_BR/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/pt_BR/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/pt_BR/libakonadi-calendar5.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/pt_BR/libakonadi-calendar5.po 2020-03-03 00:32:51.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2019-02-15 09:04-0200\n" "Last-Translator: Luiz Fernando Ranghetti \n" "Language-Team: Portuguese \n" @@ -21,7 +21,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 18.12.2\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -97,49 +97,49 @@ msgid "Copy All" msgstr "Copiar todas" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Resumo" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Data e hora de início" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Data e hora de término" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Tipo" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Data e hora de limites" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioridade" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Concluído" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -291,7 +291,7 @@ "selecionada, então a pesquisa de disponibilidade do jose@meu.dominio.com no " "servidor seu.dominio.com não irá funcionar." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -300,18 +300,18 @@ "Falha ao baixar os dados de disponibilidade de: %1\n" "Motivo: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Erro de recuperação de disponibilidade" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Falha ao analisar a informação de disponibilidade que foi obtida de: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -324,22 +324,22 @@ "uma URL incorreta. O sistema retornou: %2.

Verifique a URL ou " "contacte o administrador do seu sistema.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "As informações de disponibilidade foram enviadas com sucesso." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Enviando disponibilidade" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Impossível publicar as informações de disponibilidade: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -351,17 +351,17 @@ "página \"Livre/Ocupado\".

Contacte o administrador do seu sistema para " "saber a URL exata e os detalhes da conta.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Não existe uma URL de envio das disponibilidades" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "A URL de destino indicada '%1' é inválida." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "URL inválida" @@ -465,17 +465,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "Este item do calendário já foi ou está a sendo excluído." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Não é possível efetuar a operação devido a restrições da ACL" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "A coleção escolhida é inválida" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -484,12 +484,12 @@ "A coleção padrão é inválida ou não tem ACLs adequadas, sendo usado o " "DestinationPolicyNeverAsk" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "ID de item duplicado em uma operação de grupo" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -497,7 +497,7 @@ msgstr "" "Uma das alterações do grupo falhou. Todas as alterações estão sendo anuladas." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Erro desconhecido" @@ -527,22 +527,22 @@ msgid "Invalid incidence" msgstr "Incidência inválida" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Ação inválida: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Erro ao enviar a contraproposta" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Não foi possível iniciar o editor para editar a contraproposta" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -550,7 +550,7 @@ "O item '%1' não possui participantes. Sendo assim, nenhuma mensagem de " "groupware será enviada." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Mensagem não enviada" @@ -755,7 +755,7 @@ "Você aceitou anteriormente um convite para este evento. Deseja enviar uma " "resposta atualizada ao organizador, recusando o convite?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Contraproposta: %1" @@ -801,7 +801,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Erro ao colocar a mensagem em espera na caixa de saída: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Erro ao enviar o e-mail: " @@ -978,12 +978,12 @@ msgid "This field contains the email address of the recipient" msgstr "Este campo contém o endereço de e-mail do destinatário" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(Nome em branco)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(E-mail em branco)" @@ -1000,7 +1000,7 @@ "Isto não é uma atualização. A incidência encontrada foi modificada mais " "recentemente." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Ocorreu um erro ao modificar a incidência" @@ -1060,49 +1060,49 @@ "tenha sido excluído, você não é o proprietário, ou o calendário que o contém " "é apenas para leitura ou está desabilitado." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Erro genérico" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 deseja participar em %2 mas não foi convidado." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 deseja participar em %2 como representante de %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Participante não convidado" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Aceitar a participação" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Rejeitar a participação" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "O organizador rejeitou a sua participação nesta reunião." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1112,35 +1112,35 @@ "Um participante foi adicionado à incidência. Deseja enviar um e-mail de " "atualização aos outros participantes?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Participante adicionado" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Enviar mensagens" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Não enviar" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Nenhuma incidência a agendar." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Sem cache de Livre/Ocupado" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Erro ao salvar o objeto livre/ocupado" diff -Nru akonadi-calendar-19.04.3/po/pt_BR/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/pt_BR/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/pt_BR/libakonadi-calendar5-serializer.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/pt_BR/libakonadi-calendar5-serializer.po 2020-03-03 00:32:51.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-08-23 21:50-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" diff -Nru akonadi-calendar-19.04.3/po/ro/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/ro/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/ro/libakonadi-calendar5.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ro/libakonadi-calendar5.po 2020-03-03 00:32:51.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2012-12-27 09:48+0200\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" @@ -19,7 +19,7 @@ "X-Generator: Lokalize 1.5\n" "X-Poedit-Bookmarks: 21,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -96,49 +96,49 @@ msgid "Copy All" msgstr "Copiaţi %1 Jurnal" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, fuzzy, kde-format #| msgctxt "@title:window" #| msgid "Add Calendar" @@ -278,24 +278,24 @@ "joe@mydomain.com on the server www.yourdomain.com will fail." msgstr "" -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" "Reason: %2" msgstr "" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -304,22 +304,22 @@ "contact your system administrator.

" msgstr "" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "" -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -327,17 +327,17 @@ "your system administrator for the exact URL and the account details.

" msgstr "" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "" -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "" @@ -445,36 +445,36 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "" -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " "DestinationPolicyNeverAsk was used" msgstr "" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " "rolled back." msgstr "" -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "" @@ -506,29 +506,29 @@ msgid "Invalid incidence" msgstr "" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, fuzzy, kde-format #| msgid "Could not create calendar: %1" msgid "Error sending counter proposal" msgstr "Calendarul nu a putut fi creat:%1" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "" @@ -710,7 +710,7 @@ "an updated response to the organizer declining the invitation?" msgstr "" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "" @@ -757,7 +757,7 @@ msgid "Error queuing message in outbox: %1" msgstr "" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, fuzzy, kde-format #| msgid "Could not create calendar: %1" msgid "Error sending e-mail: " @@ -922,12 +922,12 @@ msgid "This field contains the email address of the recipient" msgstr "" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "" @@ -942,7 +942,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "" -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, fuzzy, kde-format #| msgid "Edit the selected incidence." msgid "Error modifying incidence" @@ -994,49 +994,49 @@ "only or disabled calendar." msgstr "" -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "" -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "" -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "" -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1044,35 +1044,35 @@ "an update message?" msgstr "" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "" -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "" diff -Nru akonadi-calendar-19.04.3/po/ro/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/ro/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/ro/libakonadi-calendar5-serializer.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ro/libakonadi-calendar5-serializer.po 2020-03-03 00:32:51.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2012-12-21 04:07+0200\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" diff -Nru akonadi-calendar-19.04.3/po/ru/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/ru/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/ru/libakonadi-calendar5.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ru/libakonadi-calendar5.po 2020-03-03 00:32:51.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2018-08-14 09:42+0300\n" "Last-Translator: Александр Яворский \n" "Language-Team: Russian \n" @@ -23,7 +23,7 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -98,49 +98,49 @@ msgid "Copy All" msgstr "Копировать всё" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Сводка" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Дата и время начала" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Дата и время окончания" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Тип" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Срок к исполнению" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Приоритет" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Выполнено" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -290,7 +290,7 @@ "пользователя. Если он установлен, то найти данные о занятости, например " "пользователя joe@mydomain.com на сервере www.yourdomain.com не удастся." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -299,17 +299,17 @@ "Не удалось получить данные о занятости от %1.\n" "Причина: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Ошибка извлечения сведений о занятости" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "Не удалось разобрать сведения о занятости, полученные от %1." -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -322,22 +322,22 @@ "сообщила: %2.

Пожалуйста, проверьте URL или обратитесь к " "системному администратору.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Сведения о занятости были переданы успешно." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Передача сведений о занятости" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Опубликовать сведения о занятости не удалось: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -349,17 +349,17 @@ "p>

Точный адрес и учётные данные можно узнать у системного администратора." "

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Нет адреса публикации сведений о занятости" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Указанный целевой адрес «%1» недопустим." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Недопустимый адрес" @@ -475,17 +475,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "Запись в календаре уже удаляется или была удалена." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Выполнить операцию нельзя из-за ограничений доступа." -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Выбранная коллекция ошибочна" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -495,12 +495,12 @@ "подходящие права, и используется правило выбора коллекции по умолчанию без " "вопросов" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Дублирование кодов элементов в операции с группой" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -509,7 +509,7 @@ "Сбой изменения из относящихся к группе. Программа откатила назад все " "изменения." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Неизвестная ошибка" @@ -539,22 +539,22 @@ msgid "Invalid incidence" msgstr "Ошибочное мероприятие" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Ошибочное действие: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Ошибка отправки контрпредложения" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Не удалось запустить редактор для ввода контрпредложения" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -562,7 +562,7 @@ "Для записи «%1» список участников не определён, поэтому сообщение для группы " "отправлено не будет." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Письмо не отправлено" @@ -767,7 +767,7 @@ "Ранее вы приняли приглашение на это событие. Отправить изменённый ответ " "организатору, отменившему приглашение?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Встречное предложение: %1" @@ -813,7 +813,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Ошибка помещения сообщения в очередь на отправку: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Ошибка отправки сообщения: " @@ -986,12 +986,12 @@ msgid "This field contains the email address of the recipient" msgstr "Это поле содержит адрес электронной почты получателя" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(БезИмени)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(БезАдреса)" @@ -1007,7 +1007,7 @@ msgstr "" "Это не обновление. Найденная запись о мероприятии была обновлена позднее." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Ошибка при изменении мероприятия" @@ -1066,49 +1066,49 @@ "удалена или она принадлежит не вам, либо она относится к отключённому или " "доступному только для чтения календарю." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Общая ошибка" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 будет вместе с %2, но без приглашения." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 будет вместе с %2 от имени %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Неприглашённый участник" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Принять участие" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Отказать в участии" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Организатор отказал вам в участии в собрании." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1118,35 +1118,35 @@ "Новый участник был добавлен в список. Отправить участникам письмо об " "обновлении?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Участник добавлен" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Отправить сообщения" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Не отправлять" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Нет мероприятия для планирования." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Нет кэша данных о занятости" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Ошибка сохранения данных о занятости" diff -Nru akonadi-calendar-19.04.3/po/ru/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/ru/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/ru/libakonadi-calendar5-serializer.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ru/libakonadi-calendar5-serializer.po 2020-03-03 00:32:51.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2015-09-04 04:25+0300\n" "Last-Translator: Alexander Potashev \n" "Language-Team: Russian \n" diff -Nru akonadi-calendar-19.04.3/po/sk/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/sk/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/sk/libakonadi-calendar5.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/sk/libakonadi-calendar5.po 2020-03-03 00:32:51.000000000 +0000 @@ -1,21 +1,22 @@ # translation of libakonadi-calendar5.po to Slovak # Roman Paholík , 2014, 2015, 2016. +# Matej Mrenica , 2019. msgid "" msgstr "" "Project-Id-Version: libakonadi-calendar5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" -"PO-Revision-Date: 2016-03-15 19:43+0100\n" -"Last-Translator: Roman Paholik \n" -"Language-Team: Slovak \n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" +"PO-Revision-Date: 2019-08-04 10:44+0200\n" +"Last-Translator: Matej Mrenica \n" +"Language-Team: Slovak \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.07.90\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "Nemôžem nájsť výskyt na aktualizáciu, pravdepodobne bol vymazaný." @@ -89,49 +90,49 @@ msgid "Copy All" msgstr "Kopírovať všetko" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Súhrn" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Počiatočný dátum a čas" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Koncový dátum a čas" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Typ" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Dátum a čas splnenia" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Priorita" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Dokončené" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -282,7 +283,7 @@ "hľadáte. Napríklad, ak je táto voľba nastavená, potom hľadanie dát voľný/" "zaneprázdnený pre joe@mydomain.com na serveri www.yourdomain.com zlyhá." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -291,18 +292,18 @@ "Zlyhalo stiahnutie dát voľný/zaneprázdnený z: %1\n" "Dôvod: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Chyba pri získavaní voľný/zaneprázdnený" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Zlyhalo spracovanie informácií voľný/zaneprázdnený, ktoré boli získané z: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -315,22 +316,22 @@ "Systém odpovedal: %2.

Prosím, skontrolujte URL alebo sa " "obráťte na vášho správcu systému.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Informácia voľný/zaneprázdnený bola úspešne odoslaná." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Posielanie voľný/zaneprázdnený" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Nemožno publikovať dáta voľný/zaneprázdnený: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -342,17 +343,17 @@ "stránke \"Voľný/Zaneprázdnený\".

Obráťte sa na správcu systému pre " "presné URL a podrobnosti o účte.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Žiadne URL pre nahratie voľný/zaneprázdnený" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Poskytnuté cieľové URL '%1' je neplatné." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Neplatné URL" @@ -456,17 +457,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "Tá položka kalendára bola už vymazaná alebo sa práve maže." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Operácia sa nedá vykonať kvôli ACL obmedzeniam" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Vybraná kolekcia je neplatná" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -475,19 +476,19 @@ "Predvolená kolekcia je neplatná alebo nemá správne ACL a " "DestinationPolicyNeverAsk bolo použité" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Duplicitné id položky v skupinovej operácii" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " "rolled back." msgstr "Jedna zmena patriaca skupine zmien zlyhala. Všetky zmeny budú vrátené." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Neznáma chyba" @@ -517,22 +518,22 @@ msgid "Invalid incidence" msgstr "Neplatný výskyt" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Neplatná akcia: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Chyba posielania protinávrhu" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Nemôžem spustiť editor na úpravu protinávrhu" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -540,7 +541,7 @@ "Položka '%1' nemá žiadnych účastníkov. Teda nebude poslaná žiadna groupware " "správa." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Správa neposlaná" @@ -745,7 +746,7 @@ "Predtým ste prijali pozvanie na túto akciu. Chcete poslať aktualizovanú " "odpoveď odmietajúcu pozvanie organizátorovi ?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Protinávrh: %1" @@ -791,7 +792,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Chyba zaraďovania správy na poslanie: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Chyba posielania e-mailu: " @@ -841,12 +842,12 @@ "Unable to publish the calendar incidence due to an invalid recipients " "string. %1" msgstr "" +"Nemožno zverejniť udalosť kalendára kvôli neplatnému reťazcu príjemcov. %1" #: publishdialog.cpp:148 -#, fuzzy, kde-format -#| msgid "Publishing" +#, kde-format msgid "Publishing Error" -msgstr "Publikovanie" +msgstr "Chyba publikovania" #. i18n: ectx: property (toolTip), widget (QListWidget, mListWidget) #: publishdialog_base.ui:38 @@ -967,12 +968,12 @@ msgid "This field contains the email address of the recipient" msgstr "Toto pole obsahuje e-mailovú adresu prijímateľa" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(PrázdneMeno)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(PrázdnyEmail)" @@ -987,7 +988,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "Toto nie je aktualizácia. Nájdený výskyt bol zmenený neskôr." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Chyba úpravy výskytu" @@ -1046,49 +1047,49 @@ "vymazaná alebo ju nevlastníte. Alebo je iba na čítanie alebo je zakázaný " "kalendár." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Všeobecná chyba" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 sa chce zúčastniť %2, ale nebol pozvaný." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 sa chce zúčastniť %2 menom %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Nepozvaný účastník" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Prijať účasť" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Zamietnuť účasť" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Organizátor odmietol vašu účasť na tomto stretnutí." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1098,35 +1099,35 @@ "Bol pridaný účastník do stretnutia. Chcete poslať účastníkom aktualizačnú " "správu e-mailom?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Účastník pridaný" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Poslať správy" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Neposielať" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Žiadny výskyt na plánovanie." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Žiadna cache pre Free Busy" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Chyba ukladania objekty freebusy" diff -Nru akonadi-calendar-19.04.3/po/sk/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/sk/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/sk/libakonadi-calendar5-serializer.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/sk/libakonadi-calendar5-serializer.po 2020-03-03 00:32:51.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-08-22 17:23+0200\n" "Last-Translator: Roman Paholík \n" "Language-Team: Slovak \n" diff -Nru akonadi-calendar-19.04.3/po/sl/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/sl/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/sl/libakonadi-calendar5.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/sl/libakonadi-calendar5.po 2020-03-03 00:32:51.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2018-01-18 17:49+0100\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" @@ -20,7 +20,7 @@ "%100==4 ? 3 : 0);\n" "X-Generator: Lokalize 2.0\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -96,49 +96,49 @@ msgid "Copy All" msgstr "Kopiraj vse" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Povzetek" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Datum in čas začetka" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Datum in čas konca" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Vrsta" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Datum in čas zapadlosti" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prednost" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Zaključeno" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -289,7 +289,7 @@ "ta možnost nastavljena, bo iskanje podatkov o prostosti/zaposlenosti " "uporabnika janez@mojadomena.si na strežniku www.tvojadomena.si spodletelo." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -298,19 +298,19 @@ "Podatkov o prostosti/zaposlenosti ni bilo mogoče prejeti iz %1\n" "Vzrok: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Napaka pridobivanja podatkov o prostosti/zaposlenosti" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Podatkov o prostosti/zaposlenosti, pridobljenih iz %1, ni bilo mogoče " "razčleniti." -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -323,22 +323,22 @@ "ste navedli napačen URL. Sistem je odvrnil: %2.

Preverite URL " "ali stopite v stik z vašim sistemskim skrbnikom.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Podatki o prostosti/zaposlenosti so bili uspešno poslani." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Pošiljanje podatkov o prostosti/zaposlenosti" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Podatkov o prostosti/zaposlenosti ni bilo mogoče objaviti: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -350,17 +350,17 @@ "ja na strani »Prostost/zaposlenost«.

Za natančen URL in podatke o " "računu stopite v stik z vašim sistemskim skrbnikom.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Ni URL-ja za pošiljanje prostosti/zaposlenosti" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Podan ciljni URL »%1« ni veljaven." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Neveljaven URL" @@ -465,17 +465,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "Ta predmet koledarja je že bil izbrisan ali pa se že briše." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Opravila ni mogoče izvesti zaradi omejitev ACL" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Izbrana zbirka ni veljavna" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -484,12 +484,12 @@ "Privzeta zbirka ni veljavna ali pa nima pravih ACL-jev, uporabljen pa je bil " "tudi DestinationPolicyNeverAsk" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Podvojen ID predmeta v skupini opravil" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -498,7 +498,7 @@ "Ena izmed sprememb iz skupine sprememb je spodletela. Vse spremembe bodo " "povrnjene." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Neznana napaka" @@ -528,22 +528,22 @@ msgid "Invalid incidence" msgstr "Neveljavna pojavitev" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Neveljavno dejanje: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Napaka med pošiljanjem nasprotnega predloga" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Ni bilo mogoče zagnati urejevalnika za urejanje nasprotnega predloga" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -551,7 +551,7 @@ "Predmet »%1« nima udeležencev, zato ne bo poslano sporočilo programa za " "skupinsko delo." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Sporočilo ni bilo poslano" @@ -755,7 +755,7 @@ "Predhodno ste že sprejeli vabilo na ta dogodek. Ali želite organizatorju " "poslati posodobljen odgovor, da zavračate povabilo?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Nasprotni predlog: %1" @@ -801,7 +801,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Napaka postavljanja sporočila v čakalno vrsto odhajajočih: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Napaka med pošiljanjem pošte: " @@ -972,12 +972,12 @@ msgid "This field contains the email address of the recipient" msgstr "To polje vsebuje e-poštni naslov prejemnika" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(PraznoIme)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(PraznaE-pošta)" @@ -992,7 +992,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "To ni posodobitev. Najdena pojavitev je bila nedavno spremenjena." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Napaka med spreminjanjem pojavitve" @@ -1051,49 +1051,49 @@ "ga že izbrisali, ali pa niste njegov lastnik. Mogoče je tudi, da pripada " "koledarju, ki je samo za branje, ali pa je onemogočen." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Splošna napaka" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 se želi udeležiti %2, vendar ni bil povabljen." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 se želi v imenu %3 udeležiti %2." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Nepovabljen udeleženec" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Sprejmi udeležbo" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Zavrni udeležbo" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Organizator je zavrnil vašo udeležbo na tem srečanju." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1103,35 +1103,35 @@ "Pojavitvi je bil dodan udeleženec. Ali želite udeležencem poslati e-pošto s " "posodobitvijo?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Udeleženec je dodan" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Pošlji sporočila" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Ne pošlji" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Ni pojavitve za razporejanje." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Ni predpomnilnika prostosti/zaposlenosti" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Napaka med shranjevanjem predmeta prostosti/zaposlenosti" diff -Nru akonadi-calendar-19.04.3/po/sl/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/sl/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/sl/libakonadi-calendar5-serializer.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/sl/libakonadi-calendar5-serializer.po 2020-03-03 00:32:51.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2015-08-25 17:47+0200\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" diff -Nru akonadi-calendar-19.04.3/po/sr/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/sr/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/sr/libakonadi-calendar5.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/sr/libakonadi-calendar5.po 2020-03-03 00:32:51.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-08-16 09:11+0200\n" +"POT-Creation-Date: 2019-04-11 03:40+0200\n" "PO-Revision-Date: 2017-12-17 18:01+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -20,7 +20,7 @@ "X-Environment: kde\n" "X-Associated-UI-Catalogs: kwidgetsaddons5_qt\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "Не могу да нађем случај за ажурирање, вероватно је недавно обрисан." @@ -464,19 +464,19 @@ msgstr "Та календарска ставка већ је обрисана, или је брисање у току." # >> @info -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1227 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Поступак не може да се изврши због АЦЛ ограничења." # >> @info -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1230 #, kde-format msgid "The chosen collection is invalid" msgstr "Изабран збирка је лоша." # >> @info -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1233 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -486,13 +486,13 @@ "DestinationPolicyNeverAsk." # >> @info -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1237 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Удвостручени ИД ставке у групном поступку." # >> @info -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1240 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -500,7 +500,7 @@ msgstr "Једна од измена из групе измена није прошла. Враћају се све измене." # >> @info -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1245 #, kde-format msgid "Unknown error" msgstr "Непозната грешка." diff -Nru akonadi-calendar-19.04.3/po/sv/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/sv/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/sv/libakonadi-calendar5.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/sv/libakonadi-calendar5.po 2020-03-03 00:32:51.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2017-12-10 21:54+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" @@ -18,7 +18,7 @@ "X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -95,49 +95,49 @@ msgid "Copy All" msgstr "Kopiera alla" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Sammanfattning" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Startdatum och tid" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Slutdatum och tid" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Typ" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Färdigdatum och tid" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Prioritet" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Färdig" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -287,7 +287,7 @@ "inställningen. Om alternativet är aktiverat fungerar det inte att leta efter " "data om ledig-upptagen för anna@mindomän.se på servern www.dindomän.se." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -296,17 +296,17 @@ "Misslyckades att ladda ner ledig-upptagen data från: %1\n" "Orsak: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Fel vid hämtning av ledig-upptagen" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "Misslyckades att tolka ledig-uppdagen information hämtad från: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -319,22 +319,22 @@ "angavs en felaktig webbadress. Systemet svarade: %2.

Kontrollera webbadressen, eller kontakta systemadministratören.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Information om ledig-upptagen skickades med lyckat resultat." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Skickar ledig-upptagen" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Kunde inte publicera ledig-upptagen information: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -346,17 +346,17 @@ "upptagen\".

Kontakta systemadministratören för den exakta webbadressen " "och kontoinformation.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Ingen webbadress för uppladdning av ledig-upptagen" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Målwebbadressen '%1' som har angivits är ogiltig." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Ogiltig webbadress" @@ -462,17 +462,17 @@ "Kalenderobjektet har redan tagits bort, eller håller för närvarande på att " "tas bort." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Åtgärden kan inte utföras på grund av ACL-begränsningar" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Den valda samlingen är ogiltig" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -481,12 +481,12 @@ "Standardsamlingen är ogiltig eller har inte riktiga ACL:er och målpolicyn " "att aldrig fråga användes" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Duplicerad objektidentifierare i gruppåtgärd" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -495,7 +495,7 @@ "En ändring som hör till en grupp av ändringar misslyckades. Alla ändringar " "håller på att ångras." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Okänt fel" @@ -525,29 +525,29 @@ msgid "Invalid incidence" msgstr "Ogiltig händelse" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Ogiltig åtgärd: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Fel när motförslag skulle skickas" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Kunde inte starta editor för att redigera motförslag" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" "Objektet '%1' saknar deltagare. Därför skickas inga grupprogrammeddelanden." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Meddelande skickades inte" @@ -753,7 +753,7 @@ "Du har tidigare accepterat en inbjudan till aktiviteten. Vill du skicka ett " "uppdaterat svar till händelsens organisatör som avböjer inbjudan?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Motförslag: %1" @@ -799,7 +799,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Fel när brev skulle köas i utkorg: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Fel när e-post skulle skickas: " @@ -976,12 +976,12 @@ msgid "This field contains the email address of the recipient" msgstr "Fältet innehåller mottagarens e-postadress" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(Tomt namn)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(Tom e-post)" @@ -997,7 +997,7 @@ msgstr "" "Det här är inte en uppdatering. Händelsen som hittades har ändrats senare." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Fel vid ändring av händelse" @@ -1057,49 +1057,49 @@ "redan tagits bort eller så ägs den inte av dig. Den kan också höra till en " "skrivskyddad eller inaktiverad kalender." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Generellt fel" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 vill delta i %2 men har inte bjudits in." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 vill delta i %2 för %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Oinbjuden deltagare" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Acceptera deltagande" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Neka till deltagande" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Organisatören nekade till ditt deltagande i mötet." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1109,35 +1109,35 @@ "En deltagare har lagts till i händelsen. Vill du skicka ett uppdateringsbrev " "med e-post till deltagarna?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Deltagare tillagd" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Skicka brev" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Skicka inte" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Ingen händelse för schemaläggning." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Ingen cache för ledig-upptagen" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Misslyckades med att spara ledig-upptagen objekt" diff -Nru akonadi-calendar-19.04.3/po/sv/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/sv/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/sv/libakonadi-calendar5-serializer.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/sv/libakonadi-calendar5-serializer.po 2020-03-03 00:32:51.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-08-22 18:41+0200\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" diff -Nru akonadi-calendar-19.04.3/po/tr/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/tr/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/tr/libakonadi-calendar5.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/tr/libakonadi-calendar5.po 2020-03-03 00:32:51.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2017-06-09 15:16+0100\n" "Last-Translator: Volkan Gezer \n" "Language-Team: Turkish \n" @@ -20,7 +20,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 2.0\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "Güncellenecek takvim bulunamadı, muhtemelen yakın zamanlarda silindi." @@ -95,49 +95,49 @@ msgid "Copy All" msgstr "Tümünü Kopyala" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Özet" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Başlangıç Tarihi ve Saati" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Bitiş Tarihi ve Saati" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Tür" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Sonlanma Tarihi ve Saati" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Öncelik" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Tamamlanan" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -287,7 +287,7 @@ "bu seçenek seçilmişse ve joe@mydomain.com adresinin serbest/meşgul verisini " "arıyorsanız www.yourdomain.com adresi başarısız olacaktır." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -296,17 +296,17 @@ "%1 den Serbest/Meşgul verisi indirme başarısız: \n" "Neden: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Serbest/meşgul edinme hatası" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "Serbest/meşgul bilgisi ayrıştırılamayan adres: %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -319,22 +319,22 @@ "em>.

Lütfen adresi kontrol edin veya sistem yöneticinizle bağlantıya " "geçin.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Serbest/Meşgul bilgisi başarıyla gönderildi." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Serbest/Meşgul Gönderiliyor" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Serbest/Meşgul verisi yayımlanamadı: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -346,17 +346,17 @@ "sayfasından ayarlayın.

Adres ve hesap ayrıntıları için sistem " "yöneticinizle görüşün.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Serbest/Meşgul Yükleme Adresi Yok" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Hedef URL '%1' geçersiz." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Geçersiz Adres" @@ -460,17 +460,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "Takvim ögesi zaten silinmişti, ya da şu anda silindi." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "ACL kısıtlamaları nedeniyle işlem uygulanamadı" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Seçilen derleme geçersiz" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -479,12 +479,12 @@ "Öntanımlı seçki ya geçersiz ya da uygun ACL'leri sahip değil ve " "DestinationPolicyNeverAsk kullanılmış" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Bir grup işleminde aynı öge birden çok kez kullanılmış" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -493,7 +493,7 @@ "Bir değişim bir grup değişikliğin başarısız olmasına neden oluyor. Tüm " "değişiklikler geri alınıyor." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Bilinmeyen hata" @@ -523,29 +523,29 @@ msgid "Invalid incidence" msgstr "Geçersiz toplantı" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Geçersiz eylem: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Karşı öneri gönderme hatası" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "Karşı öneriyi düzenlemek için düzenleyici başlatılamadı" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" "%1 ögesinin katılımcısı yok. Bu nedenle grup yazılımı iletileri gönderilecek." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "İleti gönderilmedi." @@ -752,7 +752,7 @@ "Bu olayın bir davetini daha önceden kabul ettin. Düzenleyene davetini " "reddeden güncellenmiş bir cevap göndermek ister misin?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Karşıt öneri: %1" @@ -798,7 +798,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Giden kutusunda hata kuyruklama iletisi: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "E-posta gönderilirken hata: " @@ -972,12 +972,12 @@ msgid "This field contains the email address of the recipient" msgstr "Bu alan alıcının e-posta adresini içerir" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(İsimsiz)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(BoşE-posta)" @@ -992,7 +992,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "Bu bir güncelleme değil. Bulunan toplantı yakında düzenlenmiş." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Toplantı değişikliği yapma hatası" @@ -1051,49 +1051,49 @@ "sizin tarafından sahiplenilmemiş durumda. Salt-okunur veya etkin olmayan bir " "takvime de ait olabilir." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Genel Hata" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 %2 kişisine eşlik etmek istiyor ancak davet edilmemiş" -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1, %3 adına %2 etkinliğine katılmak istiyor" -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Davet edilmemiş katılımcı" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Katılımı Kabul Et" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Katılımı Reddet" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Düzenleyici toplantıya katılmanızı reddetti." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1103,35 +1103,35 @@ "Toplantıya bir katılımcı eklendi. Diğer katılımcılara bir güncelleme iletisi " "göndermek ister misiniz?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Katılımcı Eklendi" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Mesajları Gönder" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Gönderme" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Zamanlama için bir toplantı yok." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Serbest Meşgul Ön Belleği Yok" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Serbest meşgul nesnesini kaydederken hata" diff -Nru akonadi-calendar-19.04.3/po/tr/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/tr/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/tr/libakonadi-calendar5-serializer.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/tr/libakonadi-calendar5-serializer.po 2020-03-03 00:32:51.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: kdepim-runtime-kde4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2015-02-09 11:36+0100\n" "Last-Translator: Volkan Gezer \n" "Language-Team: Turkish \n" diff -Nru akonadi-calendar-19.04.3/po/ug/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/ug/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/ug/libakonadi-calendar5.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ug/libakonadi-calendar5.po 2020-03-03 00:32:51.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur Computer Science Association \n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -86,49 +86,49 @@ msgid "Copy All" msgstr "ھەممىنى كۆچۈر" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "ئۈزۈندى" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "باشلانغان چېسلا ۋە ۋاقىت" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "ئاخىرلاشقان چېسلا ۋە ۋاقىت" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "تىپى" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "مۆلچەرلەنگەن چېسلا ۋە ۋاقىت" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "مەرتىۋە" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "تولۇق" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -266,24 +266,24 @@ "joe@mydomain.com on the server www.yourdomain.com will fail." msgstr "" -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" "Reason: %2" msgstr "" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -292,22 +292,22 @@ "contact your system administrator.

" msgstr "" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "" -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -315,17 +315,17 @@ "your system administrator for the exact URL and the account details.

" msgstr "" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "" -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "ئىناۋەتسىز URL" @@ -430,36 +430,36 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "" -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " "DestinationPolicyNeverAsk was used" msgstr "" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " "rolled back." msgstr "" -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "نامەلۇم خاتالىق" @@ -489,28 +489,28 @@ msgid "Invalid incidence" msgstr "" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "" @@ -695,7 +695,7 @@ "an updated response to the organizer declining the invitation?" msgstr "" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "" @@ -741,7 +741,7 @@ msgid "Error queuing message in outbox: %1" msgstr "" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "" @@ -907,12 +907,12 @@ msgid "This field contains the email address of the recipient" msgstr "" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(قۇرۇق ئات)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(قۇرۇق خەت)" @@ -927,7 +927,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "" -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "" @@ -976,49 +976,49 @@ "only or disabled calendar." msgstr "" -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 نىڭ %2 غا قاتناشقۇسى بار، بىراق تەكلىپ قىلىنمىغان." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%3 غا ۋاكالىتەن %2 غا %1 قاتناشماقچى" -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "تەكلىپ قىلمىغان قاتناشقۇچى" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "قاتناشقۇچىنى قوبۇل قىلىش" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "قاتناشقۇچىنى رەت قىلىش" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "تەشكىللىگۈچى سىزنىڭ بۇ يىغىنغا قاتنىشىشىڭىزنى رەت قىلدى." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1026,35 +1026,35 @@ "an update message?" msgstr "" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "قاتناشقۇچى قوشۇلدى" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "ئۇچۇر ئەۋەتىش" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "يوللىما" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "" -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "" diff -Nru akonadi-calendar-19.04.3/po/ug/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/ug/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/ug/libakonadi-calendar5-serializer.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/ug/libakonadi-calendar5-serializer.po 2020-03-03 00:32:51.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: akonadi_serializer_plugins\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur Computer Science Association \n" diff -Nru akonadi-calendar-19.04.3/po/uk/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/uk/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/uk/libakonadi-calendar5.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/uk/libakonadi-calendar5.po 2020-03-03 00:32:51.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2017-12-10 10:55+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -20,7 +20,7 @@ "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "" @@ -96,49 +96,49 @@ msgid "Copy All" msgstr "Копіювати все" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "Резюме" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "Дата і час початку" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "Дата і час завершення" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "Тип" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "Дата і час призначення" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "Пріоритет" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "Виконано" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -292,7 +292,7 @@ "пошук даних про вільність/зайнятість joe@мій_домен.com на сервері www." "ваш_домен.com зазнає невдачі." -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -301,18 +301,18 @@ "Не вдалося отримати дані щодо вільного/зайнятого часу з: %1\n" "Причина: %2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "Помилка отримання даних вільного/зайнятого часу" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" "Не вдалося обробити дані щодо вільного/зайнятого часу, які було отримано з %1" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -325,22 +325,22 @@ "неправильну адресу. Відповідь системи: %2.

Будь ласка, " "перевірте адресу або зверніться до вашого системного адміністратора.

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "Інформацію про вільний/зайнятий час успішно надіслано." -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "Надсилання вільного/зайнятого часу" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "Не вдалося оприлюднити дані про вільний/зайнятий час: %1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -352,17 +352,17 @@ "сторінці «Вільний/зайнятий».

Дізнайтесь про параметри облікового " "запису та точну адресу URL у вашого системного адміністратора.

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "Не вказано адреси для оприлюднення вільного/зайнятого часу" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "Надано некоректну адресу URL, «%1»." -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "Некоректна адреса" @@ -475,17 +475,17 @@ msgstr "" "Цей запис календаря вже вилучено або процес вилучення цього запису триває." -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "Дію не можливо виконати через обмеження доступу" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "Вибрана збірка є некоректною" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -494,12 +494,12 @@ "Типова збірка є некоректною або не встановлено належні списки доступу і " "використано DestinationPolicyNeverAsk" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "Дублювання ідентифікатора запису під час дії над групою" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " @@ -508,7 +508,7 @@ "Не вдалося виконати одну зі змін, що належить до групи змін. Всі зміни буде " "скасовано." -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "Невідома помилка" @@ -538,22 +538,22 @@ msgid "Invalid incidence" msgstr "Некоректна подія" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "Некоректна дія: %1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "Помилка під час спроби надіслати контрпропозицію" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "На вдалося запустити редактор для редагування контрпропозиції" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." @@ -561,7 +561,7 @@ "Для запису «%1» не визначено учасників. Тому повідомлень до групи надіслано " "не буде." -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "Повідомлення не надіслано" @@ -769,7 +769,7 @@ "Раніше ви прийняли запрошення на цю подію. Бажаєте надіслати оновлену " "відповідь організаторові з відмовою від запрошення?" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "Контрпропозиція: %1" @@ -817,7 +817,7 @@ msgid "Error queuing message in outbox: %1" msgstr "Помилка під час додавання повідомлення до черги надсилання: %1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "Помилка під час надсилання пошти: " @@ -993,12 +993,12 @@ msgid "This field contains the email address of the recipient" msgstr "Це поле містить адресу електронної пошти отримувача" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(немає імені)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(немає ел. пошти)" @@ -1015,7 +1015,7 @@ "Це не оновлення. У виявлений запис події було внесено зміни, які є свіжішими " "за ці." -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "Помилка під час спроби змінити запис події" @@ -1077,49 +1077,49 @@ "того, цей запис може зберігатися у календарі, призначеному лише для читання " "або вимкненому календарі." -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "Загальна помилка" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 хоче брати участь в %2, але його не запрошено." -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 хоче брати участь в %2, від імені %3." -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "Незапрошений учасник" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "Дозволити участь" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "Відмовити в участі" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "Організатор відмовив вам в участі в цій зустрічі." -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1129,35 +1129,35 @@ "До запису події було додано учасника. Бажаєте надіслати всім іншим учасникам " "повідомлення щодо оновлення запису?" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "Додано учасника" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "Надіслати повідомлення" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "Не надсилати" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "Немає подій для планування." -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "Немає кешу даних щодо вільного/зайнятого часу" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "Помилка під час спроби збереження запису щодо вільного/зайнятого часу" diff -Nru akonadi-calendar-19.04.3/po/uk/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/uk/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/uk/libakonadi-calendar5-serializer.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/uk/libakonadi-calendar5-serializer.po 2020-03-03 00:32:51.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libakonadi-calendar5-serializer\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2014-08-22 16:20+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" diff -Nru akonadi-calendar-19.04.3/po/zh_CN/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/zh_CN/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/zh_CN/libakonadi-calendar5.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/zh_CN/libakonadi-calendar5.po 2020-03-03 00:32:52.000000000 +0000 @@ -7,21 +7,20 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" -"PO-Revision-Date: 2019-06-02 13:15\n" -"Last-Translator: Guo Yunhe (guoyunhe)\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" +"PO-Revision-Date: 2020-01-20 21:56\n" +"Last-Translator: FULL NAME \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" "X-Crowdin-File: /kf5-stable/messages/pim/libakonadi-calendar5.pot\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "找不到要更新的事件，它可能刚刚被删除了。" @@ -94,49 +93,49 @@ msgid "Copy All" msgstr "全部复制" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "摘要" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "开始日期和时间" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "结束日期和时间" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "类型" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "到期日期和时间" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "优先级" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "完成" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -274,24 +273,24 @@ "joe@mydomain.com on the server www.yourdomain.com will fail." msgstr "" -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" "Reason: %2" msgstr "" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "空闲/忙碌信息获取错误" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -300,22 +299,22 @@ "contact your system administrator.

" msgstr "" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "" -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "正在发送空闲/忙碌信息" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -325,17 +324,17 @@ "

没有配置可供上传忙闲列表的 URL。请在 KOrganizer 的“忙/闲”配置对话框中" "设定它。

您可以联系您的系统管理员获悉这个 URL 及其账户细节。

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "无空闲/忙碌信息上传 URL" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "提供的目标“%1”无效。" -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "无效的 URL" @@ -439,17 +438,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "日历项已被删除，或者正在被删除。" -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "因为访问控制列表限制无法进行操作" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "选择的收藏无效" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -457,19 +456,19 @@ msgstr "" "默认收藏无效或者没有合适的访问控制表并且使用了 DestinationPolicyNeverAsk。" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " "rolled back." msgstr "" -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "未知错误" @@ -499,28 +498,28 @@ msgid "Invalid incidence" msgstr "无效事件" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "无效动作：%1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "发送反建议出错" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "" -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "未发出信息" @@ -719,7 +718,7 @@ "an updated response to the organizer declining the invitation?" msgstr "" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "反对：%1" @@ -765,7 +764,7 @@ msgid "Error queuing message in outbox: %1" msgstr "" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "发送邮件时出错：" @@ -928,12 +927,12 @@ msgid "This field contains the email address of the recipient" msgstr "此字段包含了收件人的邮箱地址" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "(空名称)" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "(空电子邮件)" @@ -948,7 +947,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "" -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "修改事件出错" @@ -1004,49 +1003,49 @@ "无法从日历中移除此事件或任务。可能是因为它已被删除、或是不属于您，也可能它属" "于一个只读或被禁用的日历中。" -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "常规错误。" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 想参加 %2，但没有被邀请。" -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 想代表 %3 参加 %2。" -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "未邀请的参与者" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "接受参与者" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "拒绝参与者" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "组织者拒绝您参加此次会议。" -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1054,35 +1053,35 @@ "an update message?" msgstr "一个参与者已经被添加到事件中。您想要向所有参与者发送通知信件吗？" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "参与者已添加" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "发送信件" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "不发送" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "没有要计划的事件。" -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "无空闲忙碌信息缓存" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "保存忙碌空闲对象出错" diff -Nru akonadi-calendar-19.04.3/po/zh_CN/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/zh_CN/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/zh_CN/libakonadi-calendar5-serializer.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/zh_CN/libakonadi-calendar5-serializer.po 2020-03-03 00:32:52.000000000 +0000 @@ -8,16 +8,15 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" -"PO-Revision-Date: 2019-06-02 13:16\n" -"Last-Translator: Guo Yunhe (guoyunhe)\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" +"PO-Revision-Date: 2020-01-20 21:56\n" +"Last-Translator: FULL NAME \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" "X-Crowdin-File: /kf5-stable/messages/pim/libakonadi-calendar5-serializer." diff -Nru akonadi-calendar-19.04.3/po/zh_TW/libakonadi-calendar5.po akonadi-calendar-19.12.3/po/zh_TW/libakonadi-calendar5.po --- akonadi-calendar-19.04.3/po/zh_TW/libakonadi-calendar5.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/zh_TW/libakonadi-calendar5.po 2020-03-03 00:32:52.000000000 +0000 @@ -7,10 +7,10 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-09-22 03:16+0200\n" "PO-Revision-Date: 2018-12-21 19:37+0800\n" "Last-Translator: pan93412 \n" -"Language-Team: Chinese \n" +"Language-Team: Chinese \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 18.12.0\n" -#: calendarbase.cpp:297 +#: calendarbase.cpp:298 #, kde-format msgid "Could not find incidence to update, it probably was deleted recently." msgstr "找不到要更新的事件。可能已被刪除。" @@ -89,49 +89,49 @@ msgid "Copy All" msgstr "全部複製" -#: calendarmodel.cpp:217 +#: calendarmodel.cpp:216 #, kde-format msgctxt "@title:column calendar event summary" msgid "Summary" msgstr "摘要" -#: calendarmodel.cpp:219 +#: calendarmodel.cpp:218 #, kde-format msgctxt "@title:column calendar event start date and time" msgid "Start Date and Time" msgstr "開始日期與時間" -#: calendarmodel.cpp:221 +#: calendarmodel.cpp:220 #, kde-format msgctxt "@title:column calendar event end date and time" msgid "End Date and Time" msgstr "結束日期與時間" -#: calendarmodel.cpp:223 +#: calendarmodel.cpp:222 #, kde-format msgctxt "@title:column calendar event type" msgid "Type" msgstr "型態" -#: calendarmodel.cpp:225 +#: calendarmodel.cpp:224 #, kde-format msgctxt "@title:column todo item due date and time" msgid "Due Date and Time" msgstr "到期日期與時間" -#: calendarmodel.cpp:227 +#: calendarmodel.cpp:226 #, kde-format msgctxt "@title:column todo item priority" msgid "Priority" msgstr "優先權" -#: calendarmodel.cpp:229 +#: calendarmodel.cpp:228 #, kde-format msgctxt "@title:column todo item completion in percent" msgid "Complete" msgstr "完成" -#: calendarmodel.cpp:238 +#: calendarmodel.cpp:237 #, kde-format msgctxt "@title:column calendar title" msgid "Calendar" @@ -277,7 +277,7 @@ "網域部份相不相符。如果設定了此項目，則在伺服器 www.yourdomain.com 上的行程資" "料尋找 joe@mydomain.com 會失敗。" -#: freebusymanager.cpp:400 +#: freebusymanager.cpp:398 #, kde-format msgid "" "Failed to download free/busy data from: %1\n" @@ -286,17 +286,17 @@ "從 %1 下載行程資訊時失敗\n" "理由：%2" -#: freebusymanager.cpp:402 freebusymanager.cpp:426 +#: freebusymanager.cpp:400 freebusymanager.cpp:425 #, kde-format msgid "Free/busy retrieval error" msgstr "取得行程資訊時發生錯誤" -#: freebusymanager.cpp:424 +#: freebusymanager.cpp:423 #, kde-format msgid "Failed to parse free/busy information that was retrieved from: %1" msgstr "剖析從 %1 取得的行程資訊時失敗" -#: freebusymanager.cpp:441 +#: freebusymanager.cpp:440 #, kde-format msgid "" "

The software could not upload your free/busy list to the URL '%1'. " @@ -308,22 +308,22 @@ "指定的網址有誤。系統回應為：%2

請檢查您的網址，或是與您的系統" "管理員聯絡。

" -#: freebusymanager.cpp:649 +#: freebusymanager.cpp:648 #, kde-format msgid "The free/busy information was successfully sent." msgstr "行程資訊已成功送出。" -#: freebusymanager.cpp:650 itiphandler_p.cpp:167 +#: freebusymanager.cpp:649 itiphandler_p.cpp:167 #, kde-format msgid "Sending Free/Busy" msgstr "送出行程資訊中" -#: freebusymanager.cpp:654 +#: freebusymanager.cpp:653 #, kde-format msgid "Unable to publish the free/busy data: %1" msgstr "無法發布行程資料：%1" -#: freebusymanager.cpp:788 +#: freebusymanager.cpp:787 #, kde-format msgid "" "

No URL configured for uploading your free/busy list. Please set it in " @@ -334,17 +334,17 @@ "「行程資訊」頁中設定。

關於網址與帳號詳情等資訊，請與您的系統管理員聯" "絡。

" -#: freebusymanager.cpp:793 +#: freebusymanager.cpp:792 #, kde-format msgid "No Free/Busy Upload URL" msgstr "沒有可上傳行程資訊的網址" -#: freebusymanager.cpp:804 +#: freebusymanager.cpp:803 #, kde-format msgid "The target URL '%1' provided is invalid." msgstr "提供的目標網址 %1 不合法。" -#: freebusymanager.cpp:805 +#: freebusymanager.cpp:804 #, kde-format msgid "Invalid URL" msgstr "不合法的網址" @@ -448,17 +448,17 @@ msgid "That calendar item was already deleted, or currently being deleted." msgstr "行事曆項目已被刪除，或正在被刪除。" -#: incidencechanger.cpp:1226 +#: incidencechanger.cpp:1228 #, kde-format msgid "Operation can not be performed due to ACL restrictions" msgstr "因為存取權限的限制，無法執行操作" -#: incidencechanger.cpp:1229 +#: incidencechanger.cpp:1231 #, kde-format msgid "The chosen collection is invalid" msgstr "選取的收藏不合法" -#: incidencechanger.cpp:1232 +#: incidencechanger.cpp:1234 #, kde-format msgid "" "Default collection is invalid or doesn't have proper ACLs and " @@ -466,19 +466,19 @@ msgstr "" "預設的收藏不合法，或是沒有正確的存取權限卻使用了 DestinationPolicyNeverAsk" -#: incidencechanger.cpp:1236 +#: incidencechanger.cpp:1238 #, kde-format msgid "Duplicate item id in a group operation" msgstr "在群組操作時複製項目代碼" -#: incidencechanger.cpp:1239 +#: incidencechanger.cpp:1241 #, kde-format msgid "" "One change belonging to a group of changes failed. All changes are being " "rolled back." msgstr "群組變更中的某一個變更失敗。所有變更都將回復。" -#: incidencechanger.cpp:1244 +#: incidencechanger.cpp:1246 #, kde-format msgid "Unknown error" msgstr "未知的錯誤" @@ -508,28 +508,28 @@ msgid "Invalid incidence" msgstr "不合法的事件" -#: itiphandler.cpp:235 +#: itiphandler.cpp:237 #, kde-format msgid "Invalid action: %1" msgstr "不合法的動作：%1" -#: itiphandler.cpp:258 +#: itiphandler.cpp:260 #, kde-format msgid "Error sending counter proposal" msgstr "傳送反提案時發生錯誤" -#: itiphandler.cpp:265 +#: itiphandler.cpp:267 #, kde-format msgid "Could not start editor to edit counter proposal" msgstr "無法啟動編輯器來編輯反提案" -#: itiphandler.cpp:298 +#: itiphandler.cpp:300 #, kde-format msgid "" "The item '%1' has no attendees. Therefore no groupware message will be sent." msgstr "項目 %1 沒有參加者。因此不會送出群組訊息。" -#: itiphandler.cpp:301 +#: itiphandler.cpp:303 #, kde-format msgid "Message Not Sent" msgstr "訊息未送出" @@ -729,7 +729,7 @@ msgstr "" "您已接受此事件的邀請。您要送出狀態變更資訊給此事件的發起者，告訴他您拒絕嗎？" -#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:128 +#: itiphandlerhelper_p.cpp:455 mailscheduler_p.cpp:127 #, kde-format msgid "Counter proposal: %1" msgstr "反提案：%1" @@ -775,7 +775,7 @@ msgid "Error queuing message in outbox: %1" msgstr "將信件放入寄件匣時發生錯誤：%1" -#: mailscheduler_p.cpp:207 +#: mailscheduler_p.cpp:206 #, kde-format msgid "Error sending e-mail: " msgstr "傳送郵件時發生錯誤：" @@ -938,12 +938,12 @@ msgid "This field contains the email address of the recipient" msgstr "此欄位為收件者的電子郵件地址" -#: publishdialog_p.cpp:54 +#: publishdialog_p.cpp:58 #, kde-format msgid "(EmptyName)" msgstr "（空白名稱）" -#: publishdialog_p.cpp:55 +#: publishdialog_p.cpp:59 #, kde-format msgid "(EmptyEmail)" msgstr "（空的電子郵件）" @@ -958,7 +958,7 @@ msgid "This isn't an update. The found incidence was modified more recently." msgstr "這不是更新。找到的事件已在最近變更過。" -#: scheduler_p.cpp:280 scheduler_p.cpp:565 scheduler_p.cpp:580 +#: scheduler_p.cpp:280 scheduler_p.cpp:560 scheduler_p.cpp:575 #, kde-format msgid "Error modifying incidence" msgstr "變更事件時發生錯誤" @@ -1014,49 +1014,49 @@ "此事件或工作無法從您的行事曆中移除。也許它已被移除，或是不屬於您所有，或是該" "行事曆設為唯讀或已被關閉。" -#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:599 -#: scheduler_p.cpp:605 +#: scheduler_p.cpp:440 scheduler_p.cpp:455 scheduler_p.cpp:594 +#: scheduler_p.cpp:600 #, kde-format msgid "Generic Error" msgstr "一般錯誤" -#: scheduler_p.cpp:505 +#: scheduler_p.cpp:500 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 but was not invited." msgstr "%1 想參加 %2，但是未接獲邀請。" -#: scheduler_p.cpp:508 +#: scheduler_p.cpp:503 #, kde-format msgctxt "@info" msgid "%1 wants to attend %2 on behalf of %3." msgstr "%1 想代表 %3 參加 %2。" -#: scheduler_p.cpp:512 +#: scheduler_p.cpp:507 #, kde-format msgctxt "@title" msgid "Uninvited attendee" msgstr "未接受邀請的與會者" -#: scheduler_p.cpp:513 +#: scheduler_p.cpp:508 #, kde-format msgctxt "@option" msgid "Accept Attendance" msgstr "接受參與" -#: scheduler_p.cpp:514 +#: scheduler_p.cpp:509 #, kde-format msgctxt "@option" msgid "Reject Attendance" msgstr "拒絕參與" -#: scheduler_p.cpp:517 +#: scheduler_p.cpp:512 #, kde-format msgctxt "@info" msgid "The organizer rejected your attendance at this meeting." msgstr "會議發起者拒絕您參與此會議。" -#: scheduler_p.cpp:540 +#: scheduler_p.cpp:535 #, kde-format msgctxt "@info" msgid "" @@ -1064,35 +1064,35 @@ "an update message?" msgstr "一名參加者已加入此事件。您要寄發變更訊息給其他參加者嗎？" -#: scheduler_p.cpp:542 +#: scheduler_p.cpp:537 #, kde-format msgctxt "@title" msgid "Attendee Added" msgstr "參加者已加入" -#: scheduler_p.cpp:543 +#: scheduler_p.cpp:538 #, kde-format msgctxt "@option" msgid "Send Messages" msgstr "傳送訊息" -#: scheduler_p.cpp:544 +#: scheduler_p.cpp:539 #, kde-format msgctxt "@option" msgid "Do Not Send" msgstr "不要傳送" -#: scheduler_p.cpp:589 +#: scheduler_p.cpp:584 #, kde-format msgid "No incidence for scheduling." msgstr "沒有事件可排程。" -#: scheduler_p.cpp:612 +#: scheduler_p.cpp:607 #, kde-format msgid "No Free Busy Cache" msgstr "沒有行程快取" -#: scheduler_p.cpp:631 +#: scheduler_p.cpp:626 #, kde-format msgid "Error saving freebusy object" msgstr "儲存行程物件時發生錯誤" diff -Nru akonadi-calendar-19.04.3/po/zh_TW/libakonadi-calendar5-serializer.po akonadi-calendar-19.12.3/po/zh_TW/libakonadi-calendar5-serializer.po --- akonadi-calendar-19.04.3/po/zh_TW/libakonadi-calendar5-serializer.po 2019-07-09 00:19:25.000000000 +0000 +++ akonadi-calendar-19.12.3/po/zh_TW/libakonadi-calendar5-serializer.po 2020-03-03 00:32:52.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:42+0200\n" +"POT-Creation-Date: 2019-05-20 03:13+0200\n" "PO-Revision-Date: 2015-02-20 22:32+0800\n" "Last-Translator: Franklin Weng \n" "Language-Team: Chinese Traditional \n" diff -Nru akonadi-calendar-19.04.3/serializers/akonadi_serializer_kcalcore.cpp akonadi-calendar-19.12.3/serializers/akonadi_serializer_kcalcore.cpp --- akonadi-calendar-19.04.3/serializers/akonadi_serializer_kcalcore.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/serializers/akonadi_serializer_kcalcore.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include @@ -33,7 +33,7 @@ #include #include "serializer_debug.h" -using namespace KCalCore; +using namespace KCalendarCore; using namespace KCalUtils; using namespace Akonadi; @@ -63,24 +63,24 @@ if (magic == IncidenceBase::magicSerializationIdentifier()) { IncidenceBase::Ptr base; - switch (static_cast(type)) { - case KCalCore::Incidence::TypeEvent: + switch (static_cast(type)) { + case KCalendarCore::Incidence::TypeEvent: base = Event::Ptr(new Event()); break; - case KCalCore::Incidence::TypeTodo: + case KCalendarCore::Incidence::TypeTodo: base = Todo::Ptr(new Todo()); break; - case KCalCore::Incidence::TypeJournal: + case KCalendarCore::Incidence::TypeJournal: base = Journal::Ptr(new Journal()); break; - case KCalCore::Incidence::TypeFreeBusy: + case KCalendarCore::Incidence::TypeFreeBusy: base = FreeBusy::Ptr(new FreeBusy()); break; - case KCalCore::Incidence::TypeUnknown: + case KCalendarCore::Incidence::TypeUnknown: return false; } input >> base; - incidence = base.staticCast(); + incidence = base.staticCast(); } else { // Use the old format incidence = mFormat.readIncidence(data.readAll()); @@ -132,9 +132,9 @@ } } -static QString toString(const Attendee::Ptr &attendee) +static QString toString(const Attendee &attendee) { - return attendee->name() + QLatin1Char('<') + attendee->email() + QLatin1Char('>'); + return attendee.name() + QLatin1Char('<') + attendee.email() + QLatin1Char('>'); } static QString toString(const Alarm::Ptr &) @@ -142,7 +142,7 @@ return QString(); } -static QString toString(const Attachment::Ptr &) +static QString toString(const Attachment &) { return QString(); } @@ -191,9 +191,9 @@ { compareList(reporter, i18n("Attendees"), left->attendees(), right->attendees()); - if (!compareString(left->organizer()->fullName(), right->organizer()->fullName())) { + if (!compareString(left->organizer().fullName(), right->organizer().fullName())) { reporter->addProperty(AbstractDifferencesReporter::ConflictMode, i18n("Organizer"), - left->organizer()->fullName(), right->organizer()->fullName()); + left->organizer().fullName(), right->organizer().fullName()); } if (!compareString(left->uid(), right->uid())) { diff -Nru akonadi-calendar-19.04.3/serializers/akonadi_serializer_kcalcore.desktop akonadi-calendar-19.12.3/serializers/akonadi_serializer_kcalcore.desktop --- akonadi-calendar-19.04.3/serializers/akonadi_serializer_kcalcore.desktop 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/serializers/akonadi_serializer_kcalcore.desktop 2020-02-21 17:12:44.000000000 +0000 @@ -95,6 +95,6 @@ [Plugin] Type=text/calendar,application/x-vnd.akonadi.note,application/x-vnd.kde.notes -X-Akonadi-Class=default;KCalCore::Incidence*; +X-Akonadi-Class=default;KCalendarCore::Incidence*; X-KDE-Library=akonadi_serializer_kcalcore X-KDE-ClassName=Akonadi::SerializerPluginKCalCore diff -Nru akonadi-calendar-19.04.3/serializers/akonadi_serializer_kcalcore.h akonadi-calendar-19.12.3/serializers/akonadi_serializer_kcalcore.h --- akonadi-calendar-19.04.3/serializers/akonadi_serializer_kcalcore.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/serializers/akonadi_serializer_kcalcore.h 2020-02-21 17:12:44.000000000 +0000 @@ -26,7 +26,7 @@ #include #include -#include +#include namespace Akonadi { @@ -50,7 +50,7 @@ QString extractGid(const Item &item) const override; private: - KCalCore::ICalFormat mFormat; + KCalendarCore::ICalFormat mFormat; }; } diff -Nru akonadi-calendar-19.04.3/src/blockalarmsattribute.cpp akonadi-calendar-19.12.3/src/blockalarmsattribute.cpp --- akonadi-calendar-19.04.3/src/blockalarmsattribute.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/blockalarmsattribute.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -47,19 +47,19 @@ delete d; } -void BlockAlarmsAttribute::blockAlarmType(KCalCore::Alarm::Type type, bool block) +void BlockAlarmsAttribute::blockAlarmType(KCalendarCore::Alarm::Type type, bool block) { switch (type) { - case KCalCore::Alarm::Audio: + case KCalendarCore::Alarm::Audio: d->audio = block; return; - case KCalCore::Alarm::Display: + case KCalendarCore::Alarm::Display: d->display = block; return; - case KCalCore::Alarm::Email: + case KCalendarCore::Alarm::Email: d->email = block; return; - case KCalCore::Alarm::Procedure: + case KCalendarCore::Alarm::Procedure: d->procedure = block; return; default: @@ -69,22 +69,22 @@ void BlockAlarmsAttribute::blockEverything(bool block) { - blockAlarmType(KCalCore::Alarm::Audio, block); - blockAlarmType(KCalCore::Alarm::Display, block); - blockAlarmType(KCalCore::Alarm::Email, block); - blockAlarmType(KCalCore::Alarm::Procedure, block); + blockAlarmType(KCalendarCore::Alarm::Audio, block); + blockAlarmType(KCalendarCore::Alarm::Display, block); + blockAlarmType(KCalendarCore::Alarm::Email, block); + blockAlarmType(KCalendarCore::Alarm::Procedure, block); } -bool BlockAlarmsAttribute::isAlarmTypeBlocked(KCalCore::Alarm::Type type) const +bool BlockAlarmsAttribute::isAlarmTypeBlocked(KCalendarCore::Alarm::Type type) const { switch (type) { - case KCalCore::Alarm::Audio: + case KCalendarCore::Alarm::Audio: return d->audio; - case KCalCore::Alarm::Display: + case KCalendarCore::Alarm::Display: return d->display; - case KCalCore::Alarm::Email: + case KCalendarCore::Alarm::Email: return d->email; - case KCalCore::Alarm::Procedure: + case KCalendarCore::Alarm::Procedure: return d->procedure; default: return false; @@ -93,8 +93,8 @@ bool BlockAlarmsAttribute::isEverythingBlocked() const { - return isAlarmTypeBlocked(KCalCore::Alarm::Audio) && isAlarmTypeBlocked(KCalCore::Alarm::Display) - && isAlarmTypeBlocked(KCalCore::Alarm::Email) && isAlarmTypeBlocked(KCalCore::Alarm::Procedure); + return isAlarmTypeBlocked(KCalendarCore::Alarm::Audio) && isAlarmTypeBlocked(KCalendarCore::Alarm::Display) + && isAlarmTypeBlocked(KCalendarCore::Alarm::Email) && isAlarmTypeBlocked(KCalendarCore::Alarm::Procedure); } QByteArray BlockAlarmsAttribute::type() const diff -Nru akonadi-calendar-19.04.3/src/blockalarmsattribute.h akonadi-calendar-19.12.3/src/blockalarmsattribute.h --- akonadi-calendar-19.04.3/src/blockalarmsattribute.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/blockalarmsattribute.h 2020-02-21 17:12:44.000000000 +0000 @@ -22,7 +22,7 @@ #define AKONADI_BLOCKALARMSATTRIBUTE_H #include "akonadi-calendar_export.h" -#include +#include #include @@ -59,7 +59,7 @@ * * @since 4.11 */ - void blockAlarmType(KCalCore::Alarm::Type type, bool block = true); + void blockAlarmType(KCalendarCore::Alarm::Type type, bool block = true); /** * Blocks or unblocks every alarm type. @@ -75,7 +75,7 @@ * * @since 4.11 */ - bool isAlarmTypeBlocked(KCalCore::Alarm::Type type) const; + bool isAlarmTypeBlocked(KCalendarCore::Alarm::Type type) const; /** * Returns whether all alarms are blocked or not. diff -Nru akonadi-calendar-19.04.3/src/calendarbase.cpp akonadi-calendar-19.12.3/src/calendarbase.cpp --- akonadi-calendar-19.04.3/src/calendarbase.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/calendarbase.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -31,11 +31,11 @@ #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; static QString itemToString(const Akonadi::Item &item) { - const KCalCore::Incidence::Ptr &incidence = CalendarUtils::incidence(item); + const KCalendarCore::Incidence::Ptr &incidence = CalendarUtils::incidence(item); QString str; QTextStream stream(&str); stream << item.id() @@ -79,13 +79,13 @@ void CalendarBasePrivate::internalInsert(const Akonadi::Item &item) { Q_ASSERT(item.isValid()); - Q_ASSERT(item.hasPayload()); - KCalCore::Incidence::Ptr incidence = CalendarUtils::incidence(item); + Q_ASSERT(item.hasPayload()); + KCalendarCore::Incidence::Ptr incidence = CalendarUtils::incidence(item); if (!incidence) { qCritical() << "Incidence is null. id=" << item.id() << "; hasPayload()=" << item.hasPayload() - << "; has incidence=" << item.hasPayload() + << "; has incidence=" << item.hasPayload() << "; mime type=" << item.mimeType(); Q_ASSERT(false); return; @@ -115,7 +115,7 @@ return; } - if (incidence->type() == KCalCore::Incidence::TypeEvent && !incidence->dtStart().isValid()) { + if (incidence->type() == KCalendarCore::Incidence::TypeEvent && !incidence->dtStart().isValid()) { // TODO: make the parser discard them would also be a good idea qCWarning(AKONADICALENDAR_LOG) << "Discarding event with invalid DTSTART. identifier=" << incidence->instanceIdentifier() << "; summary=" << incidence->summary(); @@ -180,8 +180,9 @@ } bool isReadOnly = !(collection.rights() & Akonadi::Collection::CanChangeItem); - foreach (const Akonadi::Item &item, mItemsByCollection.values(collection.id())) { - KCalCore::Incidence::Ptr incidence = CalendarUtils::incidence(item); + const auto lst = mItemsByCollection.values(collection.id()); + for (const Akonadi::Item &item : lst) { + KCalendarCore::Incidence::Ptr incidence = CalendarUtils::incidence(item); incidence->setReadOnly(isReadOnly); } @@ -266,7 +267,7 @@ Q_UNUSED(item); if (resultCode == IncidenceChanger::ResultCodeSuccess && !mListensForNewItems) { Q_ASSERT(item.isValid()); - Q_ASSERT(item.hasPayload()); + Q_ASSERT(item.hasPayload()); internalInsert(item); } @@ -284,13 +285,13 @@ Q_UNUSED(item); QString message = errorMessage; if (resultCode == IncidenceChanger::ResultCodeSuccess) { - KCalCore::Incidence::Ptr incidence = CalendarUtils::incidence(item); + KCalendarCore::Incidence::Ptr incidence = CalendarUtils::incidence(item); Q_ASSERT(incidence); - KCalCore::Incidence::Ptr localIncidence = q->incidence(incidence->instanceIdentifier()); + KCalendarCore::Incidence::Ptr localIncidence = q->incidence(incidence->instanceIdentifier()); if (localIncidence) { //update our local one - *(static_cast(localIncidence.data())) = *(incidence.data()); + *(static_cast(localIncidence.data())) = *(incidence.data()); } else { // This shouldn't happen, unless the incidence gets deleted between event loops qCWarning(AKONADICALENDAR_LOG) << "CalendarBasePrivate::slotModifyFinished() Incidence was deleted already probably? id=" << item.id(); @@ -377,7 +378,7 @@ newIncidence->setUid(newUid); } -void CalendarBasePrivate::handleParentChanged(const KCalCore::Incidence::Ptr &newIncidence) +void CalendarBasePrivate::handleParentChanged(const KCalendarCore::Incidence::Ptr &newIncidence) { Q_ASSERT(newIncidence); @@ -457,8 +458,9 @@ if (it2 == d->mItemById.cend()) { qCritical() << "Item with id " << id << "(uid=" << uid << ") not found, but in uid map"; Q_ASSERT_X(false, "CalendarBase::item", "not in mItemById"); + } else { + i = *it2; } - i = *it2; } else { qCDebug(AKONADICALENDAR_LOG) << "Can't find any incidence with uid " << uid; } @@ -487,12 +489,12 @@ return result; } -Akonadi::Item::List CalendarBase::itemList(const KCalCore::Incidence::List &incidences) const +Akonadi::Item::List CalendarBase::itemList(const KCalendarCore::Incidence::List &incidences) const { Akonadi::Item::List items; items.reserve(incidences.size()); - for (const KCalCore::Incidence::Ptr &incidence : incidences) { + for (const KCalendarCore::Incidence::Ptr &incidence : incidences) { if (incidence) { items << item(incidence->instanceIdentifier()); } else { @@ -503,15 +505,15 @@ return items; } -KCalCore::Incidence::List CalendarBase::childIncidences(Akonadi::Item::Id parentId) const +KCalendarCore::Incidence::List CalendarBase::childIncidences(Akonadi::Item::Id parentId) const { Q_D(const CalendarBase); - KCalCore::Incidence::List childs; + KCalendarCore::Incidence::List childs; if (d->mItemById.contains(parentId)) { const Akonadi::Item item = d->mItemById.value(parentId); Q_ASSERT(item.isValid()); - KCalCore::Incidence::Ptr parent = CalendarUtils::incidence(item); + KCalendarCore::Incidence::Ptr parent = CalendarUtils::incidence(item); if (parent) { childs = childIncidences(parent->uid()); @@ -523,10 +525,10 @@ return childs; } -KCalCore::Incidence::List CalendarBase::childIncidences(const QString &parentUid) const +KCalendarCore::Incidence::List CalendarBase::childIncidences(const QString &parentUid) const { Q_D(const CalendarBase); - KCalCore::Incidence::List children; + KCalendarCore::Incidence::List children; const QStringList uids = d->mParentUidToChildrenUid.value(parentUid); for (const QString &uid : uids) { Incidence::Ptr child = incidence(uid); @@ -547,7 +549,7 @@ if (d->mItemById.contains(parentId)) { const Akonadi::Item item = d->mItemById.value(parentId); Q_ASSERT(item.isValid()); - KCalCore::Incidence::Ptr parent = CalendarUtils::incidence(item); + KCalendarCore::Incidence::Ptr parent = CalendarUtils::incidence(item); if (parent) { childs = childItems(parent->uid()); @@ -566,7 +568,7 @@ const QStringList uids = d->mParentUidToChildrenUid.value(parentUid); for (const QString &uid : uids) { Akonadi::Item child = item(uid); - if (child.isValid() && child.hasPayload()) { + if (child.isValid() && child.hasPayload()) { children.append(child); } else { qCWarning(AKONADICALENDAR_LOG) << "Invalid child with uid " << uid; @@ -575,37 +577,37 @@ return children; } -bool CalendarBase::addEvent(const KCalCore::Event::Ptr &event) +bool CalendarBase::addEvent(const KCalendarCore::Event::Ptr &event) { return addIncidence(event); } -bool CalendarBase::deleteEvent(const KCalCore::Event::Ptr &event) +bool CalendarBase::deleteEvent(const KCalendarCore::Event::Ptr &event) { return deleteIncidence(event); } -bool CalendarBase::addTodo(const KCalCore::Todo::Ptr &todo) +bool CalendarBase::addTodo(const KCalendarCore::Todo::Ptr &todo) { return addIncidence(todo); } -bool CalendarBase::deleteTodo(const KCalCore::Todo::Ptr &todo) +bool CalendarBase::deleteTodo(const KCalendarCore::Todo::Ptr &todo) { return deleteIncidence(todo); } -bool CalendarBase::addJournal(const KCalCore::Journal::Ptr &journal) +bool CalendarBase::addJournal(const KCalendarCore::Journal::Ptr &journal) { return addIncidence(journal); } -bool CalendarBase::deleteJournal(const KCalCore::Journal::Ptr &journal) +bool CalendarBase::deleteJournal(const KCalendarCore::Journal::Ptr &journal) { return deleteIncidence(journal); } -bool CalendarBase::addIncidence(const KCalCore::Incidence::Ptr &incidence) +bool CalendarBase::addIncidence(const KCalendarCore::Incidence::Ptr &incidence) { //TODO: Parent for dialogs Q_D(CalendarBase); @@ -645,7 +647,7 @@ return changeId != -1; } -bool CalendarBase::deleteIncidence(const KCalCore::Incidence::Ptr &incidence) +bool CalendarBase::deleteIncidence(const KCalendarCore::Incidence::Ptr &incidence) { Q_D(CalendarBase); Q_ASSERT(incidence); @@ -653,27 +655,15 @@ return -1 != d->mIncidenceChanger->deleteIncidence(item_); } -bool CalendarBase::modifyIncidence(const KCalCore::Incidence::Ptr &newIncidence) +bool CalendarBase::modifyIncidence(const KCalendarCore::Incidence::Ptr &newIncidence) { Q_D(CalendarBase); Q_ASSERT(newIncidence); Akonadi::Item item_ = item(newIncidence->instanceIdentifier()); - item_.setPayload(newIncidence); + item_.setPayload(newIncidence); return -1 != d->mIncidenceChanger->modifyIncidence(item_); } -void CalendarBase::setWeakPointer(const QWeakPointer &pointer) -{ - Q_D(CalendarBase); - d->mWeakPointer = pointer; -} - -QWeakPointer CalendarBase::weakPointer() const -{ - Q_D(const CalendarBase); - return d->mWeakPointer; -} - IncidenceChanger *CalendarBase::incidenceChanger() const { Q_D(const CalendarBase); @@ -682,7 +672,7 @@ void CalendarBase::startBatchAdding() { - KCalCore::MemoryCalendar::startBatchAdding(); + KCalendarCore::MemoryCalendar::startBatchAdding(); } void CalendarBase::endBatchAdding() @@ -690,7 +680,7 @@ Q_D(CalendarBase); d->mCollectionForBatchInsertion = Akonadi::Collection(); d->mBatchInsertionCancelled = false; - KCalCore::MemoryCalendar::endBatchAdding(); + KCalendarCore::MemoryCalendar::endBatchAdding(); } bool CalendarBase::isLoaded() const diff -Nru akonadi-calendar-19.04.3/src/calendarbase.h akonadi-calendar-19.12.3/src/calendarbase.h --- akonadi-calendar-19.04.3/src/calendarbase.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/calendarbase.h 2020-02-21 17:12:44.000000000 +0000 @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include namespace Akonadi { @@ -37,9 +37,9 @@ /** * @short The base class for all akonadi aware calendars. * -* Because it inherits KCalCore::Calendar, it provides seamless integration -* with KCalCore and KCalUtils libraries eliminating any need for adapter -* ( akonadi<->KCalCore ) classes. +* Because it inherits KCalendarCore::Calendar, it provides seamless integration +* with KCalendarCore and KCalUtils libraries eliminating any need for adapter +* ( akonadi<->KCalendarCore ) classes. * * @see ETMCalendar * @see FetchJobCalendar @@ -47,7 +47,7 @@ * @author Sérgio Martins * @since 4.11 */ -class AKONADI_CALENDAR_EXPORT CalendarBase : public KCalCore::MemoryCalendar +class AKONADI_CALENDAR_EXPORT CalendarBase : public KCalendarCore::MemoryCalendar { Q_OBJECT public: @@ -74,7 +74,7 @@ * Returns the Item containing the incidence with uid @p uid or an invalid Item * if the incidence isn't found. */ - Q_REQUIRED_RESULT Akonadi::Item item(const KCalCore::Incidence::Ptr &incidence) const; + Q_REQUIRED_RESULT Akonadi::Item item(const KCalendarCore::Incidence::Ptr &incidence) const; /** * Returns the Item with @p id or an invalid Item if not found. @@ -91,21 +91,21 @@ /** * Returns the item list that corresponds to the @p incidenceList. */ - Q_REQUIRED_RESULT Akonadi::Item::List itemList(const KCalCore::Incidence::List &incidenceList) const; + Q_REQUIRED_RESULT Akonadi::Item::List itemList(const KCalendarCore::Incidence::List &incidenceList) const; /** * Returns the child incidences of the parent identified by @p parentUid. * Only the direct childs are returned * @param parentUid identifier of the parent incidence */ //TODO: unit-test - Q_REQUIRED_RESULT KCalCore::Incidence::List childIncidences(const QString &parentUid) const; + Q_REQUIRED_RESULT KCalendarCore::Incidence::List childIncidences(const QString &parentUid) const; /** * Returns the child incidences of the parent identified by @p parentId. * Only the direct childs are returned * @param parentId identifier of the parent item */ - Q_REQUIRED_RESULT KCalCore::Incidence::List childIncidences(Item::Id parentId) const; + Q_REQUIRED_RESULT KCalendarCore::Incidence::List childIncidences(Item::Id parentId) const; /** * Returns the child items of the parent identified by @p parentUid. @@ -122,80 +122,60 @@ Q_REQUIRED_RESULT Akonadi::Item::List childItems(Item::Id parentId) const; /** - * Sets the weak pointer that's associated with this instance. - * Use this if later on you need to cast sender() into a QSharedPointer - * - * @code - * QWeakPointer weakPtr = qobject_cast( sender() )->weakPointer(); - * CalendarBase::Ptr calendar( weakPtr.toStrongRef() ); - * @endcode - * - * @see weakPointer() - */ - void setWeakPointer(const QWeakPointer &pointer); - - /** - * Returns the weak pointer set with setWeakPointer(). - * The default is an invalid weak pointer. - * @see setWeakPointer() - */ - Q_REQUIRED_RESULT QWeakPointer weakPointer() const; - - /** * Adds an Event to the calendar. * It's added to akonadi in the background @see createFinished(). * @param event the event to be added */ - bool addEvent(const KCalCore::Event::Ptr &event) override; + bool addEvent(const KCalendarCore::Event::Ptr &event) override; /** * Deletes an Event from the calendar. * It's removed from akonadi in the background @see deleteFinished(). * @param event the event to be deleted */ - bool deleteEvent(const KCalCore::Event::Ptr &event) override; + bool deleteEvent(const KCalendarCore::Event::Ptr &event) override; /** * Adds a Todo to the calendar. * It's added to akonadi in the background @see createFinished(). * @param todo the todo to add */ - bool addTodo(const KCalCore::Todo::Ptr &todo) override; + bool addTodo(const KCalendarCore::Todo::Ptr &todo) override; /** * Deletes a Todo from the calendar. * It's removed from akonadi in the background @see deleteFinished(). * @param todo the todo to delete */ - bool deleteTodo(const KCalCore::Todo::Ptr &todo) override; + bool deleteTodo(const KCalendarCore::Todo::Ptr &todo) override; /** * Adds a Journal to the calendar. * It's added to akonadi in the background @see createFinished(). * @param journal the journal to add */ - bool addJournal(const KCalCore::Journal::Ptr &journal) override; + bool addJournal(const KCalendarCore::Journal::Ptr &journal) override; /** * Deletes a Journal from the calendar. * It's removed from akonadi in the background @see deleteFinished(). * @param journal the journal to delete */ - bool deleteJournal(const KCalCore::Journal::Ptr &journal) override; + bool deleteJournal(const KCalendarCore::Journal::Ptr &journal) override; /** * Adds an incidence to the calendar. * It's added to akonadi in the background @see createFinished(). * @param incidence the incidence to add */ - bool addIncidence(const KCalCore::Incidence::Ptr &incidence) override; + bool addIncidence(const KCalendarCore::Incidence::Ptr &incidence) override; /** * Deletes an incidence from the calendar. * It's removed from akonadi in the background @see deleteFinished(). * @param incidence the incidence to delete */ - bool deleteIncidence(const KCalCore::Incidence::Ptr &incidence) override; + bool deleteIncidence(const KCalendarCore::Incidence::Ptr &incidence) override; /** Call this to tell the calendar that you're adding a batch of incidences. @@ -222,7 +202,7 @@ * The incidence with the same uid as @p newIncidence will be updated with the contents of * @param newIncidence the incidence to modify */ - bool modifyIncidence(const KCalCore::Incidence::Ptr &newIncidence); + bool modifyIncidence(const KCalendarCore::Incidence::Ptr &newIncidence); /** * Returns if the calendar already finished loading. diff -Nru akonadi-calendar-19.04.3/src/calendarbase_p.h akonadi-calendar-19.12.3/src/calendarbase_p.h --- akonadi-calendar-19.04.3/src/calendarbase_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/calendarbase_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -45,7 +45,7 @@ void handleUidChange(const Akonadi::Item &oldItem, const Akonadi::Item &newItem, const QString &newUid); // Checks if parent changed and adjust internal hierarchy info - void handleParentChanged(const KCalCore::Incidence::Ptr &incidence); + void handleParentChanged(const KCalendarCore::Incidence::Ptr &incidence); public Q_SLOTS: void slotDeleteFinished(int changeId, @@ -76,7 +76,6 @@ QHash mItemById; Akonadi::IncidenceChanger *mIncidenceChanger = nullptr; QHash mParentUidToChildrenUid; - QWeakPointer mWeakPointer; Akonadi::Collection mCollectionForBatchInsertion; bool mBatchInsertionCancelled = false; bool mListensForNewItems = false; // does this model detect new item creations ? diff -Nru akonadi-calendar-19.04.3/src/calendarclipboard.cpp akonadi-calendar-19.12.3/src/calendarclipboard.cpp --- akonadi-calendar-19.04.3/src/calendarclipboard.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/calendarclipboard.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -61,21 +61,21 @@ delete m_dndfactory; } -void CalendarClipboard::Private::getIncidenceHierarchy(const KCalCore::Incidence::Ptr &incidence, +void CalendarClipboard::Private::getIncidenceHierarchy(const KCalendarCore::Incidence::Ptr &incidence, QStringList &uids) { // protecion against looping hierarchies if (incidence && !uids.contains(incidence->uid())) { - const KCalCore::Incidence::List immediateChildren = m_calendar->childIncidences(incidence->uid()); + const KCalendarCore::Incidence::List immediateChildren = m_calendar->childIncidences(incidence->uid()); - for (const KCalCore::Incidence::Ptr &child : immediateChildren) { + for (const KCalendarCore::Incidence::Ptr &child : immediateChildren) { getIncidenceHierarchy(child, uids); } uids.append(incidence->uid()); } } -void CalendarClipboard::Private::cut(const KCalCore::Incidence::List &incidences) +void CalendarClipboard::Private::cut(const KCalendarCore::Incidence::List &incidences) { const bool result = m_dndfactory->copyIncidences(incidences); m_pendingChangeIds.clear(); @@ -94,33 +94,33 @@ } } -void CalendarClipboard::Private::cut(const KCalCore::Incidence::Ptr &incidence) +void CalendarClipboard::Private::cut(const KCalendarCore::Incidence::Ptr &incidence) { - KCalCore::Incidence::List incidences; + KCalendarCore::Incidence::List incidences; incidences << incidence; cut(incidences); } -void CalendarClipboard::Private::makeChildsIndependent(const KCalCore::Incidence::Ptr &incidence) +void CalendarClipboard::Private::makeChildsIndependent(const KCalendarCore::Incidence::Ptr &incidence) { Q_ASSERT(incidence); - const KCalCore::Incidence::List childs = m_calendar->childIncidences(incidence->uid()); + const KCalendarCore::Incidence::List childs = m_calendar->childIncidences(incidence->uid()); if (childs.isEmpty()) { cut(incidence); } else { m_pendingChangeIds.clear(); m_abortCurrentOperation = false; - for (const KCalCore::Incidence::Ptr &child : childs) { + for (const KCalendarCore::Incidence::Ptr &child : childs) { Akonadi::Item childItem = m_calendar->item(incidence); if (!childItem.isValid()) { emit q->cutFinished(/**success=*/ false, i18n("Can't find item: %1", childItem.id())); return; } - KCalCore::Incidence::Ptr newIncidence(child->clone()); + KCalendarCore::Incidence::Ptr newIncidence(child->clone()); newIncidence->setRelatedTo(QString()); - childItem.setPayload(newIncidence); + childItem.setPayload(newIncidence); const int changeId = m_changer->modifyIncidence(childItem, /*originalPayload*/child); if (changeId == -1) { m_abortCurrentOperation = true; @@ -155,7 +155,7 @@ if (isLastChange) { // All children are unparented, lets cut. Q_ASSERT(item.isValid() && item.hasPayload()); - cut(item.payload()); + cut(item.payload()); } } else { m_abortCurrentOperation = true; @@ -195,7 +195,7 @@ { } -void CalendarClipboard::cutIncidence(const KCalCore::Incidence::Ptr &incidence, +void CalendarClipboard::cutIncidence(const KCalendarCore::Incidence::Ptr &incidence, CalendarClipboard::Mode mode) { const bool hasChildren = !d->m_calendar->childIncidences(incidence->uid()).isEmpty(); @@ -225,9 +225,9 @@ QStringList uids; d->getIncidenceHierarchy(incidence, uids); Q_ASSERT(!uids.isEmpty()); - KCalCore::Incidence::List incidencesToCut; + KCalendarCore::Incidence::List incidencesToCut; for (const QString &uid : qAsConst(uids)) { - KCalCore::Incidence::Ptr child = d->m_calendar->incidence(uid); + KCalendarCore::Incidence::Ptr child = d->m_calendar->incidence(uid); if (child) { incidencesToCut << child; } @@ -236,7 +236,7 @@ } } -bool CalendarClipboard::copyIncidence(const KCalCore::Incidence::Ptr &incidence, +bool CalendarClipboard::copyIncidence(const KCalendarCore::Incidence::Ptr &incidence, CalendarClipboard::Mode mode) { const bool hasChildren = !d->m_calendar->childIncidences(incidence->uid()).isEmpty(); @@ -257,7 +257,7 @@ mode = SingleMode; // Doesn't have children, don't ask } - KCalCore::Incidence::List incidencesToCopy; + KCalendarCore::Incidence::List incidencesToCopy; if (mode == SingleMode) { incidencesToCopy << incidence; } else { @@ -265,7 +265,7 @@ d->getIncidenceHierarchy(incidence, uids); Q_ASSERT(!uids.isEmpty()); for (const QString &uid : qAsConst(uids)) { - KCalCore::Incidence::Ptr child = d->m_calendar->incidence(uid); + KCalendarCore::Incidence::Ptr child = d->m_calendar->incidence(uid); if (child) { incidencesToCopy << child; } diff -Nru akonadi-calendar-19.04.3/src/calendarclipboard.h akonadi-calendar-19.12.3/src/calendarclipboard.h --- akonadi-calendar-19.04.3/src/calendarclipboard.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/calendarclipboard.h 2020-02-21 17:12:44.000000000 +0000 @@ -23,7 +23,7 @@ #include "calendarbase.h" #include "akonadi-calendar_export.h" -#include +#include #include namespace Akonadi @@ -71,7 +71,7 @@ * @param mode how to treat child incidences. Defaults to #RecursiveMode * @see cutFinished(). */ - void cutIncidence(const KCalCore::Incidence::Ptr &incidence, + void cutIncidence(const KCalendarCore::Incidence::Ptr &incidence, CalendarClipboard::Mode mode = RecursiveMode); /** @@ -80,7 +80,7 @@ * @param mode how to treat child incidences. Defaults to #RecursiveMode * @return true on success */ - bool copyIncidence(const KCalCore::Incidence::Ptr &incidence, + bool copyIncidence(const KCalendarCore::Incidence::Ptr &incidence, CalendarClipboard::Mode mode = RecursiveMode); /** diff -Nru akonadi-calendar-19.04.3/src/calendarclipboard_p.h akonadi-calendar-19.12.3/src/calendarclipboard_p.h --- akonadi-calendar-19.04.3/src/calendarclipboard_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/calendarclipboard_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -23,7 +23,7 @@ #include "calendarclipboard.h" #include "incidencechanger.h" #include "calendarbase.h" -#include +#include #include #include @@ -51,18 +51,18 @@ * Returns all uids of incidenes having @p incidence has their parent (or grand parent, etc.) * @p incidence's uid is included in the list too. */ - void getIncidenceHierarchy(const KCalCore::Incidence::Ptr &incidence, QStringList &uids); + void getIncidenceHierarchy(const KCalendarCore::Incidence::Ptr &incidence, QStringList &uids); /** * Copies all these incidences to clipboard. Deletes them. * This function assumes the caller already unparented all childs ( made them independent ). */ - void cut(const KCalCore::Incidence::List &incidences); + void cut(const KCalendarCore::Incidence::List &incidences); /** * Overload. */ - void cut(const KCalCore::Incidence::Ptr &incidence); + void cut(const KCalendarCore::Incidence::Ptr &incidence); /** * All immediate childs of @p incidence are made independent. @@ -70,7 +70,7 @@ * * After it's done, signal makeChildsIndependentFinished() is emitted. */ - void makeChildsIndependent(const KCalCore::Incidence::Ptr &incidence); + void makeChildsIndependent(const KCalendarCore::Incidence::Ptr &incidence); public Q_SLOTS: void slotModifyFinished(int changeId, const Akonadi::Item &item, diff -Nru akonadi-calendar-19.04.3/src/calendarmodel.cpp akonadi-calendar-19.12.3/src/calendarmodel.cpp --- akonadi-calendar-19.04.3/src/calendarmodel.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/calendarmodel.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -23,21 +23,20 @@ #include "utils_p.h" #include #include -#include -#include -#include +#include +#include +#include #include -#include -#include +#include using namespace Akonadi; -static KCalCore::Todo::Ptr todo(const Akonadi::Item &item) +static KCalendarCore::Todo::Ptr todo(const Akonadi::Item &item) { - return item.hasPayload() ? item.payload() - : KCalCore::Todo::Ptr(); + return item.hasPayload() ? item.payload() + : KCalendarCore::Todo::Ptr(); } class Q_DECL_HIDDEN CalendarModel::Private @@ -82,7 +81,7 @@ QVariant CalendarModel::entityData(const Akonadi::Item &item, int column, int role) const { - const KCalCore::Incidence::Ptr inc = CalendarUtils::incidence(item); + const KCalendarCore::Incidence::Ptr inc = CalendarUtils::incidence(item); if (!inc) { return QVariant(); } @@ -92,14 +91,14 @@ if (column != Summary) { return QVariant(); } - if (inc->type() == KCalCore::IncidenceBase::TypeTodo) { - return SmallIcon(QStringLiteral("view-pim-tasks")); - } else if (inc->type() == KCalCore::IncidenceBase::TypeJournal) { - return SmallIcon(QStringLiteral("view-pim-journal")); - } else if (inc->type() == KCalCore::IncidenceBase::TypeEvent) { - return SmallIcon(QStringLiteral("view-calendar")); + if (inc->type() == KCalendarCore::IncidenceBase::TypeTodo) { + return QIcon::fromTheme(QStringLiteral("view-pim-tasks")); + } else if (inc->type() == KCalendarCore::IncidenceBase::TypeJournal) { + return QIcon::fromTheme(QStringLiteral("view-pim-journal")); + } else if (inc->type() == KCalendarCore::IncidenceBase::TypeEvent) { + return QIcon::fromTheme(QStringLiteral("view-calendar")); } - return SmallIcon(QStringLiteral("network-wired")); + return QIcon::fromTheme(QStringLiteral("network-wired")); case Qt::DisplayRole: switch (column) { @@ -110,24 +109,24 @@ return inc->dtStart().toString(); case DateTimeEnd: - return inc->dateTime(KCalCore::Incidence::RoleEndTimeZone).toString(); + return inc->dateTime(KCalendarCore::Incidence::RoleEndTimeZone).toString(); case DateTimeDue: - if (KCalCore::Todo::Ptr t = todo(item)) { + if (KCalendarCore::Todo::Ptr t = todo(item)) { return t->dtDue().toString(); } else { return QVariant(); } case Priority: - if (KCalCore::Todo::Ptr t = todo(item)) { + if (KCalendarCore::Todo::Ptr t = todo(item)) { return t->priority(); } else { return QVariant(); } case PercentComplete: - if (KCalCore::Todo::Ptr t = todo(item)) { + if (KCalendarCore::Todo::Ptr t = todo(item)) { return t->percentComplete(); } else { return QVariant(); @@ -149,24 +148,24 @@ return inc->dtStart().toUTC(); case DateTimeEnd: - return inc->dateTime(KCalCore::Incidence::RoleEndTimeZone).toUTC(); + return inc->dateTime(KCalendarCore::Incidence::RoleEndTimeZone).toUTC(); case DateTimeDue: - if (KCalCore::Todo::Ptr t = todo(item)) { + if (KCalendarCore::Todo::Ptr t = todo(item)) { return t->dtDue().toUTC(); } else { return QVariant(); } case Priority: - if (KCalCore::Todo::Ptr t = todo(item)) { + if (KCalendarCore::Todo::Ptr t = todo(item)) { return t->priority(); } else { return QVariant(); } case PercentComplete: - if (KCalCore::Todo::Ptr t = todo(item)) { + if (KCalendarCore::Todo::Ptr t = todo(item)) { return t->percentComplete(); } else { return QVariant(); diff -Nru akonadi-calendar-19.04.3/src/calfilterpartstatusproxymodel_p.cpp akonadi-calendar-19.12.3/src/calfilterpartstatusproxymodel_p.cpp --- akonadi-calendar-19.04.3/src/calfilterpartstatusproxymodel_p.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/calfilterpartstatusproxymodel_p.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include // #include #include @@ -42,7 +42,7 @@ { } - QList mBlockedStatusList; + QList mBlockedStatusList; KIdentityManagement::IdentityManager *mIdentityManager = nullptr; bool mFilterVirtual = false; }; @@ -65,12 +65,12 @@ delete d; } -const QList &CalFilterPartStatusProxyModel::blockedStatusList() const +const QList &CalFilterPartStatusProxyModel::blockedStatusList() const { return d->mBlockedStatusList; } -void CalFilterPartStatusProxyModel::setBlockedStatusList(const QList &blockStatusList) +void CalFilterPartStatusProxyModel::setBlockedStatusList(const QList &blockStatusList) { d->mBlockedStatusList = blockStatusList; } @@ -97,7 +97,7 @@ return false; } - const KCalCore::Incidence::Ptr incidence = CalendarUtils::incidence(item); + const KCalendarCore::Incidence::Ptr incidence = CalendarUtils::incidence(item); if (!incidence) { return false; } @@ -109,13 +109,14 @@ } // always show if we are the organizer - if (CalendarUtils::thatIsMe(incidence->organizer()->email())) { + if (CalendarUtils::thatIsMe(incidence->organizer().email())) { return true; } - foreach (const KCalCore::Attendee::Ptr &attendee, incidence->attendees()) { + const auto attendees = incidence->attendees(); + for (const KCalendarCore::Attendee &attendee : attendees) { if (CalendarUtils::thatIsMe(attendee)) { - return !d->mBlockedStatusList.contains(attendee->status()); + return !d->mBlockedStatusList.contains(attendee.status()); } } diff -Nru akonadi-calendar-19.04.3/src/calfilterpartstatusproxymodel_p.h akonadi-calendar-19.12.3/src/calfilterpartstatusproxymodel_p.h --- akonadi-calendar-19.04.3/src/calfilterpartstatusproxymodel_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/calfilterpartstatusproxymodel_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -20,7 +20,7 @@ #ifndef AKONADI_CALFILTERPARTSTATUSPROXYMODEL_P_H #define AKONADI_CALFILTERPARTSTATUSPROXYMODEL_P_H -#include +#include #include namespace Akonadi @@ -36,8 +36,8 @@ void setFilterVirtual(bool filterVirtual); Q_REQUIRED_RESULT bool filterVirtual() const; - void setBlockedStatusList(const QList &blockStatusList); - const QList &blockedStatusList() const; + void setBlockedStatusList(const QList &blockStatusList); + const QList &blockedStatusList() const; protected: bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; diff -Nru akonadi-calendar-19.04.3/src/calfilterproxymodel_p.cpp akonadi-calendar-19.12.3/src/calfilterproxymodel_p.cpp --- akonadi-calendar-19.04.3/src/calfilterproxymodel_p.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/calfilterproxymodel_p.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include using namespace Akonadi; @@ -35,7 +35,7 @@ explicit Private() { } - KCalCore::CalFilter *filter = nullptr; + KCalendarCore::CalFilter *filter = nullptr; }; CalFilterProxyModel::CalFilterProxyModel(QObject *parent) @@ -49,12 +49,12 @@ delete d; } -KCalCore::CalFilter *CalFilterProxyModel::filter() const +KCalendarCore::CalFilter *CalFilterProxyModel::filter() const { return d->filter; } -void CalFilterProxyModel::setFilter(KCalCore::CalFilter *filter) +void CalFilterProxyModel::setFilter(KCalendarCore::CalFilter *filter) { if (filter == d->filter) { return; @@ -80,7 +80,7 @@ return false; } - const KCalCore::Incidence::Ptr incidence = CalendarUtils::incidence(item); + const KCalendarCore::Incidence::Ptr incidence = CalendarUtils::incidence(item); if (!incidence) { return false; } diff -Nru akonadi-calendar-19.04.3/src/calfilterproxymodel_p.h akonadi-calendar-19.12.3/src/calfilterproxymodel_p.h --- akonadi-calendar-19.04.3/src/calfilterproxymodel_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/calfilterproxymodel_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -23,7 +23,7 @@ #include -namespace KCalCore +namespace KCalendarCore { class CalFilter; } @@ -38,8 +38,8 @@ explicit CalFilterProxyModel(QObject *parent = nullptr); ~CalFilterProxyModel(); - KCalCore::CalFilter *filter() const; - void setFilter(KCalCore::CalFilter *filter); + KCalendarCore::CalFilter *filter() const; + void setFilter(KCalendarCore::CalFilter *filter); protected: bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; diff -Nru akonadi-calendar-19.04.3/src/CMakeLists.txt akonadi-calendar-19.12.3/src/CMakeLists.txt --- akonadi-calendar-19.04.3/src/CMakeLists.txt 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/CMakeLists.txt 2020-02-21 17:12:44.000000000 +0000 @@ -56,7 +56,6 @@ KF5::I18n PRIVATE KF5::Codecs - KF5::IconThemes KF5::KIOWidgets KF5::XmlGui KF5::AkonadiContact diff -Nru akonadi-calendar-19.04.3/src/etmcalendar.cpp akonadi-calendar-19.12.3/src/etmcalendar.cpp --- akonadi-calendar-19.04.3/src/etmcalendar.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/etmcalendar.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -41,7 +41,7 @@ #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; //TODO: implement batchAdding @@ -79,7 +79,7 @@ monitor->setItemFetchScope(scope); monitor->setAllMonitored(true); - const QStringList allMimeTypes = { KCalCore::Event::eventMimeType(), KCalCore::Todo::todoMimeType(), KCalCore::Journal::journalMimeType() }; + const QStringList allMimeTypes = { KCalendarCore::Event::eventMimeType(), KCalendarCore::Todo::todoMimeType(), KCalendarCore::Journal::journalMimeType() }; for (const QString &mimetype : allMimeTypes) { monitor->setMimeTypeMonitored(mimetype, mMimeTypes.isEmpty() || mMimeTypes.contains(mimetype)); @@ -128,7 +128,7 @@ const Akonadi::Item::List items = q->items(); for (const Akonadi::Item &item : items) { if (item.storageCollectionId() == collection.id()) { - KCalCore::Incidence::Ptr incidence = CalendarUtils::incidence(item); + KCalendarCore::Incidence::Ptr incidence = CalendarUtils::incidence(item); if (incidence) { incidence->setReadOnly(!(collection.rights() & Akonadi::Collection::CanChangeItem)); } @@ -173,13 +173,13 @@ mCalFilterProxyModel = new CalFilterProxyModel(this); mCalFilterProxyModel->setFilter(q->filter()); mCalFilterProxyModel->setSourceModel(mSelectionProxy); - mCalFilterProxyModel->setObjectName(QStringLiteral("KCalCore::CalFilter filtering")); + mCalFilterProxyModel->setObjectName(QStringLiteral("KCalendarCore::CalFilter filtering")); mCalFilterPartStatusProxyModel = new CalFilterPartStatusProxyModel(this); mCalFilterPartStatusProxyModel->setFilterVirtual(false); - QList blockedStatusList; - blockedStatusList << KCalCore::Attendee::NeedsAction; - blockedStatusList << KCalCore::Attendee::Declined; + QList blockedStatusList; + blockedStatusList << KCalendarCore::Attendee::NeedsAction; + blockedStatusList << KCalendarCore::Attendee::Declined; mCalFilterPartStatusProxyModel->setDynamicSortFilter(true); mCalFilterPartStatusProxyModel->setBlockedStatusList(blockedStatusList); mCalFilterPartStatusProxyModel->setSourceModel(mCalFilterProxyModel); @@ -242,7 +242,7 @@ QModelIndex i = model->index(row, 0, parentIndex); while (row <= endRow) { const Akonadi::Item item = itemFromIndex(i); - if (item.hasPayload()) { + if (item.hasPayload()) { items << item; } else { const QModelIndex childIndex = model->index(0, 0, i); @@ -399,7 +399,7 @@ int row = i.row(); while (row <= endRow) { const Akonadi::Item item = itemFromIndex(i); - if (item.isValid() && item.hasPayload()) { + if (item.isValid() && item.hasPayload()) { updateItem(item); } @@ -429,7 +429,7 @@ if (existingIncidence) { // We set the payload so that the internal incidence pointer and the one in mItemById stay the same Akonadi::Item updatedItem = item; - updatedItem.setPayload(existingIncidence.staticCast()); + updatedItem.setPayload(existingIncidence.staticCast()); mItemById.insert(item.id(), updatedItem); // The item needs updating too, revision changed. // Check if RELATED-TO changed, updating parenting information @@ -539,12 +539,12 @@ return d->mCheckableProxyModel; } -KCalCore::Alarm::List ETMCalendar::alarms(const QDateTime &from, +KCalendarCore::Alarm::List ETMCalendar::alarms(const QDateTime &from, const QDateTime &to, bool excludeBlockedAlarms) const { Q_D(const ETMCalendar); - KCalCore::Alarm::List alarmList; + KCalendarCore::Alarm::List alarmList; QHashIterator i(d->mItemById); while (i.hasNext()) { const Akonadi::Item item = i.next().value(); @@ -563,9 +563,9 @@ } } - KCalCore::Incidence::Ptr incidence; - if (item.isValid() && item.hasPayload()) { - incidence = KCalCore::Incidence::Ptr(item.payload()->clone()); + KCalendarCore::Incidence::Ptr incidence; + if (item.isValid() && item.hasPayload()) { + incidence = KCalendarCore::Incidence::Ptr(item.payload()->clone()); } else { continue; } @@ -576,7 +576,8 @@ if (blockedAttr) { // Remove all blocked types of alarms - Q_FOREACH (const KCalCore::Alarm::Ptr &alarm, incidence->alarms()) { + const auto alarmsLst = incidence->alarms(); + for (const KCalendarCore::Alarm::Ptr &alarm : alarmsLst) { if (blockedAttr->isAlarmTypeBlocked(alarm->type())) { incidence->removeAlarm(alarm); } diff -Nru akonadi-calendar-19.04.3/src/etmcalendar.h akonadi-calendar-19.12.3/src/etmcalendar.h --- akonadi-calendar-19.04.3/src/etmcalendar.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/etmcalendar.h 2020-02-21 17:12:44.000000000 +0000 @@ -36,14 +36,14 @@ class EntityTreeModel; /** - * @short A KCalCore::Calendar that uses an EntityTreeModel to populate itself. + * @short A KCalendarCore::Calendar that uses an EntityTreeModel to populate itself. * - * All non-idempotent KCalCore::Calendar methods interact with Akonadi. + * All non-idempotent KCalendarCore::Calendar methods interact with Akonadi. * If you need a need a non-persistent calendar use FetchJobCalendar. * * ETMCalendar allows to be populated with only a subset of your calendar items, * by using a KCheckableProxyModel to specify which collections to be used - * and/or by setting a KCalCore::CalFilter. + * and/or by setting a KCalendarCore::CalFilter. * * @see FetchJobCalendar * @see CalendarBase @@ -123,7 +123,7 @@ KCheckableProxyModel *checkableProxyModel() const; /** - * Convenience method to access the contents of this KCalCore::Calendar through + * Convenience method to access the contents of this KCalendarCore::Calendar through * a QAIM interface. * * Like through calendar interface, the model only items of selected collections. @@ -137,10 +137,10 @@ /** * Returns the underlying EntityTreeModel. * - * For most uses, you'll want model() or the KCalCore::Calendar interface instead. + * For most uses, you'll want model() or the KCalendarCore::Calendar interface instead. * * It contains every item and collection with calendar mime type, doesn't have - * KCalCore filtering and doesn't honour any collection selection. + * KCalendarCore filtering and doesn't honour any collection selection. * * This method is exposed for performance reasons only, so you can reuse it, * since it's resource savy. @@ -155,7 +155,7 @@ * @param to end data of interval * @param excludeBlockedAlarms if true, alarms belonging to blocked collections aren't returned. */ - KCalCore::Alarm::List alarms(const QDateTime &from, + KCalendarCore::Alarm::List alarms(const QDateTime &from, const QDateTime &to, bool excludeBlockedAlarms = false) const override; diff -Nru akonadi-calendar-19.04.3/src/etmcalendar_p.h akonadi-calendar-19.12.3/src/etmcalendar_p.h --- akonadi-calendar-19.04.3/src/etmcalendar_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/etmcalendar_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -47,9 +47,9 @@ static bool isStructuralCollection(const Akonadi::Collection &collection) { const QStringList mimeTypes = QStringList() << QStringLiteral("text/calendar") - << KCalCore::Event::eventMimeType() - << KCalCore::Todo::todoMimeType() - << KCalCore::Journal::journalMimeType(); + << KCalendarCore::Event::eventMimeType() + << KCalendarCore::Todo::todoMimeType() + << KCalendarCore::Journal::journalMimeType(); const QStringList collectionMimeTypes = collection.contentMimeTypes(); for (const QString &mimeType : mimeTypes) { if (collectionMimeTypes.contains(mimeType)) { @@ -105,7 +105,7 @@ int start = 0, int end = -1); - // KCalCore::CalFilter has changed. + // KCalendarCore::CalFilter has changed. void onFilterChanged(); void clear(); @@ -137,7 +137,7 @@ QHash mCollectionMap; CheckableProxyModel *mCheckableProxyModel = nullptr; Akonadi::CollectionFilterProxyModel *mCollectionProxyModel = nullptr; - Akonadi::CalFilterProxyModel *mCalFilterProxyModel = nullptr; //KCalCore::CalFilter stuff + Akonadi::CalFilterProxyModel *mCalFilterProxyModel = nullptr; //KCalendarCore::CalFilter stuff //filter out all invitations and declined events Akonadi::CalFilterPartStatusProxyModel *mCalFilterPartStatusProxyModel = nullptr; KSelectionProxyModel *mSelectionProxy = nullptr; diff -Nru akonadi-calendar-19.04.3/src/fetchjobcalendar.cpp akonadi-calendar-19.12.3/src/fetchjobcalendar.cpp --- akonadi-calendar-19.04.3/src/fetchjobcalendar.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/fetchjobcalendar.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -26,7 +26,7 @@ #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; FetchJobCalendarPrivate::FetchJobCalendarPrivate(FetchJobCalendar *qq) : CalendarBasePrivate(qq) @@ -56,7 +56,7 @@ } else { const Akonadi::Item::List lstItem = searchJob->items(); for (const Akonadi::Item &item : lstItem) { - if (!item.isValid() || !item.hasPayload()) { + if (!item.isValid() || !item.hasPayload()) { m_success = false; m_errorMessage = QStringLiteral("Invalid item or payload: %1").arg(item.id()); qCWarning(AKONADICALENDAR_LOG) << "Unable to fetch incidences:" << m_errorMessage; diff -Nru akonadi-calendar-19.04.3/src/fetchjobcalendar.h akonadi-calendar-19.12.3/src/fetchjobcalendar.h --- akonadi-calendar-19.04.3/src/fetchjobcalendar.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/fetchjobcalendar.h 2020-02-21 17:12:44.000000000 +0000 @@ -30,7 +30,7 @@ { class FetchJobCalendarPrivate; /** -* @short A KCalCore::Calendar that uses a one time IncidenceFetchJob to populate itself. +* @short A KCalendarCore::Calendar that uses a one time IncidenceFetchJob to populate itself. * * If you want a persistent calendar ( which monitors Akonadi for changes ) * use an ETMCalendar. diff -Nru akonadi-calendar-19.04.3/src/freebusymanager.cpp akonadi-calendar-19.12.3/src/freebusymanager.cpp --- akonadi-calendar-19.04.3/src/freebusymanager.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/freebusymanager.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -30,9 +30,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "akonadicalendar_debug.h" #include @@ -53,7 +53,7 @@ #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; /// Free helper functions @@ -151,7 +151,7 @@ // Set the start of the period to today 00:00:00 mStartTime = QDateTime(QDate::currentDate(), QTime()); mEndTime = mStartTime.addDays(14); - mResultingFreeBusy = KCalCore::FreeBusy::Ptr(new KCalCore::FreeBusy(mStartTime, mEndTime)); + mResultingFreeBusy = KCalendarCore::FreeBusy::Ptr(new KCalendarCore::FreeBusy(mStartTime, mEndTime)); } FreeBusyManagerPrivate::FreeBusyProvidersRequestsQueue::FreeBusyProvidersRequestsQueue( @@ -160,7 +160,7 @@ { mStartTime = start; mEndTime = end; - mResultingFreeBusy = KCalCore::FreeBusy::Ptr(new KCalCore::FreeBusy(start, end)); + mResultingFreeBusy = KCalendarCore::FreeBusy::Ptr(new KCalendarCore::FreeBusy(start, end)); } /// FreeBusyManagerPrivate @@ -351,15 +351,15 @@ } } -QString FreeBusyManagerPrivate::freeBusyToIcal(const KCalCore::FreeBusy::Ptr &freebusy) +QString FreeBusyManagerPrivate::freeBusyToIcal(const KCalendarCore::FreeBusy::Ptr &freebusy) { - return mFormat.createScheduleMessage(freebusy, KCalCore::iTIPPublish); + return mFormat.createScheduleMessage(freebusy, KCalendarCore::iTIPPublish); } -KCalCore::FreeBusy::Ptr FreeBusyManagerPrivate::iCalToFreeBusy(const QByteArray &freeBusyData) +KCalendarCore::FreeBusy::Ptr FreeBusyManagerPrivate::iCalToFreeBusy(const QByteArray &freeBusyData) { const QString freeBusyVCal(QString::fromUtf8(freeBusyData)); - KCalCore::FreeBusy::Ptr fb = mFormat.parseFreeBusy(freeBusyVCal); + KCalendarCore::FreeBusy::Ptr fb = mFormat.parseFreeBusy(freeBusyVCal); if (!fb) { qCDebug(AKONADICALENDAR_LOG) << "Error parsing free/busy"; @@ -369,16 +369,14 @@ return fb; } -KCalCore::FreeBusy::Ptr FreeBusyManagerPrivate::ownerFreeBusy() +KCalendarCore::FreeBusy::Ptr FreeBusyManagerPrivate::ownerFreeBusy() { QDateTime start = QDateTime::currentDateTimeUtc(); QDateTime end = start.addDays(CalendarSettings::self()->freeBusyPublishDays()); - KCalCore::Event::List events = mCalendar ? mCalendar->rawEvents(start.date(), end.date()) : KCalCore::Event::List(); - KCalCore::FreeBusy::Ptr freebusy(new KCalCore::FreeBusy(events, start, end)); - freebusy->setOrganizer(KCalCore::Person::Ptr( - new KCalCore::Person(Akonadi::CalendarUtils::fullName(), - Akonadi::CalendarUtils::email()))); + KCalendarCore::Event::List events = mCalendar ? mCalendar->rawEvents(start.date(), end.date()) : KCalendarCore::Event::List(); + KCalendarCore::FreeBusy::Ptr freebusy(new KCalendarCore::FreeBusy(events, start, end)); + freebusy->setOrganizer(KCalendarCore::Person(Akonadi::CalendarUtils::fullName(), Akonadi::CalendarUtils::email())); return freebusy; } @@ -406,14 +404,15 @@ // Make sure we don't fill up the map with unneeded data on failures. mFreeBusyUrlEmailMap.take(job->url()); } else { - KCalCore::FreeBusy::Ptr fb = iCalToFreeBusy(job->rawFreeBusyData()); + KCalendarCore::FreeBusy::Ptr fb = iCalToFreeBusy(job->rawFreeBusyData()); Q_ASSERT(mFreeBusyUrlEmailMap.contains(job->url())); const QString email = mFreeBusyUrlEmailMap.take(job->url()); if (fb) { - KCalCore::Person::Ptr p = fb->organizer(); - p->setEmail(email); + KCalendarCore::Person p = fb->organizer(); + p.setEmail(email); + fb->setOrganizer(p); q->saveFreeBusy(fb, p); qCDebug(AKONADICALENDAR_LOG) << "Freebusy retrieved for " << email; emit q->freeBusyRetrieved(fb, email); @@ -695,7 +694,7 @@ queue->mRequests.removeAt(requestIndex); if (success) { - KCalCore::FreeBusy::Ptr fb = iCalToFreeBusy(freeBusy.toUtf8()); + KCalendarCore::FreeBusy::Ptr fb = iCalToFreeBusy(freeBusy.toUtf8()); if (!fb) { --queue->mHandlersCount; } else { @@ -828,7 +827,7 @@ // We need to massage the list a bit so that Outlook understands // it. - messageText = messageText.replace(QRegExp(QStringLiteral("ORGANIZER\\s*:MAILTO:")), + messageText.replace(QRegExp(QStringLiteral("ORGANIZER\\s*:MAILTO:")), QStringLiteral("ORGANIZER:")); // Create a local temp file and save the message to it @@ -862,7 +861,7 @@ QString fbname = CalendarSettings::self()->publishUserName(); int at = fbname.indexOf('@'); if (at > 1 && fbname.length() > (uint)at) { - fbname = fbname.left(at); + fbname.truncate(at); } targetURL.setPath("/freebusy/" + fbname + ".ifb"); targetURL.setUserName(CalendarSettings::self()->publishUserName()); @@ -900,12 +899,10 @@ QDateTime start = QDateTime::currentDateTimeUtc().toTimeZone(d->mCalendar->timeZone()); QDateTime end = start.addDays(daysToPublish); - KCalCore::Event::List events = d->mCalendar->rawEvents(start.date(), end.date()); + KCalendarCore::Event::List events = d->mCalendar->rawEvents(start.date(), end.date()); FreeBusy::Ptr freebusy(new FreeBusy(events, start, end)); - freebusy->setOrganizer(Person::Ptr( - new Person(Akonadi::CalendarUtils::fullName(), - Akonadi::CalendarUtils::email()))); + freebusy->setOrganizer(Person(Akonadi::CalendarUtils::fullName(), Akonadi::CalendarUtils::email())); QPointer publishdlg = new PublishDialog(); if (publishdlg->exec() == QDialog::Accepted) { @@ -941,7 +938,7 @@ } // Check for cached copy of free/busy list - KCalCore::FreeBusy::Ptr fb = loadFreeBusy(email); + KCalendarCore::FreeBusy::Ptr fb = loadFreeBusy(email); if (fb) { qCDebug(AKONADICALENDAR_LOG) << "Found a cached copy for " << email; emit freeBusyRetrieved(fb, email); @@ -964,7 +961,7 @@ // queued, because "true" means the download was initiated. So lets // return before starting stuff - QMetaObject::invokeMethod(d, [this, d] { d->processRetrieveQueue(); }, Qt::QueuedConnection); + QMetaObject::invokeMethod(d, [ d] { d->processRetrieveQueue(); }, Qt::QueuedConnection); return true; } @@ -974,7 +971,7 @@ d->mRetrieveQueue.clear(); } -KCalCore::FreeBusy::Ptr FreeBusyManager::loadFreeBusy(const QString &email) +KCalendarCore::FreeBusy::Ptr FreeBusyManager::loadFreeBusy(const QString &email) { Q_D(FreeBusyManager); const QString fbd = d->freeBusyDir(); @@ -982,12 +979,12 @@ QFile f(fbd + QLatin1Char('/') + email + QStringLiteral(".ifb")); if (!f.exists()) { qCDebug(AKONADICALENDAR_LOG) << f.fileName() << "doesn't exist."; - return KCalCore::FreeBusy::Ptr(); + return KCalendarCore::FreeBusy::Ptr(); } if (!f.open(QIODevice::ReadOnly)) { qCDebug(AKONADICALENDAR_LOG) << "Unable to open file" << f.fileName(); - return KCalCore::FreeBusy::Ptr(); + return KCalendarCore::FreeBusy::Ptr(); } QTextStream ts(&f); @@ -996,12 +993,11 @@ return d->iCalToFreeBusy(str.toUtf8()); } -bool FreeBusyManager::saveFreeBusy(const KCalCore::FreeBusy::Ptr &freebusy, - const KCalCore::Person::Ptr &person) +bool FreeBusyManager::saveFreeBusy(const KCalendarCore::FreeBusy::Ptr &freebusy, + const KCalendarCore::Person &person) { Q_D(FreeBusyManager); - Q_ASSERT(person); - qCDebug(AKONADICALENDAR_LOG) << person->fullName(); + qCDebug(AKONADICALENDAR_LOG) << person.fullName(); QString fbd = d->freeBusyDir(); @@ -1018,7 +1014,7 @@ QString filename(fbd); filename += QLatin1Char('/'); - filename += person->email(); + filename += person.email(); filename += QStringLiteral(".ifb"); QFile f(filename); @@ -1027,7 +1023,7 @@ freebusy->clearAttendees(); freebusy->setOrganizer(person); - QString messageText = d->mFormat.createScheduleMessage(freebusy, KCalCore::iTIPPublish); + QString messageText = d->mFormat.createScheduleMessage(freebusy, KCalendarCore::iTIPPublish); if (!f.open(QIODevice::ReadWrite)) { qCDebug(AKONADICALENDAR_LOG) << "acceptFreeBusy: Can't open:" << filename << "for writing"; diff -Nru akonadi-calendar-19.04.3/src/freebusymanager.h akonadi-calendar-19.12.3/src/freebusymanager.h --- akonadi-calendar-19.04.3/src/freebusymanager.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/freebusymanager.h 2020-02-21 17:12:44.000000000 +0000 @@ -26,14 +26,14 @@ #include "akonadi-calendar_export.h" #include "etmcalendar.h" -#include +#include //TODO: document namespace Akonadi { class FreeBusyManagerPrivate; class FreeBusyManagerStatic; -class AKONADI_CALENDAR_EXPORT FreeBusyManager : public QObject, public KCalCore::FreeBusyCache +class AKONADI_CALENDAR_EXPORT FreeBusyManager : public QObject, public KCalendarCore::FreeBusyCache { Q_OBJECT public: @@ -110,29 +110,29 @@ information 0 is returned. In that case the information should be retrieved again by calling retrieveFreeBusy. - Implements KCalCore::FreeBusyCache::loadFreeBusy + Implements KCalendarCore::FreeBusyCache::loadFreeBusy @param email is a QString containing a email string in the "FirstName LastName " format. */ - Q_REQUIRED_RESULT KCalCore::FreeBusy::Ptr loadFreeBusy(const QString &email) override; + Q_REQUIRED_RESULT KCalendarCore::FreeBusy::Ptr loadFreeBusy(const QString &email) override; /** Save freebusy information belonging to an email. - Implements KCalCore::FreeBusyCache::saveFreeBusy + Implements KCalendarCore::FreeBusyCache::saveFreeBusy @param freebusy is a pointer to a valid FreeBusy instance. @param person is a valid Person instance. */ - bool saveFreeBusy(const KCalCore::FreeBusy::Ptr &freebusy, - const KCalCore::Person::Ptr &person) override; + bool saveFreeBusy(const KCalendarCore::FreeBusy::Ptr &freebusy, + const KCalendarCore::Person &person) override; Q_SIGNALS: /** This signal is emitted to return results of free/busy requests. */ - void freeBusyRetrieved(const KCalCore::FreeBusy::Ptr &fb, + void freeBusyRetrieved(const KCalendarCore::FreeBusy::Ptr &fb, const QString &email); protected: diff -Nru akonadi-calendar-19.04.3/src/freebusymanager_p.h akonadi-calendar-19.12.3/src/freebusymanager_p.h --- akonadi-calendar-19.04.3/src/freebusymanager_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/freebusymanager_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -24,8 +24,8 @@ #include "etmcalendar.h" #include "mailscheduler_p.h" -#include -#include +#include +#include #include #include @@ -72,12 +72,12 @@ QDateTime mEndTime; QList mRequests; int mHandlersCount; - KCalCore::FreeBusy::Ptr mResultingFreeBusy; + KCalendarCore::FreeBusy::Ptr mResultingFreeBusy; }; public: Akonadi::ETMCalendar::Ptr mCalendar; - KCalCore::ICalFormat mFormat; + KCalendarCore::ICalFormat mFormat; QStringList mRetrieveQueue; QMap mFreeBusyUrlEmailMap; @@ -99,9 +99,9 @@ void checkFreeBusyUrl(); QString freeBusyDir() const; void fetchFreeBusyUrl(const QString &email); - QString freeBusyToIcal(const KCalCore::FreeBusy::Ptr &freebusy); - KCalCore::FreeBusy::Ptr iCalToFreeBusy(const QByteArray &freeBusyData); - KCalCore::FreeBusy::Ptr ownerFreeBusy(); + QString freeBusyToIcal(const KCalendarCore::FreeBusy::Ptr &freebusy); + KCalendarCore::FreeBusy::Ptr iCalToFreeBusy(const QByteArray &freeBusyData); + KCalendarCore::FreeBusy::Ptr ownerFreeBusy(); QString ownerFreeBusyAsString(); void processFreeBusyDownloadResult(KJob *_job); void processFreeBusyUploadResult(KJob *_job); diff -Nru akonadi-calendar-19.04.3/src/freebusyproviderbase.h akonadi-calendar-19.12.3/src/freebusyproviderbase.h --- akonadi-calendar-19.04.3/src/freebusyproviderbase.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/freebusyproviderbase.h 2020-02-21 17:12:44.000000000 +0000 @@ -132,8 +132,8 @@ * * The @p freeBusy is expected to be an iTIP request containing * the free-busy data. The simplest way to generate this is - * to use KCalCore::ICalFormat::createScheduleMessage() - * with the method KCalCore::iTIPRequest. + * to use KCalendarCore::ICalFormat::createScheduleMessage() + * with the method KCalendarCore::iTIPRequest. * * @param email The email address of the contact we give the * response for. This is a simple email diff -Nru akonadi-calendar-19.04.3/src/history.cpp akonadi-calendar-19.12.3/src/history.cpp --- akonadi-calendar-19.04.3/src/history.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/history.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -22,7 +22,7 @@ #include "akonadicalendar_debug.h" #include -using namespace KCalCore; +using namespace KCalendarCore; using namespace Akonadi; History::History(QObject *parent) @@ -53,7 +53,7 @@ Q_ASSERT_X(item.isValid(), "History::recordCreation()", "Item must be valid."); - Q_ASSERT_X(item.hasPayload(), "History::recordCreation()", + Q_ASSERT_X(item.hasPayload(), "History::recordCreation()", "Item must have Incidence::Ptr payload."); Entry::Ptr entry(new CreationEntry(item, description, this)); @@ -68,12 +68,12 @@ { Q_ASSERT_X(oldItem.isValid(), "History::recordModification", "old item must be valid"); Q_ASSERT_X(newItem.isValid(), "History::recordModification", "newItem item must be valid"); - Q_ASSERT_X(oldItem.hasPayload(), "History::recordModification", + Q_ASSERT_X(oldItem.hasPayload(), "History::recordModification", "old item must have Incidence::Ptr payload"); - Q_ASSERT_X(newItem.hasPayload(), "History::recordModification", + Q_ASSERT_X(newItem.hasPayload(), "History::recordModification", "newItem item must have Incidence::Ptr payload"); - Entry::Ptr entry(new ModificationEntry(newItem, oldItem.payload(), + Entry::Ptr entry(new ModificationEntry(newItem, oldItem.payload(), description, this)); Q_ASSERT(newItem.revision() >= oldItem.revision()); diff -Nru akonadi-calendar-19.04.3/src/history.h akonadi-calendar-19.12.3/src/history.h --- akonadi-calendar-19.04.3/src/history.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/history.h 2020-02-21 17:12:44.000000000 +0000 @@ -23,7 +23,7 @@ #include "akonadi-calendar_export.h" #include "incidencechanger.h" -#include +#include #include #include diff -Nru akonadi-calendar-19.04.3/src/history_p.cpp akonadi-calendar-19.12.3/src/history_p.cpp --- akonadi-calendar-19.04.3/src/history_p.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/history_p.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -94,7 +94,7 @@ { mLatestRevisionByItemId.insert(item.id(), item.revision()); Q_ASSERT(mItems.count() == 1); - const Incidence::Ptr incidence = mItems.first().payload(); + const Incidence::Ptr incidence = mItems.first().payload(); if (mDescription.isEmpty()) { mDescription = i18nc("%1 is event, todo or journal", "%1 creation", KCalUtils::Stringify::incidenceType(incidence->type())); @@ -118,8 +118,8 @@ bool CreationEntry::redo() { Akonadi::Item item = mItems.first(); - Q_ASSERT(item.hasPayload()); - const int changeId = mChanger->createIncidence(item.payload(), + Q_ASSERT(item.hasPayload()); + const int changeId = mChanger->createIncidence(item.payload(), Collection(item.storageCollectionId()), currentParent()); mChangeIds << changeId; @@ -167,7 +167,7 @@ History *q) : Entry(items, description, q) { - const Incidence::Ptr incidence = items.first().payload(); + const Incidence::Ptr incidence = items.first().payload(); if (mDescription.isEmpty()) { mDescription = i18nc("%1 is event, todo or journal", "%1 deletion", KCalUtils::Stringify::incidenceType(incidence->type())); @@ -187,8 +187,8 @@ mChanger->startAtomicOperation(); } - Q_ASSERT(item.hasPayload()); - const int changeId = mChanger->createIncidence(item.payload(), + Q_ASSERT(item.hasPayload()); + const int changeId = mChanger->createIncidence(item.payload(), Collection(item.storageCollectionId()), currentParent()); success = (changeId != -1) && success; @@ -256,7 +256,7 @@ : Entry(item, description, q) , mOriginalPayload(originalPayload->clone()) { - const Incidence::Ptr incidence = mItems.first().payload(); + const Incidence::Ptr incidence = mItems.first().payload(); if (mDescription.isEmpty()) { mDescription = i18nc("%1 is event, todo or journal", "%1 modification", KCalUtils::Stringify::incidenceType(incidence->type())); @@ -268,7 +268,7 @@ bool ModificationEntry::undo() { Item oldItem = mItems.first(); - oldItem.setPayload(mOriginalPayload); + oldItem.setPayload(mOriginalPayload); const int changeId = mChanger->modifyIncidence(oldItem, Incidence::Ptr(), currentParent()); mChangeIds << changeId; diff -Nru akonadi-calendar-19.04.3/src/history_p.h akonadi-calendar-19.12.3/src/history_p.h --- akonadi-calendar-19.04.3/src/history_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/history_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -22,7 +22,7 @@ #include "history.h" #include "incidencechanger.h" -#include +#include #include #include @@ -30,7 +30,7 @@ #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; namespace Akonadi { diff -Nru akonadi-calendar-19.04.3/src/icalimporter.cpp akonadi-calendar-19.12.3/src/icalimporter.cpp --- akonadi-calendar-19.04.3/src/icalimporter.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/icalimporter.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -28,7 +28,7 @@ #include #include -#include +#include #include @@ -36,7 +36,7 @@ #include #include -using namespace KCalCore; +using namespace KCalendarCore; using namespace Akonadi; ICalImporter::Private::Private(IncidenceChanger *changer, @@ -217,9 +217,9 @@ if (!collection.isValid()) { int dialogCode; const QStringList mimeTypes = QStringList() - << KCalCore::Event::eventMimeType() - << KCalCore::Todo::todoMimeType() - << KCalCore::Journal::journalMimeType(); + << KCalendarCore::Event::eventMimeType() + << KCalendarCore::Todo::todoMimeType() + << KCalendarCore::Journal::journalMimeType(); collection = CalendarUtils::selectCollection(nullptr, dialogCode/*by-ref*/, mimeTypes); } diff -Nru akonadi-calendar-19.04.3/src/incidencechanger.cpp akonadi-calendar-19.12.3/src/incidencechanger.cpp --- akonadi-calendar-19.04.3/src/incidencechanger.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/incidencechanger.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -35,7 +35,7 @@ #include using namespace Akonadi; -using namespace KCalCore; +using namespace KCalendarCore; AKONADI_CALENDAR_TESTS_EXPORT bool akonadi_calendar_running_unittests = false; @@ -62,7 +62,7 @@ static bool weAreOrganizer(const Incidence::Ptr &incidence) { - const QString email = incidence->organizer()->email(); + const QString email = incidence->organizer().email(); return Akonadi::CalendarUtils::thatIsMe(email); } @@ -70,8 +70,8 @@ { // Modifications that are per user allowd without getting outofsync with organisator // * if only alarm settings are modified. - const QSet dirtyFields = incidence->dirtyFields(); - QSet alarmOnlyModify; + const QSet dirtyFields = incidence->dirtyFields(); + QSet alarmOnlyModify; alarmOnlyModify << IncidenceBase::FieldAlarms << IncidenceBase::FieldLastModified; return (dirtyFields == alarmOnlyModify); } @@ -276,7 +276,7 @@ // puff, change finally goes out of scope, and emits the incidenceCreated signal. } else { Q_ASSERT(item.isValid()); - Q_ASSERT(item.hasPayload()); + Q_ASSERT(item.hasPayload()); change->newItem = item; if (change->useGroupwareCommunication) { @@ -353,7 +353,7 @@ errorString)); } - foreach (const Item &item, items) { + for (const Item &item : items) { // Werent deleted due to error mDeletedItemIds.remove(mDeletedItemIds.indexOf(item.id())); } @@ -401,9 +401,9 @@ const ItemModifyJob *j = qobject_cast(job); const Item item = j->item(); Q_ASSERT(mDirtyFieldsByJob.contains(job)); - Q_ASSERT(item.hasPayload()); - const QSet dirtyFields = mDirtyFieldsByJob.value(job); - item.payload()->setDirtyFields(dirtyFields); + Q_ASSERT(item.hasPayload()); + const QSet dirtyFields = mDirtyFieldsByJob.value(job); + item.payload()->setDirtyFields(dirtyFields); QString description; if (change->atomicOperationId != 0) { AtomicOperation *a = mAtomicOperations[change->atomicOperationId]; @@ -506,18 +506,18 @@ connect(handler, &ITIPHandlerHelper::finished, change.data(), &Change::emitUserDialogClosedBeforeChange); - foreach (const Akonadi::Item &item, change->originalItems) { - Q_ASSERT(item.hasPayload()); + for (const Akonadi::Item &item : qAsConst(change->originalItems)) { + Q_ASSERT(item.hasPayload()); Incidence::Ptr incidence = CalendarUtils::incidence(item); if (!incidence->supportsGroupwareCommunication()) { continue; } // We only send CANCEL if we're the organizer. // If we're not, then we send REPLY with PartStat=Declined in handleInvitationsAfterChange() - if (Akonadi::CalendarUtils::thatIsMe(incidence->organizer()->email())) { + if (Akonadi::CalendarUtils::thatIsMe(incidence->organizer().email())) { //TODO: not to popup all delete message dialogs at once :( sendOk = false; - handler->sendIncidenceDeletedMessage(KCalCore::iTIPCancel, incidence); + handler->sendIncidenceDeletedMessage(KCalendarCore::iTIPCancel, incidence); if (change->atomicOperationId) { mInvitationStatusByAtomicOperation.insert(change->atomicOperationId, status); } @@ -608,7 +608,7 @@ case IncidenceChanger::ChangeTypeCreate: { Incidence::Ptr incidence = CalendarUtils::incidence(change->newItem); if (incidence->supportsGroupwareCommunication()) { - handler->sendIncidenceCreatedMessage(KCalCore::iTIPRequest, incidence); + handler->sendIncidenceCreatedMessage(KCalendarCore::iTIPRequest, incidence); return; } break; @@ -617,7 +617,7 @@ handler->deleteLater(); handler = nullptr; Q_ASSERT(!change->originalItems.isEmpty()); - foreach (const Akonadi::Item &item, change->originalItems) { + for (const Akonadi::Item &item : qAsConst(change->originalItems)) { Q_ASSERT(item.hasPayload()); Incidence::Ptr incidence = CalendarUtils::incidence(item); Q_ASSERT(incidence); @@ -625,17 +625,17 @@ continue; } - if (!Akonadi::CalendarUtils::thatIsMe(incidence->organizer()->email())) { + if (!Akonadi::CalendarUtils::thatIsMe(incidence->organizer().email())) { const QStringList myEmails = Akonadi::CalendarUtils::allEmails(); bool notifyOrganizer = false; - KCalCore::Attendee::Ptr me(incidence->attendeeByMails(myEmails)); - if (me) { - if (me->status() == KCalCore::Attendee::Accepted || - me->status() == KCalCore::Attendee::Delegated) { + const KCalendarCore::Attendee me(incidence->attendeeByMails(myEmails)); + if (!me.isNull()) { + if (me.status() == KCalendarCore::Attendee::Accepted || + me.status() == KCalendarCore::Attendee::Delegated) { notifyOrganizer = true; } - KCalCore::Attendee::Ptr newMe(new KCalCore::Attendee(*me)); - newMe->setStatus(KCalCore::Attendee::Declined); + KCalendarCore::Attendee newMe(me); + newMe.setStatus(KCalendarCore::Attendee::Declined); incidence->clearAttendees(); incidence->addAttendee(newMe); //break; @@ -643,7 +643,7 @@ if (notifyOrganizer) { MailScheduler scheduler(mFactory, change->parentWidget); // TODO make async - scheduler.performTransaction(incidence, KCalCore::iTIPReply); + scheduler.performTransaction(incidence, KCalendarCore::iTIPReply); } } } @@ -659,7 +659,7 @@ Incidence::Ptr newIncidence = CalendarUtils::incidence(change->newItem); if (!newIncidence->supportsGroupwareCommunication() || - !Akonadi::CalendarUtils::thatIsMe(newIncidence->organizer()->email())) { + !Akonadi::CalendarUtils::thatIsMe(newIncidence->organizer().email())) { // If we're not the organizer, the user already saw the "Do you really want to do this, incidence will become out of sync" break; } @@ -676,7 +676,7 @@ oldIncidence, Akonadi::CalendarUtils::allEmails()); - handler->sendIncidenceModifiedMessage(KCalCore::iTIPRequest, newIncidence, attendeeStatusChanged); + handler->sendIncidenceModifiedMessage(KCalendarCore::iTIPRequest, newIncidence, attendeeStatusChanged); return; } default: @@ -701,10 +701,10 @@ { Q_ASSERT(newInc); Q_ASSERT(oldInc); - const Attendee::Ptr oldMe = oldInc->attendeeByMails(myEmails); - const Attendee::Ptr newMe = newInc->attendeeByMails(myEmails); + const Attendee oldMe = oldInc->attendeeByMails(myEmails); + const Attendee newMe = newInc->attendeeByMails(myEmails); - return oldMe && newMe && oldMe->status() != newMe->status(); + return !oldMe.isNull() && !newMe.isNull() && oldMe.status() != newMe.status(); } IncidenceChanger::IncidenceChanger(QObject *parent) @@ -757,7 +757,7 @@ } Item item; - item.setPayload(incidence); + item.setPayload(incidence); item.setMimeType(incidence->mimeType()); change->newItem = item; @@ -816,7 +816,7 @@ } Item::List itemsToDelete; - foreach (const Item &item, items) { + for (const Item &item : items) { if (d->deleteAlreadyCalled(item.id())) { // IncidenceChanger::deleteIncidence() called twice, ignore this one. qCDebug(AKONADICALENDAR_LOG) << "Item " << item.id() << " already deleted or being deleted, skipping"; @@ -876,7 +876,7 @@ } mDeletedItemIds.reserve(mDeletedItemIds.count() + change->originalItems.count()); - foreach (const Item &item, change->originalItems) { + for (const Item &item : qAsConst(change->originalItems)) { mDeletedItemIds << item.id(); } @@ -891,7 +891,7 @@ } int IncidenceChanger::modifyIncidence(const Item &changedItem, - const KCalCore::Incidence::Ptr &originalPayload, + const KCalendarCore::Incidence::Ptr &originalPayload, QWidget *parent) { if (!changedItem.isValid() || !changedItem.hasPayload()) { @@ -920,7 +920,7 @@ if (originalPayload) { Item originalItem(changedItem); - originalItem.setPayload(originalPayload); + originalItem.setPayload(originalPayload); modificationChange->originalItems << originalItem; } @@ -1019,7 +1019,7 @@ Incidence::Ptr incidence = CalendarUtils::incidence(newItem); { - if (!allowedModificationsWithoutRevisionUpdate(incidence)) { // increment revision ( KCalCore revision, not akonadi ) + if (!allowedModificationsWithoutRevisionUpdate(incidence)) { // increment revision ( KCalendarCore revision, not akonadi ) const int revision = incidence->revision(); incidence->setRevision(revision + 1); } @@ -1034,13 +1034,15 @@ << IncidenceBase::FieldDuration << IncidenceBase::FieldRecurrence; if (!(incidence->dirtyFields() & resetPartStatus).isEmpty() && weAreOrganizer(incidence)) { - foreach (const Attendee::Ptr &attendee, incidence->attendees()) { - if (attendee->role() != Attendee::NonParticipant && - attendee->status() != Attendee::Delegated && !Akonadi::CalendarUtils::thatIsMe(attendee)) { - attendee->setStatus(Attendee::NeedsAction); - attendee->setRSVP(true); + auto attendees = incidence->attendees(); + for (auto &attendee : attendees) { + if (attendee.role() != Attendee::NonParticipant && + attendee.status() != Attendee::Delegated && !Akonadi::CalendarUtils::thatIsMe(attendee)) { + attendee.setStatus(Attendee::NeedsAction); + attendee.setRSVP(true); } } + incidence->setAttendees(attendees); } } @@ -1251,11 +1253,11 @@ return errorString; } -void IncidenceChanger::Private::adjustRecurrence(const KCalCore::Incidence::Ptr &originalIncidence, - const KCalCore::Incidence::Ptr &incidence) +void IncidenceChanger::Private::adjustRecurrence(const KCalendarCore::Incidence::Ptr &originalIncidence, + const KCalendarCore::Incidence::Ptr &incidence) { if (!originalIncidence || !incidence->recurs() || incidence->hasRecurrenceId() || !mAutoAdjustRecurrence - || !incidence->dirtyFields().contains(KCalCore::Incidence::FieldDtStart)) { + || !incidence->dirtyFields().contains(KCalendarCore::Incidence::FieldDtStart)) { return; } @@ -1266,9 +1268,9 @@ return; } - KCalCore::Recurrence *recurrence = incidence->recurrence(); + KCalendarCore::Recurrence *recurrence = incidence->recurrence(); switch (recurrence->recurrenceType()) { - case KCalCore::Recurrence::rWeekly: { + case KCalendarCore::Recurrence::rWeekly: { QBitArray days = recurrence->days(); const int oldIndex = originalDate.dayOfWeek() - 1; // QDate returns [1-7]; const int newIndex = newStartDate.dayOfWeek() - 1; @@ -1325,7 +1327,7 @@ allow = !operation->m_itemIdsInOperation.contains(change->newItem.id()); } else if (change->type == ChangeTypeDelete) { DeletionChange::Ptr deletion = change.staticCast(); - foreach (Akonadi::Item::Id id, deletion->mItemIds) { + for (Akonadi::Item::Id id : qAsConst(deletion->mItemIds)) { if (operation->m_itemIdsInOperation.contains(id)) { allow = false; break; @@ -1370,7 +1372,7 @@ void IncidenceChanger::cancelAttendees( const Akonadi::Item &aitem ) { - const KCalCore::Incidence::Ptr incidence = CalendarSupport::incidence( aitem ); + const KCalendarCore::Incidence::Ptr incidence = CalendarSupport::incidence( aitem ); Q_ASSERT( incidence ); if ( KCalPrefs::instance()->mUseGroupwareCommunication ) { if ( KMessageBox::questionYesNo( @@ -1386,7 +1388,7 @@ // manually. CalendarSupport::MailScheduler scheduler( static_cast(d->mCalendar) ); - scheduler.performTransaction( incidence, KCalCore::iTIPCancel ); + scheduler.performTransaction( incidence, KCalendarCore::iTIPCancel ); } } } diff -Nru akonadi-calendar-19.04.3/src/incidencechanger.h akonadi-calendar-19.12.3/src/incidencechanger.h --- akonadi-calendar-19.04.3/src/incidencechanger.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/incidencechanger.h 2020-02-21 17:12:44.000000000 +0000 @@ -26,7 +26,7 @@ #include #include "itiphandler.h" -#include +#include #include @@ -64,7 +64,7 @@ * * changer->setDestinationPolicy( IncidenceChanger::DestinationPolicyAsk ); * - * KCalCore::Incidence::Ptr incidence = (...); + * KCalendarCore::Incidence::Ptr incidence = (...); * int changeId = changer->createIncidence( incidence, Akonadi::Collection() ); * * @@ -171,7 +171,7 @@ * Returns -1 if @p incidence is invalid. The createFinished() signal * won't be emitted in this case. */ - Q_REQUIRED_RESULT int createIncidence(const KCalCore::Incidence::Ptr &incidence, + Q_REQUIRED_RESULT int createIncidence(const KCalendarCore::Incidence::Ptr &incidence, const Akonadi::Collection &collection = Akonadi::Collection(), QWidget *parent = nullptr); @@ -218,7 +218,7 @@ * won't be emitted in this case. */ Q_REQUIRED_RESULT int modifyIncidence(const Akonadi::Item &item, - const KCalCore::Incidence::Ptr &originalPayload = KCalCore::Incidence::Ptr(), + const KCalendarCore::Incidence::Ptr &originalPayload = KCalendarCore::Incidence::Ptr(), QWidget *parent = nullptr); /** diff -Nru akonadi-calendar-19.04.3/src/incidencechanger_p.cpp akonadi-calendar-19.12.3/src/incidencechanger_p.cpp --- akonadi-calendar-19.04.3/src/incidencechanger_p.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/incidencechanger_p.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -19,7 +19,7 @@ #include "incidencechanger_p.h" #include "utils_p.h" -#include +#include #include "akonadicalendar_debug.h" #include #include @@ -50,7 +50,7 @@ m_collectionFetchJob = new Akonadi::CollectionFetchJob(Akonadi::Collection::root(), Akonadi::CollectionFetchJob::Recursive); - m_collectionFetchJob->fetchScope().setContentMimeTypes(KCalCore::Incidence::mimeTypes()); + m_collectionFetchJob->fetchScope().setContentMimeTypes(KCalendarCore::Incidence::mimeTypes()); connect(m_collectionFetchJob, &KJob::result, this, &IncidenceChanger::Private::onCollectionsLoaded); m_collectionFetchJob->start(); } @@ -78,7 +78,8 @@ Q_ASSERT(job == m_collectionFetchJob); Akonadi::Collection::List allCollections; - foreach (const Akonadi::Collection &collection, m_collectionFetchJob->collections()) { + const auto collections = m_collectionFetchJob->collections(); + for (const Akonadi::Collection &collection : collections) { if (collection.rights() & Akonadi::Collection::CanCreateItem) { allCollections << collection; } @@ -91,7 +92,8 @@ bool noAcl = false; bool invalidCollection = false; Collection collectionToUse; - foreach (const Change::Ptr &change, mPendingCreations) { //Don't use for(...:...) here. + const auto lstPendingCreations = mPendingCreations; + for (const Change::Ptr &change : lstPendingCreations) { mPendingCreations.removeAll(change); if (canceled) { @@ -115,7 +117,7 @@ continue; } - KCalCore::Incidence::Ptr incidence = CalendarUtils::incidence(change->newItem); + KCalendarCore::Incidence::Ptr incidence = CalendarUtils::incidence(change->newItem); Collection::List candidateCollections = collectionsForMimeType(incidence->mimeType(), allCollections); if (candidateCollections.count() == 1 && candidateCollections.first().isValid()) { // We only have 1 writable collection, don't bother the user with a dialog diff -Nru akonadi-calendar-19.04.3/src/incidencechanger_p.h akonadi-calendar-19.12.3/src/incidencechanger_p.h --- akonadi-calendar-19.04.3/src/incidencechanger_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/incidencechanger_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -287,8 +287,8 @@ void setChangeInternal(int changeId); - void adjustRecurrence(const KCalCore::Incidence::Ptr &originalIncidence, - const KCalCore::Incidence::Ptr &incidence); + void adjustRecurrence(const KCalendarCore::Incidence::Ptr &originalIncidence, + const KCalendarCore::Incidence::Ptr &incidence); bool hasRights(const Akonadi::Collection &collection, IncidenceChanger::ChangeType) const; void queueModification(const Change::Ptr &); @@ -301,8 +301,8 @@ void handleInvitationsBeforeChange(const Change::Ptr &change); void handleInvitationsAfterChange(const Change::Ptr &change); - static bool myAttendeeStatusChanged(const KCalCore::Incidence::Ptr &newIncidence, - const KCalCore::Incidence::Ptr &oldIncidence, + static bool myAttendeeStatusChanged(const KCalendarCore::Incidence::Ptr &newIncidence, + const KCalendarCore::Incidence::Ptr &oldIncidence, const QStringList &myEmails); public Q_SLOTS: @@ -366,7 +366,7 @@ Akonadi::CollectionFetchJob *m_collectionFetchJob = nullptr; - QMap > mDirtyFieldsByJob; + QMap > mDirtyFieldsByJob; IncidenceChanger::InvitationPolicy m_invitationPolicy; diff -Nru akonadi-calendar-19.04.3/src/incidencefetchjob_p.cpp akonadi-calendar-19.12.3/src/incidencefetchjob_p.cpp --- akonadi-calendar-19.04.3/src/incidencefetchjob_p.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/incidencefetchjob_p.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -23,9 +23,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include using namespace Akonadi; @@ -43,9 +43,9 @@ { CollectionFetchJob *job = new CollectionFetchJob(Collection::root(), CollectionFetchJob::Recursive, this); job->fetchScope().setContentMimeTypes(QStringList() << QStringLiteral("text/calendar") - << KCalCore::Event::eventMimeType() - << KCalCore::Todo::todoMimeType() - << KCalCore::Journal::journalMimeType()); + << KCalendarCore::Event::eventMimeType() + << KCalendarCore::Todo::todoMimeType() + << KCalendarCore::Journal::journalMimeType()); connect(job, &CollectionFetchJob::result, this, &IncidenceFetchJob::collectionFetchResult); } @@ -62,7 +62,8 @@ return; } - foreach (const Collection &col, fetch->collections()) { + const auto collections = fetch->collections(); + for (const Collection &col : collections) { if (!m_mimeTypeChecker.isWantedCollection(col) || col.isVirtual()) { continue; } @@ -80,7 +81,8 @@ } --m_jobCount; ItemFetchJob *fetch = qobject_cast(job); - foreach (const Item &item, fetch->items()) { + const auto items = fetch->items(); + for (const Item &item : items) { if (!m_mimeTypeChecker.isWantedItem(item)) { continue; } diff -Nru akonadi-calendar-19.04.3/src/incidencefetchjob_p.h akonadi-calendar-19.12.3/src/incidencefetchjob_p.h --- akonadi-calendar-19.04.3/src/incidencefetchjob_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/incidencefetchjob_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -21,7 +21,7 @@ #ifndef AKONADI_INCIDENCEFETCHJOB_P_H #define AKONADI_INCIDENCEFETCHJOB_P_H -#include +#include #include #include #include diff -Nru akonadi-calendar-19.04.3/src/itiphandler.cpp akonadi-calendar-19.12.3/src/itiphandler.cpp --- akonadi-calendar-19.04.3/src/itiphandler.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/itiphandler.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -31,10 +31,10 @@ #include "utils_p.h" #include "mailclient_p.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -74,14 +74,14 @@ { } -MailTransport::MessageQueueJob *ITIPHandlerComponentFactory::createMessageQueueJob(const KCalCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, QObject *parent) +MailTransport::MessageQueueJob *ITIPHandlerComponentFactory::createMessageQueueJob(const KCalendarCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, QObject *parent) { Q_UNUSED(incidence); Q_UNUSED(identity); return new MailTransport::MessageQueueJob(parent); } -ITIPHandlerDialogDelegate *ITIPHandlerComponentFactory::createITIPHanderDialogDelegate(const KCalCore::Incidence::Ptr &incidence, KCalCore::iTIPMethod method, QWidget *parent) +ITIPHandlerDialogDelegate *ITIPHandlerComponentFactory::createITIPHanderDialogDelegate(const KCalendarCore::Incidence::Ptr &incidence, KCalendarCore::iTIPMethod method, QWidget *parent) { return new ITIPHandlerDialogDelegate(incidence, method, parent); } @@ -132,8 +132,8 @@ return; } - KCalCore::ICalFormat format; - KCalCore::ScheduleMessage::Ptr message = format.parseScheduleMessage(d->calendar(), iCal); + KCalendarCore::ICalFormat format; + KCalendarCore::ScheduleMessage::Ptr message = format.parseScheduleMessage(d->calendar(), iCal); if (!message) { const QString errorMessage = format.exception() ? i18n("Error message: %1", KCalUtils::Stringify::errorMessage(*format.exception())) @@ -153,10 +153,10 @@ return; } - d->m_method = static_cast(message->method()); + d->m_method = static_cast(message->method()); - KCalCore::ScheduleMessage::Status status = message->status(); - d->m_incidence = message->event().dynamicCast(); + KCalendarCore::ScheduleMessage::Status status = message->status(); + d->m_incidence = message->event().dynamicCast(); if (!d->m_incidence) { qCritical() << "Invalid incidence"; d->m_currentOperation = OperationNone; @@ -170,22 +170,24 @@ action.startsWith(QLatin1String("counter"))) { // Find myself and set my status. This can't be done in the scheduler, // since this does not know the choice I made in the KMail bpf - const KCalCore::Attendee::List attendees = d->m_incidence->attendees(); - for (const KCalCore::Attendee::Ptr &attendee : attendees) { - if (attendee->email() == receiver) { + KCalendarCore::Attendee::List attendees = d->m_incidence->attendees(); + for (auto &attendee : attendees) { + if (attendee.email() == receiver) { if (action.startsWith(QLatin1String("accepted"))) { - attendee->setStatus(KCalCore::Attendee::Accepted); + attendee.setStatus(KCalendarCore::Attendee::Accepted); } else if (action.startsWith(QLatin1String("tentative"))) { - attendee->setStatus(KCalCore::Attendee::Tentative); + attendee.setStatus(KCalendarCore::Attendee::Tentative); } else if (CalendarSettings::self()->outlookCompatCounterProposals() && action.startsWith(QLatin1String("counter"))) { - attendee->setStatus(KCalCore::Attendee::Tentative); + attendee.setStatus(KCalendarCore::Attendee::Tentative); } else if (action.startsWith(QLatin1String("delegated"))) { - attendee->setStatus(KCalCore::Attendee::Delegated); + attendee.setStatus(KCalendarCore::Attendee::Delegated); } break; } } + d->m_incidence->setAttendees(attendees); + if (CalendarSettings::self()->outlookCompatCounterProposals() || !action.startsWith(QLatin1String("counter"))) { d->m_scheduler->acceptTransaction(d->m_incidence, d->calendar(), d->m_method, status, receiver); @@ -194,9 +196,9 @@ //TODO: what happens here? we must emit a signal } else if (action.startsWith(QLatin1String("cancel"))) { // Delete the old incidence, if one is present - KCalCore::Incidence::Ptr existingIncidence = d->calendar()->incidenceFromSchedulingID(d->m_incidence->uid()); + KCalendarCore::Incidence::Ptr existingIncidence = d->calendar()->incidenceFromSchedulingID(d->m_incidence->uid()); if (existingIncidence) { - d->m_scheduler->acceptTransaction(d->m_incidence, d->calendar(), KCalCore::iTIPCancel, status, receiver); + d->m_scheduler->acceptTransaction(d->m_incidence, d->calendar(), KCalendarCore::iTIPCancel, status, receiver); return; // signal emitted in onSchedulerFinished(). } else { // We don't have the incidence, nothing to cancel @@ -207,8 +209,8 @@ << "; summary=" << d->m_incidence->summary(); qCDebug(AKONADICALENDAR_LOG) << "\n Here's what we do have with such a summary:"; - const KCalCore::Incidence::List knownIncidences = calendar()->incidences(); - for (const KCalCore::Incidence::Ptr &knownIncidence : knownIncidences) { + const KCalendarCore::Incidence::List knownIncidences = calendar()->incidences(); + for (const KCalendarCore::Incidence::Ptr &knownIncidence : knownIncidences) { if (knownIncidence->summary() == d->m_incidence->summary()) { qCDebug(AKONADICALENDAR_LOG) << "\nFound: uid=" << knownIncidence->uid() << "; identifier=" << knownIncidence->instanceIdentifier() @@ -219,7 +221,7 @@ emitiTipMessageProcessed(this, ResultSuccess, QString()); } } else if (action.startsWith(QLatin1String("reply"))) { - if (d->m_method != KCalCore::iTIPCounter) { + if (d->m_method != KCalendarCore::iTIPCounter) { d->m_scheduler->acceptTransaction(d->m_incidence, d->calendar(), d->m_method, status, QString()); } else { d->m_scheduler->acceptCounterProposal(d->m_incidence, d->calendar()); @@ -239,14 +241,14 @@ if (d->m_uiDelegate) { Akonadi::Item item; item.setMimeType(d->m_incidence->mimeType()); - item.setPayload(KCalCore::Incidence::Ptr(d->m_incidence->clone())); + item.setPayload(KCalendarCore::Incidence::Ptr(d->m_incidence->clone())); // TODO_KDE5: This blocks because m_uiDelegate is not a QObject and can't emit a finished() // signal. Make async in kde5 d->m_uiDelegate->requestIncidenceEditor(item); - KCalCore::Incidence::Ptr newIncidence; - if (item.hasPayload()) { - newIncidence = item.payload(); + KCalendarCore::Incidence::Ptr newIncidence; + if (item.hasPayload()) { + newIncidence = item.payload(); } if (*newIncidence == *d->m_incidence) { @@ -267,8 +269,8 @@ } } -void ITIPHandler::sendiTIPMessage(KCalCore::iTIPMethod method, - const KCalCore::Incidence::Ptr &incidence, +void ITIPHandler::sendiTIPMessage(KCalendarCore::iTIPMethod method, + const KCalendarCore::Incidence::Ptr &incidence, QWidget *parentWidget) { if (!incidence) { @@ -292,7 +294,7 @@ return; } - if (incidence->attendeeCount() == 0 && method != KCalCore::iTIPPublish) { + if (incidence->attendeeCount() == 0 && method != KCalendarCore::iTIPPublish) { if (d->m_showDialogsOnError) { KMessageBox::information(parentWidget, i18n("The item '%1' has no attendees. " @@ -307,14 +309,14 @@ d->m_currentOperation = OperationSendiTIPMessage; - KCalCore::Incidence *incidenceCopy = incidence->clone(); + KCalendarCore::Incidence *incidenceCopy = incidence->clone(); incidenceCopy->registerObserver(nullptr); incidenceCopy->clearAttendees(); d->m_scheduler->performTransaction(incidence, method); } -void ITIPHandler::publishInformation(const KCalCore::Incidence::Ptr &incidence, +void ITIPHandler::publishInformation(const KCalendarCore::Incidence::Ptr &incidence, QWidget *parentWidget) { Q_ASSERT(incidence); @@ -336,9 +338,9 @@ QPointer publishdlg = new Akonadi::PublishDialog(); if (incidence->attendeeCount() > 0) { - KCalCore::Attendee::List attendees = incidence->attendees(); - KCalCore::Attendee::List::ConstIterator it; - KCalCore::Attendee::List::ConstIterator end(attendees.constEnd()); + KCalendarCore::Attendee::List attendees = incidence->attendees(); + KCalendarCore::Attendee::List::ConstIterator it; + KCalendarCore::Attendee::List::ConstIterator end(attendees.constEnd()); for (it = attendees.constBegin(); it != end; ++it) { publishdlg->addAttendee(*it); } @@ -352,7 +354,7 @@ delete publishdlg; } -void ITIPHandler::sendAsICalendar(const KCalCore::Incidence::Ptr &originalIncidence, +void ITIPHandler::sendAsICalendar(const KCalendarCore::Incidence::Ptr &originalIncidence, QWidget *parentWidget) { Q_UNUSED(parentWidget); @@ -363,17 +365,15 @@ } // Clone so we can change organizer and recurid - KCalCore::Incidence::Ptr incidence = KCalCore::Incidence::Ptr(originalIncidence->clone()); + KCalendarCore::Incidence::Ptr incidence = KCalendarCore::Incidence::Ptr(originalIncidence->clone()); QPointer publishdlg = new Akonadi::PublishDialog; if (publishdlg->exec() == QDialog::Accepted && publishdlg) { const QString recipients = publishdlg->addresses(); - if (incidence->organizer()->isEmpty()) { - incidence->setOrganizer(KCalCore::Person::Ptr( - new KCalCore::Person(Akonadi::CalendarUtils::fullName(), - Akonadi::CalendarUtils::email()))); + if (incidence->organizer().isEmpty()) { + incidence->setOrganizer(KCalendarCore::Person(Akonadi::CalendarUtils::fullName(), Akonadi::CalendarUtils::email())); } if (incidence->hasRecurrenceId()) { @@ -381,10 +381,10 @@ incidence->setRecurrenceId({}); } - KCalCore::ICalFormat format; + KCalendarCore::ICalFormat format; const QString from = Akonadi::CalendarUtils::email(); const bool bccMe = Akonadi::CalendarSettings::self()->bcc(); - const QString messageText = format.createScheduleMessage(incidence, KCalCore::iTIPRequest); + const QString messageText = format.createScheduleMessage(incidence, KCalendarCore::iTIPRequest); MailClient *mailer = new MailClient(d->m_factory); d->m_queuedInvitation.incidence = incidence; connect(mailer, &MailClient::finished, d, [this](Akonadi::MailClient::Result result, const QString &str) { d->finishSendAsICalendar(result,str); }); diff -Nru akonadi-calendar-19.04.3/src/itiphandler.h akonadi-calendar-19.12.3/src/itiphandler.h --- akonadi-calendar-19.04.3/src/itiphandler.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/itiphandler.h 2020-02-21 17:12:44.000000000 +0000 @@ -29,8 +29,8 @@ #include "akonadi-calendar_export.h" #include "etmcalendar.h" -#include -#include +#include +#include #include #include @@ -92,7 +92,7 @@ /** * Creates a new AskDelegator */ - explicit ITIPHandlerDialogDelegate(const KCalCore::Incidence::Ptr &incidence, KCalCore::iTIPMethod method, QWidget *parent = nullptr); + explicit ITIPHandlerDialogDelegate(const KCalendarCore::Incidence::Ptr &incidence, KCalendarCore::iTIPMethod method, QWidget *parent = nullptr); /* * Opens a Dialog, when an incidence is created @@ -164,7 +164,7 @@ * @param method: itip method * @param incidence: purpose of the dialog */ - void dialogClosed(int answer, KCalCore::iTIPMethod method, const KCalCore::Incidence::Ptr &incidence); + void dialogClosed(int answer, KCalendarCore::iTIPMethod method, const KCalendarCore::Incidence::Ptr &incidence); protected: /* @@ -186,10 +186,10 @@ QWidget *mParent = nullptr; // Incidence related to the dialog - KCalCore::Incidence::Ptr mIncidence; + KCalendarCore::Incidence::Ptr mIncidence; // ITIPMethod related to the dialog - KCalCore::iTIPMethod mMethod; + KCalendarCore::iTIPMethod mMethod; }; /** @@ -216,7 +216,7 @@ * @param identity that is the mail sender * @param parent of the MailTransport::MessageQueueJob object */ - virtual MailTransport::MessageQueueJob *createMessageQueueJob(const KCalCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, QObject *parent = nullptr); + virtual MailTransport::MessageQueueJob *createMessageQueueJob(const KCalendarCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, QObject *parent = nullptr); /* * @return A new ITIPHandlerDialogDelegate object @@ -225,7 +225,7 @@ * @parent parent of the AskDelegator * */ - virtual ITIPHandlerDialogDelegate *createITIPHanderDialogDelegate(const KCalCore::Incidence::Ptr &incidence, KCalCore::iTIPMethod method, QWidget *parent = nullptr); + virtual ITIPHandlerDialogDelegate *createITIPHanderDialogDelegate(const KCalendarCore::Incidence::Ptr &incidence, KCalendarCore::iTIPMethod method, QWidget *parent = nullptr); }; /** @@ -278,8 +278,8 @@ * Should contain a list of attendees. * @param parentWidget */ - void sendiTIPMessage(KCalCore::iTIPMethod method, - const KCalCore::Incidence::Ptr &incidence, + void sendiTIPMessage(KCalendarCore::iTIPMethod method, + const KCalendarCore::Incidence::Ptr &incidence, QWidget *parentWidget = nullptr); /** @@ -287,13 +287,13 @@ * A publish dialog will prompt the user to input recipients. * @see rfc2446 3.2.1 */ - void publishInformation(const KCalCore::Incidence::Ptr &incidence, QWidget *parentWidget = nullptr); + void publishInformation(const KCalendarCore::Incidence::Ptr &incidence, QWidget *parentWidget = nullptr); /** * Sends an e-mail with the incidence attached as iCalendar source. * A dialog will prompt the user to input recipients. */ - void sendAsICalendar(const KCalCore::Incidence::Ptr &incidence, QWidget *parentWidget = nullptr); + void sendAsICalendar(const KCalendarCore::Incidence::Ptr &incidence, QWidget *parentWidget = nullptr); /** * Sets the UI delegate to edit counter proposals. diff -Nru akonadi-calendar-19.04.3/src/itiphandlerhelper_p.cpp akonadi-calendar-19.12.3/src/itiphandlerhelper_p.cpp --- akonadi-calendar-19.04.3/src/itiphandlerhelper_p.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/itiphandlerhelper_p.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -25,8 +25,8 @@ #include "calendarsettings.h" #include "utils_p.h" -#include -#include +#include +#include #include #include #include "akonadicalendar_debug.h" @@ -37,7 +37,7 @@ using namespace Akonadi; -QString proposalComment(const KCalCore::Incidence::Ptr &incidence) +QString proposalComment(const KCalendarCore::Incidence::Ptr &incidence) { QString comment; @@ -45,14 +45,14 @@ // if not, it should go there. switch (incidence->type()) { - case KCalCore::IncidenceBase::TypeEvent: { - const QDateTime dtEnd = incidence->dateTime(KCalCore::Incidence::RoleDisplayEnd); + case KCalendarCore::IncidenceBase::TypeEvent: { + const QDateTime dtEnd = incidence->dateTime(KCalendarCore::Incidence::RoleDisplayEnd); comment = i18n("Proposed new meeting time: %1 - %2", KCalUtils::IncidenceFormatter::dateToString(incidence->dtStart().toLocalTime().date()), KCalUtils::IncidenceFormatter::dateToString(dtEnd.toLocalTime().date())); } break; - case KCalCore::IncidenceBase::TypeTodo: { + case KCalendarCore::IncidenceBase::TypeTodo: { qCWarning(AKONADICALENDAR_LOG) << "NOT IMPLEMENTED: proposalComment called for to-do."; } break; @@ -63,7 +63,7 @@ return comment; } -ITIPHandlerDialogDelegate::ITIPHandlerDialogDelegate(const KCalCore::Incidence::Ptr &incidence, KCalCore::iTIPMethod method, QWidget *parent) +ITIPHandlerDialogDelegate::ITIPHandlerDialogDelegate(const KCalendarCore::Incidence::Ptr &incidence, KCalendarCore::iTIPMethod method, QWidget *parent) : mParent(parent) , mIncidence(incidence) , mMethod(method) @@ -123,8 +123,8 @@ ITIPHandlerHelper::SendResult ITIPHandlerHelper::sentInvitation(int messageBoxReturnCode, - const KCalCore::Incidence::Ptr &incidence, - KCalCore::iTIPMethod method) + const KCalendarCore::Incidence::Ptr &incidence, + KCalendarCore::iTIPMethod method) { // The value represented by messageBoxReturnCode is the answer on a question // which is a variant of: Do you want to send an email to the attendees? @@ -137,7 +137,7 @@ // Yes, we do modify the incidence here, but we still keep the Ptr // semantics, because this change is only for sending and not stored int the // local calendar. - KCalCore::Incidence::Ptr _incidence(incidence->clone()); + KCalendarCore::Incidence::Ptr _incidence(incidence->clone()); if (_incidence->summary().isEmpty()) { _incidence->setSummary(xi18n("No summary given")); } @@ -157,19 +157,19 @@ } } -bool ITIPHandlerHelper::weAreOrganizerOf(const KCalCore::Incidence::Ptr &incidence) +bool ITIPHandlerHelper::weAreOrganizerOf(const KCalendarCore::Incidence::Ptr &incidence) { - const QString email = incidence->organizer()->email(); + const QString email = incidence->organizer().email(); return Akonadi::CalendarUtils::thatIsMe(email) || email.isEmpty() || email == QLatin1String("invalid@email.address"); } -bool ITIPHandlerHelper::weNeedToSendMailFor(const KCalCore::Incidence::Ptr &incidence) +bool ITIPHandlerHelper::weNeedToSendMailFor(const KCalendarCore::Incidence::Ptr &incidence) { if (!weAreOrganizerOf(incidence)) { qCritical() << "We should be the organizer of this incidence." - << "; email= " << incidence->organizer()->email() - << "; thatIsMe() = " << Akonadi::CalendarUtils::thatIsMe(incidence->organizer()->email()); + << "; email= " << incidence->organizer().email() + << "; thatIsMe() = " << Akonadi::CalendarUtils::thatIsMe(incidence->organizer().email()); Q_ASSERT(false); return false; } @@ -181,7 +181,7 @@ // At least one attendee return incidence->attendees().count() > 1 || - incidence->attendees().at(0)->email() != incidence->organizer()->email(); + incidence->attendees().at(0).email() != incidence->organizer().email(); } ITIPHandlerHelper::ITIPHandlerHelper(ITIPHandlerComponentFactory *factory, QWidget *parent) @@ -209,15 +209,15 @@ mDefaultAction = action; } -void ITIPHandlerHelper::sendIncidenceCreatedMessage(KCalCore::iTIPMethod method, - const KCalCore::Incidence::Ptr &incidence) +void ITIPHandlerHelper::sendIncidenceCreatedMessage(KCalendarCore::iTIPMethod method, + const KCalendarCore::Incidence::Ptr &incidence) { /// When we created the incidence, we *must* be the organizer. if (!weAreOrganizerOf(incidence)) { qCWarning(AKONADICALENDAR_LOG) << "Creating incidence which has another organizer! Will skip sending invitations." - << "; email= " << incidence->organizer()->email() - << "; thatIsMe() = " << Akonadi::CalendarUtils::thatIsMe(incidence->organizer()->email()); + << "; email= " << incidence->organizer().email() + << "; thatIsMe() = " << Akonadi::CalendarUtils::thatIsMe(incidence->organizer().email()); emit sendIncidenceCreatedMessageFinished(ITIPHandlerHelper::ResultFailAbortUpdate, method, incidence); emit finished(ITIPHandlerHelper::ResultFailAbortUpdate, QString()); return; @@ -230,11 +230,11 @@ } QString question; - if (incidence->type() == KCalCore::Incidence::TypeEvent) { + if (incidence->type() == KCalendarCore::Incidence::TypeEvent) { question = i18n("The event \"%1\" includes other people.\n" "Do you want to email the invitation to the attendees?", incidence->summary()); - } else if (incidence->type() == KCalCore::Incidence::TypeTodo) { + } else if (incidence->type() == KCalendarCore::Incidence::TypeTodo) { question = i18n("The todo \"%1\" includes other people.\n" "Do you want to email the invitation to the attendees?", incidence->summary()); @@ -248,18 +248,18 @@ askDelegator->openDialogIncidenceCreated(ITIPHandlerDialogDelegate::Attendees, question, mDefaultAction); } -void ITIPHandlerHelper::slotIncidenceCreatedDialogClosed(int messageBoxReturnCode, KCalCore::iTIPMethod method, const KCalCore::Incidence::Ptr &incidence) +void ITIPHandlerHelper::slotIncidenceCreatedDialogClosed(int messageBoxReturnCode, KCalendarCore::iTIPMethod method, const KCalendarCore::Incidence::Ptr &incidence) { ITIPHandlerHelper::SendResult status = sentInvitation(messageBoxReturnCode, incidence, method); emit sendIncidenceCreatedMessageFinished(status, method, incidence); } -bool ITIPHandlerHelper::handleIncidenceAboutToBeModified(const KCalCore::Incidence::Ptr &incidence) +bool ITIPHandlerHelper::handleIncidenceAboutToBeModified(const KCalendarCore::Incidence::Ptr &incidence) { Q_ASSERT(incidence); if (!weAreOrganizerOf(incidence)) { switch (incidence->type()) { - case KCalCore::Incidence::TypeEvent: { + case KCalendarCore::Incidence::TypeEvent: { const QString question = i18n("You are not the organizer of this event. Editing it will " "bring your calendar out of sync with the organizer's calendar. " @@ -268,8 +268,8 @@ return messageBoxReturnCode != KMessageBox::No; } break; - case KCalCore::Incidence::TypeJournal: - case KCalCore::Incidence::TypeTodo: + case KCalendarCore::Incidence::TypeJournal: + case KCalendarCore::Incidence::TypeTodo: // Not sure why we handle to-dos differently regarding this return true; break; @@ -284,8 +284,8 @@ } } -void ITIPHandlerHelper::sendIncidenceModifiedMessage(KCalCore::iTIPMethod method, - const KCalCore::Incidence::Ptr &incidence, +void ITIPHandlerHelper::sendIncidenceModifiedMessage(KCalendarCore::iTIPMethod method, + const KCalendarCore::Incidence::Ptr &incidence, bool attendeeStatusChanged) { ITIPHandlerDialogDelegate *askDelegator = m_factory->createITIPHanderDialogDelegate(incidence, method, mParent); @@ -307,11 +307,11 @@ return; } - } else if (incidence->type() == KCalCore::Incidence::TypeTodo) { + } else if (incidence->type() == KCalendarCore::Incidence::TypeTodo) { - if (method == KCalCore::iTIPRequest) { + if (method == KCalendarCore::iTIPRequest) { // This is an update to be sent to the organizer - method = KCalCore::iTIPReply; + method = KCalendarCore::iTIPReply; } const QString question = i18n("Do you want to send a status update to the " @@ -319,9 +319,9 @@ askDelegator->openDialogIncidenceModified(attendeeStatusChanged, ITIPHandlerDialogDelegate::Organizer, question, mDefaultAction, KGuiItem(i18n("Send Update"))); return; - } else if (incidence->type() == KCalCore::Incidence::TypeEvent) { - if (attendeeStatusChanged && method == KCalCore::iTIPRequest) { - method = KCalCore::iTIPReply; + } else if (incidence->type() == KCalendarCore::Incidence::TypeEvent) { + if (attendeeStatusChanged && method == KCalendarCore::iTIPRequest) { + method = KCalendarCore::iTIPReply; const QString question = i18n("Your status as an attendee of this event changed. " "Do you want to send a status update to the event organizer?"); @@ -340,14 +340,14 @@ delete askDelegator; } -void ITIPHandlerHelper::slotIncidenceModifiedDialogClosed(int messageBoxReturnCode, KCalCore::iTIPMethod method, const KCalCore::Incidence::Ptr &incidence) +void ITIPHandlerHelper::slotIncidenceModifiedDialogClosed(int messageBoxReturnCode, KCalendarCore::iTIPMethod method, const KCalendarCore::Incidence::Ptr &incidence) { ITIPHandlerHelper::SendResult status = sentInvitation(messageBoxReturnCode, incidence, method); emit sendIncidenceModifiedMessageFinished(status, method, incidence); } -void ITIPHandlerHelper::sendIncidenceDeletedMessage(KCalCore::iTIPMethod method, - const KCalCore::Incidence::Ptr &incidence) +void ITIPHandlerHelper::sendIncidenceDeletedMessage(KCalendarCore::iTIPMethod method, + const KCalendarCore::Incidence::Ptr &incidence) { Q_ASSERT(incidence); @@ -359,15 +359,15 @@ if (weAreOrganizerOf(incidence)) { if (weNeedToSendMailFor(incidence)) { QString question; - if (incidence->type() == KCalCore::Incidence::TypeEvent) { + if (incidence->type() == KCalendarCore::Incidence::TypeEvent) { question = i18n("You removed the invitation \"%1\".\n" "Do you want to email the attendees that the event is canceled?", incidence->summary()); - } else if (incidence->type() == KCalCore::Incidence::TypeTodo) { + } else if (incidence->type() == KCalendarCore::Incidence::TypeTodo) { question = i18n("You removed the invitation \"%1\".\n" "Do you want to email the attendees that the todo is canceled?", incidence->summary()); - } else if (incidence->type() == KCalCore::Incidence::TypeJournal) { + } else if (incidence->type() == KCalendarCore::Incidence::TypeJournal) { question = i18n("You removed the invitation \"%1\".\n" "Do you want to email the attendees that the journal is canceled?", incidence->summary()); @@ -381,14 +381,14 @@ return; } - } else if (incidence->type() != KCalCore::Incidence::TypeEvent) { + } else if (incidence->type() != KCalendarCore::Incidence::TypeEvent) { - if (method == KCalCore::iTIPRequest) { + if (method == KCalendarCore::iTIPRequest) { // This is an update to be sent to the organizer - method = KCalCore::iTIPReply; + method = KCalendarCore::iTIPReply; } - const QString question = (incidence->type() == KCalCore::Incidence::TypeTodo) ? + const QString question = (incidence->type() == KCalendarCore::Incidence::TypeTodo) ? i18n("Do you want to send a status update to the " "organizer of this task?") : i18n("Do you want to send a status update to the " @@ -401,10 +401,10 @@ const QStringList myEmails = Akonadi::CalendarUtils::allEmails(); bool incidenceAcceptedBefore = false; for (const QString &email : myEmails) { - KCalCore::Attendee::Ptr me = incidence->attendeeByMail(email); - if (me && - (me->status() == KCalCore::Attendee::Accepted || - me->status() == KCalCore::Attendee::Delegated)) { + const KCalendarCore::Attendee me = incidence->attendeeByMail(email); + if (!me.isNull() && + (me.status() == KCalendarCore::Attendee::Accepted || + me.status() == KCalendarCore::Attendee::Delegated)) { incidenceAcceptedBefore = true; break; } @@ -433,15 +433,15 @@ delete askDelegator; } -void ITIPHandlerHelper::slotIncidenceDeletedDialogClosed(const int messageBoxReturnCode, KCalCore::iTIPMethod method, const KCalCore::Incidence::Ptr &incidence) +void ITIPHandlerHelper::slotIncidenceDeletedDialogClosed(const int messageBoxReturnCode, KCalendarCore::iTIPMethod method, const KCalendarCore::Incidence::Ptr &incidence) { ITIPHandlerHelper::SendResult status = sentInvitation(messageBoxReturnCode, incidence, method); emit sendIncidenceDeletedMessageFinished(status, method, incidence); } ITIPHandlerHelper::SendResult -ITIPHandlerHelper::sendCounterProposal(const KCalCore::Incidence::Ptr &oldEvent, - const KCalCore::Incidence::Ptr &newEvent) +ITIPHandlerHelper::sendCounterProposal(const KCalendarCore::Incidence::Ptr &oldEvent, + const KCalendarCore::Incidence::Ptr &newEvent) { Q_ASSERT(oldEvent); Q_ASSERT(newEvent); @@ -451,14 +451,14 @@ } if (CalendarSettings::self()->outlookCompatCounterProposals()) { - KCalCore::Incidence::Ptr tmp(oldEvent->clone()); + KCalendarCore::Incidence::Ptr tmp(oldEvent->clone()); tmp->setSummary(i18n("Counter proposal: %1", newEvent->summary())); tmp->setDescription(newEvent->description()); tmp->addComment(proposalComment(newEvent)); - return sentInvitation(KMessageBox::Yes, tmp, KCalCore::iTIPReply); + return sentInvitation(KMessageBox::Yes, tmp, KCalendarCore::iTIPReply); } else { - return sentInvitation(KMessageBox::Yes, newEvent, KCalCore::iTIPCounter); + return sentInvitation(KMessageBox::Yes, newEvent, KCalendarCore::iTIPCounter); } } @@ -472,7 +472,7 @@ if (!success) { const QString question(i18n("Sending group scheduling email failed.")); - ITIPHandlerDialogDelegate *askDelegator = m_factory->createITIPHanderDialogDelegate(KCalCore::Incidence::Ptr(), KCalCore::iTIPNoMethod, mParent); + ITIPHandlerDialogDelegate *askDelegator = m_factory->createITIPHanderDialogDelegate(KCalendarCore::Incidence::Ptr(), KCalendarCore::iTIPNoMethod, mParent); connect(askDelegator, &ITIPHandlerDialogDelegate::dialogClosed, this, &ITIPHandlerHelper::slotSchedulerFinishDialog); askDelegator->openDialogSchedulerFinished(question, ITIPHandlerDialogDelegate::ActionAsk, @@ -487,7 +487,7 @@ success ? QString() : i18n("Error: %1", errorMsg)); } -void ITIPHandlerHelper::slotSchedulerFinishDialog(const int result, KCalCore::iTIPMethod method, const KCalCore::Incidence::Ptr &incidence) +void ITIPHandlerHelper::slotSchedulerFinishDialog(const int result, KCalendarCore::iTIPMethod method, const KCalendarCore::Incidence::Ptr &incidence) { Q_UNUSED(method); Q_UNUSED(incidence); diff -Nru akonadi-calendar-19.04.3/src/itiphandlerhelper_p.h akonadi-calendar-19.12.3/src/itiphandlerhelper_p.h --- akonadi-calendar-19.04.3/src/itiphandlerhelper_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/itiphandlerhelper_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -27,8 +27,8 @@ #include "itiphandler.h" #include "mailscheduler_p.h" -#include -#include +#include +#include #include @@ -104,8 +104,8 @@ Kontact/PIM) are the organizer. @param incidence The new incidence. */ - void sendIncidenceCreatedMessage(KCalCore::iTIPMethod method, - const KCalCore::Incidence::Ptr &incidence); + void sendIncidenceCreatedMessage(KCalendarCore::iTIPMethod method, + const KCalendarCore::Incidence::Ptr &incidence); /** Checks if the incidence should really be modified. @@ -117,31 +117,31 @@ @param incidence The modified incidence. It may not be null. */ - bool handleIncidenceAboutToBeModified(const KCalCore::Incidence::Ptr &incidence); + bool handleIncidenceAboutToBeModified(const KCalendarCore::Incidence::Ptr &incidence); /** Handles sending of invitations for modified incidences. @param incidence The modified incidence. @param attendeeStatusChanged if @c true and @p method is #iTIPRequest ask the user whether to send a status update as well */ - void sendIncidenceModifiedMessage(KCalCore::iTIPMethod method, - const KCalCore::Incidence::Ptr &incidence, + void sendIncidenceModifiedMessage(KCalendarCore::iTIPMethod method, + const KCalendarCore::Incidence::Ptr &incidence, bool attendeeStatusChanged); /** Handles sending of ivitations for deleted incidences. @param incidence The deleted incidence. */ - void sendIncidenceDeletedMessage(KCalCore::iTIPMethod method, - const KCalCore::Incidence::Ptr &incidence); + void sendIncidenceDeletedMessage(KCalendarCore::iTIPMethod method, + const KCalendarCore::Incidence::Ptr &incidence); /** Send counter proposal message. @param oldIncidence The original event provided in the invitations. @param newIncidence The new event as edited by the user. */ - ITIPHandlerHelper::SendResult sendCounterProposal(const KCalCore::Incidence::Ptr &oldIncidence, - const KCalCore::Incidence::Ptr &newIncidence); + ITIPHandlerHelper::SendResult sendCounterProposal(const KCalendarCore::Incidence::Ptr &oldIncidence, + const KCalendarCore::Incidence::Ptr &newIncidence); // Frees calendar if it doesn't have jobs running void calendarJobFinished(bool success, const QString &errorString); @@ -150,37 +150,37 @@ void finished(Akonadi::ITIPHandlerHelper::SendResult result, const QString &errorMessage); - void sendIncidenceDeletedMessageFinished(ITIPHandlerHelper::SendResult, KCalCore::iTIPMethod method, const KCalCore::Incidence::Ptr &incidence); - void sendIncidenceModifiedMessageFinished(ITIPHandlerHelper::SendResult, KCalCore::iTIPMethod method, const KCalCore::Incidence::Ptr &incidence); - void sendIncidenceCreatedMessageFinished(ITIPHandlerHelper::SendResult, KCalCore::iTIPMethod method, const KCalCore::Incidence::Ptr &incidence); + void sendIncidenceDeletedMessageFinished(ITIPHandlerHelper::SendResult, KCalendarCore::iTIPMethod method, const KCalendarCore::Incidence::Ptr &incidence); + void sendIncidenceModifiedMessageFinished(ITIPHandlerHelper::SendResult, KCalendarCore::iTIPMethod method, const KCalendarCore::Incidence::Ptr &incidence); + void sendIncidenceCreatedMessageFinished(ITIPHandlerHelper::SendResult, KCalendarCore::iTIPMethod method, const KCalendarCore::Incidence::Ptr &incidence); private Q_SLOTS: void onSchedulerFinished(Akonadi::Scheduler::Result result, const QString &errorMsg); - void slotIncidenceDeletedDialogClosed(const int, KCalCore::iTIPMethod method, const KCalCore::Incidence::Ptr &incidence); - void slotIncidenceModifiedDialogClosed(const int, KCalCore::iTIPMethod method, const KCalCore::Incidence::Ptr &incidence); - void slotIncidenceCreatedDialogClosed(const int, KCalCore::iTIPMethod method, const KCalCore::Incidence::Ptr &incidence); + void slotIncidenceDeletedDialogClosed(const int, KCalendarCore::iTIPMethod method, const KCalendarCore::Incidence::Ptr &incidence); + void slotIncidenceModifiedDialogClosed(const int, KCalendarCore::iTIPMethod method, const KCalendarCore::Incidence::Ptr &incidence); + void slotIncidenceCreatedDialogClosed(const int, KCalendarCore::iTIPMethod method, const KCalendarCore::Incidence::Ptr &incidence); - void slotSchedulerFinishDialog(const int result, KCalCore::iTIPMethod method, const KCalCore::Incidence::Ptr &incidence); + void slotSchedulerFinishDialog(const int result, KCalendarCore::iTIPMethod method, const KCalendarCore::Incidence::Ptr &incidence); private: ITIPHandlerHelper::SendResult sentInvitation(int messageBoxReturnCode, - const KCalCore::Incidence::Ptr &incidence, - KCalCore::iTIPMethod method); + const KCalendarCore::Incidence::Ptr &incidence, + KCalendarCore::iTIPMethod method); /** We are the organizer. If there is more than one attendee, or if there is only one, and it's not the same as the organizer, ask the user to send mail. */ - bool weAreOrganizerOf(const KCalCore::Incidence::Ptr &incidence); + bool weAreOrganizerOf(const KCalendarCore::Incidence::Ptr &incidence); /** Assumes that we are the organizer. If there is more than one attendee, or if there is only one, and it's not the same as the organizer, ask the user to send mail. */ - bool weNeedToSendMailFor(const KCalCore::Incidence::Ptr &incidence); + bool weNeedToSendMailFor(const KCalendarCore::Incidence::Ptr &incidence); ITIPHandlerDialogDelegate::Action mDefaultAction; QWidget *mParent = nullptr; diff -Nru akonadi-calendar-19.04.3/src/itiphandler_p.cpp akonadi-calendar-19.12.3/src/itiphandler_p.cpp --- akonadi-calendar-19.04.3/src/itiphandler_p.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/itiphandler_p.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -19,7 +19,7 @@ #include "itiphandler_p.h" #include "fetchjobcalendar.h" -#include +#include #include #include #include "akonadicalendar_debug.h" @@ -29,7 +29,7 @@ : m_calendarLoadError(false) , m_factory(factory ? factory : new ITIPHandlerComponentFactory(this)) , m_scheduler(new MailScheduler(m_factory, qq)) - , m_method(KCalCore::iTIPNoMethod) + , m_method(KCalendarCore::iTIPNoMethod) , m_helper(new ITIPHandlerHelper(m_factory)) , m_currentOperation(OperationNone) , m_uiDelegate(nullptr) @@ -125,15 +125,15 @@ const bool success = result == MailScheduler::ResultSuccess; - if (m_method == KCalCore::iTIPCounter) { + if (m_method == KCalendarCore::iTIPCounter) { // Here we're processing a counter-proposal that someone sent us and we're the organizer. // TODO: Shouldn't there be a test to see if we're the organizer? if (success) { // send update to all attendees Q_ASSERT(m_incidence); m_helper->setDialogParent(m_parentWidget); - m_helper->sendIncidenceModifiedMessage(KCalCore::iTIPRequest, - KCalCore::Incidence::Ptr(m_incidence->clone()), + m_helper->sendIncidenceModifiedMessage(KCalendarCore::iTIPRequest, + KCalendarCore::Incidence::Ptr(m_incidence->clone()), false); m_incidence.clear(); return; @@ -146,7 +146,7 @@ success ? QString() : i18n("Error: %1", errorMessage)); } -void ITIPHandler::Private::onHelperModifyDialogClosed(ITIPHandlerHelper::SendResult sendResult, KCalCore::iTIPMethod /*method*/, const KCalCore::Incidence::Ptr &) +void ITIPHandler::Private::onHelperModifyDialogClosed(ITIPHandlerHelper::SendResult sendResult, KCalendarCore::iTIPMethod /*method*/, const KCalendarCore::Incidence::Ptr &) { if (sendResult == ITIPHandlerHelper::ResultNoSendingNeeded || sendResult == ITIPHandlerHelper::ResultCanceled) { @@ -163,7 +163,7 @@ i18n("The groupware message for item '%1' " "was successfully sent.\nMethod: %2", m_queuedInvitation.incidence->summary(), - KCalCore::ScheduleMessage::methodName(m_queuedInvitation.method)), + KCalendarCore::ScheduleMessage::methodName(m_queuedInvitation.method)), i18n("Sending Free/Busy"), QStringLiteral("FreeBusyPublishSuccess")); } @@ -173,7 +173,7 @@ "%2 is request/reply/add/cancel/counter/etc.", "Unable to send the item '%1'.\nMethod: %2", m_queuedInvitation.incidence->summary(), - KCalCore::ScheduleMessage::methodName(m_queuedInvitation.method)); + KCalendarCore::ScheduleMessage::methodName(m_queuedInvitation.method)); if (m_parentWidget) { KMessageBox::error(m_parentWidget, error); } diff -Nru akonadi-calendar-19.04.3/src/itiphandler_p.h akonadi-calendar-19.12.3/src/itiphandler_p.h --- akonadi-calendar-19.04.3/src/itiphandler_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/itiphandler_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -25,7 +25,7 @@ #include "itiphandler.h" #include "itiphandlerhelper_p.h" -#include +#include #include #include @@ -38,8 +38,8 @@ QString receiver; QString iCal; QString action; - KCalCore::iTIPMethod method; - KCalCore::Incidence::Ptr incidence; + KCalendarCore::iTIPMethod method; + KCalendarCore::Incidence::Ptr incidence; }; /** @@ -77,8 +77,8 @@ CalendarBase::Ptr m_calendar; ITIPHandlerComponentFactory *m_factory = nullptr; MailScheduler *m_scheduler = nullptr; - KCalCore::Incidence::Ptr m_incidence; - KCalCore::iTIPMethod m_method; // METHOD field of ical rfc of incoming invitation + KCalendarCore::Incidence::Ptr m_incidence; + KCalendarCore::iTIPMethod m_method; // METHOD field of ical rfc of incoming invitation ITIPHandlerHelper *m_helper = nullptr; Operation m_currentOperation; QPointer m_parentWidget; // To be used for KMessageBoxes @@ -93,7 +93,7 @@ void onHelperFinished(Akonadi::ITIPHandlerHelper::SendResult result, const QString &errorMessage); - void onHelperModifyDialogClosed(ITIPHandlerHelper::SendResult result, KCalCore::iTIPMethod method, const KCalCore::Incidence::Ptr &incidence); + void onHelperModifyDialogClosed(ITIPHandlerHelper::SendResult result, KCalendarCore::iTIPMethod method, const KCalendarCore::Incidence::Ptr &incidence); void onCounterProposalDelegateFinished(bool success, const QString &errorMessage); }; diff -Nru akonadi-calendar-19.04.3/src/mailclient_p.cpp akonadi-calendar-19.12.3/src/mailclient_p.cpp --- akonadi-calendar-19.04.3/src/mailclient_p.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/mailclient_p.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -25,9 +25,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -53,29 +53,29 @@ { } -void MailClient::mailAttendees(const KCalCore::IncidenceBase::Ptr &incidence, +void MailClient::mailAttendees(const KCalendarCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, bool bccMe, const QString &attachment, const QString &mailTransport) { Q_ASSERT(incidence); - KCalCore::Attendee::List attendees = incidence->attendees(); + KCalendarCore::Attendee::List attendees = incidence->attendees(); if (attendees.isEmpty()) { qCWarning(AKONADICALENDAR_LOG) << "There are no attendees to e-mail"; emit finished(ResultNoAttendees, i18n("There are no attendees to e-mail")); return; } - const QString from = incidence->organizer()->fullName(); - const QString organizerEmail = incidence->organizer()->email(); + const QString from = incidence->organizer().fullName(); + const QString organizerEmail = incidence->organizer().email(); QStringList toList; QStringList ccList; const int numberOfAttendees = attendees.count(); for (int i = 0; i < numberOfAttendees; ++i) { - KCalCore::Attendee::Ptr a = attendees.at(i); + const KCalendarCore::Attendee a = attendees.at(i); - const QString email = a->email(); + const QString email = a.email(); if (email.isEmpty()) { continue; } @@ -88,11 +88,11 @@ } // Optional Participants and Non-Participants are copied on the email - if (a->role() == KCalCore::Attendee::OptParticipant || - a->role() == KCalCore::Attendee::NonParticipant) { - ccList << a->email(); + if (a.role() == KCalendarCore::Attendee::OptParticipant || + a.role() == KCalendarCore::Attendee::NonParticipant) { + ccList << a.email(); } else { - toList << a->email(); + toList << a.email(); } } if (toList.isEmpty() && ccList.isEmpty()) { @@ -103,16 +103,16 @@ } QString to; if (!toList.isEmpty()) { - to = toList.join(QStringLiteral(", ")); + to = toList.join(QLatin1String(", ")); } QString cc; if (!ccList.isEmpty()) { - cc = ccList.join(QStringLiteral(", ")); + cc = ccList.join(QLatin1String(", ")); } QString subject; - if (incidence->type() != KCalCore::Incidence::TypeFreeBusy) { - KCalCore::Incidence::Ptr inc = incidence.staticCast(); + if (incidence->type() != KCalendarCore::Incidence::TypeFreeBusy) { + KCalendarCore::Incidence::Ptr inc = incidence.staticCast(); subject = inc->summary(); } else { subject = i18n("Free Busy Object"); @@ -123,17 +123,17 @@ send(incidence, identity, from, to, cc, subject, body, false, bccMe, attachment, mailTransport); } -void MailClient::mailOrganizer(const KCalCore::IncidenceBase::Ptr &incidence, +void MailClient::mailOrganizer(const KCalendarCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, const QString &from, bool bccMe, const QString &attachment, const QString &sub, const QString &mailTransport) { - const QString to = incidence->organizer()->fullName(); + const QString to = incidence->organizer().fullName(); QString subject = sub; - if (incidence->type() != KCalCore::Incidence::TypeFreeBusy) { - KCalCore::Incidence::Ptr inc = incidence.staticCast(); + if (incidence->type() != KCalendarCore::Incidence::TypeFreeBusy) { + KCalendarCore::Incidence::Ptr inc = incidence.staticCast(); if (subject.isEmpty()) { subject = inc->summary(); } @@ -146,7 +146,7 @@ send(incidence, identity, from, to, QString(), subject, body, false, bccMe, attachment, mailTransport); } -void MailClient::mailTo(const KCalCore::IncidenceBase::Ptr &incidence, +void MailClient::mailTo(const KCalendarCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, const QString &from, bool bccMe, const QString &recipients, const QString &attachment, @@ -154,8 +154,8 @@ { QString subject; - if (incidence->type() != KCalCore::Incidence::TypeFreeBusy) { - KCalCore::Incidence::Ptr inc = incidence.staticCast(); + if (incidence->type() != KCalendarCore::Incidence::TypeFreeBusy) { + KCalendarCore::Incidence::Ptr inc = incidence.staticCast(); subject = inc->summary(); } else { subject = i18n("Free Busy Message"); @@ -179,7 +179,7 @@ return normalizedEmail; } -void MailClient::send(const KCalCore::IncidenceBase::Ptr &incidence, +void MailClient::send(const KCalendarCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, const QString &from, const QString &_to, const QString &cc, const QString &subject, diff -Nru akonadi-calendar-19.04.3/src/mailclient_p.h akonadi-calendar-19.12.3/src/mailclient_p.h --- akonadi-calendar-19.04.3/src/mailclient_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/mailclient_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -24,7 +24,7 @@ #include "akonadi-calendar_tests_export.h" #include "itiphandler.h" -#include +#include #include #include @@ -71,19 +71,19 @@ explicit MailClient(ITIPHandlerComponentFactory *factory, QObject *parent = nullptr); ~MailClient(); - void mailAttendees(const KCalCore::IncidenceBase::Ptr &incidence, + void mailAttendees(const KCalendarCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, bool bccMe, const QString &attachment = QString(), const QString &mailTransport = QString()); - void mailOrganizer(const KCalCore::IncidenceBase::Ptr &incidence, + void mailOrganizer(const KCalendarCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, const QString &from, bool bccMe, const QString &attachment = QString(), const QString &sub = QString(), const QString &mailTransport = QString()); - void mailTo(const KCalCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, + void mailTo(const KCalendarCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, const QString &from, bool bccMe, const QString &recipients, const QString &attachment = QString(), const QString &mailTransport = QString()); @@ -105,7 +105,7 @@ @param mailTransport defines the mail transport method. See here the kdepimlibs/mailtransport library. */ - void send(const KCalCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, const QString &from, const QString &to, + void send(const KCalendarCore::IncidenceBase::Ptr &incidence, const KIdentityManagement::Identity &identity, const QString &from, const QString &to, const QString &cc, const QString &subject, const QString &body, bool hidden = false, bool bccMe = false, const QString &attachment = QString(), const QString &mailTransport = QString()); diff -Nru akonadi-calendar-19.04.3/src/mailscheduler_p.cpp akonadi-calendar-19.12.3/src/mailscheduler_p.cpp --- akonadi-calendar-19.04.3/src/mailscheduler_p.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/mailscheduler_p.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -25,10 +25,9 @@ #include -#include -#include -#include -#include +#include +#include +#include #include #include @@ -41,7 +40,7 @@ class Q_DECL_HIDDEN MailScheduler::Private { public: - KIdentityManagement::Identity identityForIncidence(const KCalCore::IncidenceBase::Ptr &incidence) const; + KIdentityManagement::Identity identityForIncidence(const KCalendarCore::IncidenceBase::Ptr &incidence) const; KIdentityManagement::IdentityManager *m_identityManager = nullptr; MailClient *m_mailer = nullptr; @@ -62,14 +61,14 @@ delete d; } -KIdentityManagement::Identity MailScheduler::Private::identityForIncidence(const KCalCore::IncidenceBase::Ptr &incidence) const +KIdentityManagement::Identity MailScheduler::Private::identityForIncidence(const KCalendarCore::IncidenceBase::Ptr &incidence) const { const auto organizer = incidence->organizer(); - const QString organizerEmail = organizer ? organizer->email() : CalendarUtils::email(); + const QString organizerEmail = !organizer.isEmpty() ? organizer.email() : CalendarUtils::email(); return m_identityManager->identityForAddress(organizerEmail); } -void MailScheduler::publish(const KCalCore::IncidenceBase::Ptr &incidence, +void MailScheduler::publish(const KCalendarCore::IncidenceBase::Ptr &incidence, const QString &recipients) { Q_ASSERT(incidence); @@ -77,7 +76,7 @@ return; } - const QString messageText = mFormat->createScheduleMessage(incidence, KCalCore::iTIPPublish); + const QString messageText = mFormat->createScheduleMessage(incidence, KCalendarCore::iTIPPublish); d->m_mailer->mailTo(incidence, d->identityForIncidence(incidence), CalendarUtils::email(), @@ -85,8 +84,8 @@ CalendarSettings::self()->mailTransport()); } -void MailScheduler::performTransaction(const KCalCore::IncidenceBase::Ptr &incidence, - KCalCore::iTIPMethod method, +void MailScheduler::performTransaction(const KCalendarCore::IncidenceBase::Ptr &incidence, + KCalendarCore::iTIPMethod method, const QString &recipients) { Q_ASSERT(incidence); @@ -103,8 +102,8 @@ CalendarSettings::self()->mailTransport()); } -void MailScheduler::performTransaction(const KCalCore::IncidenceBase::Ptr &incidence, - KCalCore::iTIPMethod method) +void MailScheduler::performTransaction(const KCalendarCore::IncidenceBase::Ptr &incidence, + KCalendarCore::iTIPMethod method) { Q_ASSERT(incidence); if (!incidence) { @@ -113,18 +112,18 @@ const QString messageText = mFormat->createScheduleMessage(incidence, method); - if (method == KCalCore::iTIPRequest || - method == KCalCore::iTIPCancel || - method == KCalCore::iTIPAdd || - method == KCalCore::iTIPDeclineCounter) { + if (method == KCalendarCore::iTIPRequest || + method == KCalendarCore::iTIPCancel || + method == KCalendarCore::iTIPAdd || + method == KCalendarCore::iTIPDeclineCounter) { d->m_mailer->mailAttendees(incidence, d->identityForIncidence(incidence), CalendarSettings::self()->bcc(), messageText, CalendarSettings::self()->mailTransport()); } else { QString subject; - KCalCore::Incidence::Ptr inc = incidence.dynamicCast() ; - if (inc && method == KCalCore::iTIPCounter) { + KCalendarCore::Incidence::Ptr inc = incidence.dynamicCast() ; + if (inc && method == KCalendarCore::iTIPCounter) { subject = i18n("Counter proposal: %1", inc->summary()); } @@ -142,7 +141,7 @@ } //TODO: AKONADI_PORT review following code -void MailScheduler::acceptCounterProposal(const KCalCore::Incidence::Ptr &incidence, +void MailScheduler::acceptCounterProposal(const KCalendarCore::Incidence::Ptr &incidence, const Akonadi::CalendarBase::Ptr &calendar) { Q_ASSERT(incidence); @@ -153,19 +152,19 @@ Akonadi::Item exInc = calendar->item(incidence); if (!exInc.isValid()) { - KCalCore::Incidence::Ptr exIncidence = calendar->incidenceFromSchedulingID(incidence->uid()); + KCalendarCore::Incidence::Ptr exIncidence = calendar->incidenceFromSchedulingID(incidence->uid()); if (exIncidence) { exInc = calendar->item(exIncidence); } - //exInc = exIncItem.isValid() && exIncItem.hasPayload() ? - // exIncItem.payload() : KCalCore::Incidence::Ptr(); + //exInc = exIncItem.isValid() && exIncItem.hasPayload() ? + // exIncItem.payload() : KCalendarCore::Incidence::Ptr(); } incidence->setRevision(incidence->revision() + 1); Result result = ResultSuccess; - if (exInc.isValid() && exInc.hasPayload()) { - KCalCore::Incidence::Ptr exIncPtr = exInc.payload(); + if (exInc.isValid() && exInc.hasPayload()) { + KCalendarCore::Incidence::Ptr exIncPtr = exInc.payload(); incidence->setRevision(qMax(incidence->revision(), exIncPtr->revision() + 1)); // some stuff we don't want to change, just to be safe incidence->setSchedulingID(exIncPtr->schedulingID()); @@ -173,8 +172,8 @@ Q_ASSERT(exIncPtr && incidence); - KCalCore::IncidenceBase::Ptr i1 = exIncPtr; - KCalCore::IncidenceBase::Ptr i2 = incidence; + KCalendarCore::IncidenceBase::Ptr i1 = exIncPtr; + KCalendarCore::IncidenceBase::Ptr i2 = incidence; if (i1->type() == i2->type()) { *i1 = *i2; @@ -186,7 +185,7 @@ result = ResultModifyingError; } } else { - if (!calendar->addIncidence(KCalCore::Incidence::Ptr(incidence->clone()))) { + if (!calendar->addIncidence(KCalendarCore::Incidence::Ptr(incidence->clone()))) { result = ResultCreatingError; } } diff -Nru akonadi-calendar-19.04.3/src/mailscheduler_p.h akonadi-calendar-19.12.3/src/mailscheduler_p.h --- akonadi-calendar-19.04.3/src/mailscheduler_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/mailscheduler_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -23,7 +23,7 @@ #include "scheduler_p.h" #include "mailclient_p.h" -#include +#include #include namespace Akonadi @@ -43,14 +43,14 @@ explicit MailScheduler(ITIPHandlerComponentFactory *factory, QObject *parent = nullptr); ~MailScheduler() override; - void publish(const KCalCore::IncidenceBase::Ptr &incidence, + void publish(const KCalendarCore::IncidenceBase::Ptr &incidence, const QString &recipients) override; - void performTransaction(const KCalCore::IncidenceBase::Ptr &incidence, - KCalCore::iTIPMethod method) override; + void performTransaction(const KCalendarCore::IncidenceBase::Ptr &incidence, + KCalendarCore::iTIPMethod method) override; - void performTransaction(const KCalCore::IncidenceBase::Ptr &incidence, - KCalCore::iTIPMethod method, + void performTransaction(const KCalendarCore::IncidenceBase::Ptr &incidence, + KCalendarCore::iTIPMethod method, const QString &recipients) override; /** Returns the directory where the free-busy information is stored */ @@ -62,7 +62,7 @@ * @param calendar A loaded calendar. Try not to use an ETMCalendar here, due to it's * async loading. */ - void acceptCounterProposal(const KCalCore::Incidence::Ptr &incidence, + void acceptCounterProposal(const KCalendarCore::Incidence::Ptr &incidence, const Akonadi::CalendarBase::Ptr &calendar); private: diff -Nru akonadi-calendar-19.04.3/src/publishdialog.cpp akonadi-calendar-19.12.3/src/publishdialog.cpp --- akonadi-calendar-19.04.3/src/publishdialog.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/publishdialog.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -24,8 +24,8 @@ #include "publishdialog_p.h" -#include -#include +#include +#include #include @@ -37,7 +37,7 @@ #include #include -using namespace KCalCore; +using namespace KCalendarCore; using namespace Akonadi; PublishDialog::PublishDialog(QWidget *parent) @@ -108,12 +108,12 @@ QDesktopServices::openUrl(url); } -void PublishDialog::addAttendee(const Attendee::Ptr &attendee) +void PublishDialog::addAttendee(const Attendee &attendee) { d->mUI.mNameLineEdit->setEnabled(true); d->mUI.mEmailLineEdit->setEnabled(true); QListWidgetItem *item = new QListWidgetItem(d->mUI.mListWidget); - Person person(attendee->name(), attendee->email()); + Person person(attendee.name(), attendee.email()); item->setText(person.fullName()); d->mUI.mListWidget->addItem(item); d->mUI.mRemove->setEnabled(!d->mUI.mListWidget->selectedItems().isEmpty()); diff -Nru akonadi-calendar-19.04.3/src/publishdialog.h akonadi-calendar-19.12.3/src/publishdialog.h --- akonadi-calendar-19.04.3/src/publishdialog.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/publishdialog.h 2020-02-21 17:12:44.000000000 +0000 @@ -21,7 +21,7 @@ #include "akonadi-calendar_export.h" -#include +#include #include //TODO: documentation @@ -48,7 +48,7 @@ * Adds a new attendee to the dialog * @param attendee the attendee to add */ - void addAttendee(const KCalCore::Attendee::Ptr &attendee); + void addAttendee(const KCalendarCore::Attendee &attendee); /** * Returns a list of e-mail addresses. diff -Nru akonadi-calendar-19.04.3/src/publishdialog_p.cpp akonadi-calendar-19.12.3/src/publishdialog_p.cpp --- akonadi-calendar-19.04.3/src/publishdialog_p.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/publishdialog_p.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -21,14 +21,18 @@ #include "publishdialog_p.h" #include +#include #include -#include +#include + #include +#include +#include #include #include -using namespace KCalCore; +using namespace KCalendarCore; using namespace Akonadi; PublishDialog::Private::Private(PublishDialog *qq) : QObject(), q(qq) @@ -82,12 +86,33 @@ mUI.mListWidget->setCurrentRow(row); } +void PublishDialog::Private::insertAddresses(const KContacts::Addressee::List &list) +{ + for (const KContacts::Addressee &contact : list) { + mUI.mNameLineEdit->setEnabled(true); + mUI.mEmailLineEdit->setEnabled(true); + QListWidgetItem *item = new QListWidgetItem(mUI.mListWidget); + item->setSelected(true); + mUI.mNameLineEdit->setText(contact.name()); + mUI.mEmailLineEdit->setText(contact.preferredEmail()); + mUI.mListWidget->addItem(item); + } +} + + void PublishDialog::Private::openAddressbook() { - QPointer dialog( - new Akonadi::EmailAddressSelectionDialog(q)); - dialog->view()->view()->setSelectionMode(QAbstractItemView::MultiSelection); + QPointer dialog; + KPluginLoader loader(QStringLiteral("akonadi/emailaddressselectionldapdialogplugin")); + KPluginFactory *factory = loader.factory(); + if (factory) { + dialog = factory->create(q); + } else { + dialog = new Akonadi::EmailAddressSelectionDialog(q); + } + dialog->view()->view()->setSelectionMode(QAbstractItemView::MultiSelection); + connect(dialog.data(), &Akonadi::AbstractEmailAddressSelectionDialog::insertAddresses, this, &PublishDialog::Private::insertAddresses); if (dialog->exec() == QDialog::Accepted) { const Akonadi::EmailAddressSelection::List selections = dialog->selectedAddresses(); if (!selections.isEmpty()) { diff -Nru akonadi-calendar-19.04.3/src/publishdialog_p.h akonadi-calendar-19.12.3/src/publishdialog_p.h --- akonadi-calendar-19.04.3/src/publishdialog_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/publishdialog_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -22,16 +22,17 @@ #include "publishdialog.h" #include "ui_publishdialog_base.h" +#include namespace Akonadi { class Q_DECL_HIDDEN PublishDialog::Private : public QObject { - Q_OBJECT - + Q_OBJECT public: Private(PublishDialog *q); + void insertAddresses(const KContacts::Addressee::List &list); public Q_SLOTS: void addItem(); diff -Nru akonadi-calendar-19.04.3/src/scheduler_p.cpp akonadi-calendar-19.12.3/src/scheduler_p.cpp --- akonadi-calendar-19.04.3/src/scheduler_p.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/scheduler_p.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -23,15 +23,15 @@ #include -#include -#include +#include +#include #include "akonadicalendar_debug.h" #include #include #include -using namespace KCalCore; +using namespace KCalendarCore; using namespace Akonadi; struct Akonadi::Scheduler::Private { @@ -198,7 +198,7 @@ << "; incidence count = " << calendar->incidences().count(); } - for (const KCalCore::Incidence::Ptr &existingIncidence : existingIncidences) { + for (const KCalendarCore::Incidence::Ptr &existingIncidence : existingIncidences) { qCDebug(AKONADICALENDAR_LOG) << "Considering this found event (" << (existingIncidence->isReadOnly() ? "readonly" : "readwrite") << ") :" << mFormat->toString(existingIncidence); @@ -225,7 +225,7 @@ const Attendee::List attendees = existingIncidence->attendees(); Attendee::List::ConstIterator ait; for (ait = attendees.begin(); ait != attendees.end(); ++ait) { - if ((*ait)->email() == email && (*ait)->status() == Attendee::NeedsAction) { + if ((*ait).email() == email && (*ait).status() == Attendee::NeedsAction) { // This incidence wasn't created by me - it's probably in a shared folder // and meant for someone else, ignore it. qCDebug(AKONADICALENDAR_LOG) << "ignoring " << existingUid << " since I'm still NeedsAction there"; @@ -354,7 +354,7 @@ Result result = ResultIncidenceToDeleteNotFound; QString errorString = i18n("Could not find incidence to delete."); - foreach (const KCalCore::Incidence::Ptr &existingIncidence, existingIncidences) { + for (const KCalendarCore::Incidence::Ptr &existingIncidence : existingIncidences) { qCDebug(AKONADICALENDAR_LOG) << "Considering this found event (" << (existingIncidence->isReadOnly() ? "readonly" : "readwrite") << ") :" << mFormat->toString(existingIncidence); @@ -379,9 +379,9 @@ // on the invitation" case. So check the attendee status of the attendee. bool isMine = true; const Attendee::List attendees = existingIncidence->attendees(); - for (const KCalCore::Attendee::Ptr &attendee : attendees) { - if (attendee->email() == attendeeEmail && - attendee->status() == Attendee::NeedsAction) { + for (const KCalendarCore::Attendee &attendee : attendees) { + if (attendee.email() == attendeeEmail && + attendee.status() == Attendee::NeedsAction) { // This incidence wasn't created by me - it's probably in a shared // folder and meant for someone else, ignore it. qCDebug(AKONADICALENDAR_LOG) << "ignoring " << existingUid << " since I'm still NeedsAction there"; @@ -471,42 +471,37 @@ if (incidence) { //get matching attendee in calendar qCDebug(AKONADICALENDAR_LOG) << "match found!"; - Attendee::List attendeesIn = incidenceBase->attendees(); + const Attendee::List attendeesIn = incidenceBase->attendees(); Attendee::List attendeesNew; Attendee::List attendeesEv = incidence->attendees(); - Attendee::List::ConstIterator inIt; - Attendee::List::ConstIterator evIt; - for (inIt = attendeesIn.constBegin(); inIt != attendeesIn.constEnd(); ++inIt) { - Attendee::Ptr attIn = *inIt; + for (const auto &attIn : attendeesIn) { bool found = false; - for (evIt = attendeesEv.constBegin(); evIt != attendeesEv.constEnd(); ++evIt) { - Attendee::Ptr attEv = *evIt; - if (attIn->email().toLower() == attEv->email().toLower()) { + for (auto &attEv : attendeesEv) { + if (attIn.email().toLower() == attEv.email().toLower()) { //update attendee-info qCDebug(AKONADICALENDAR_LOG) << "update attendee"; - attEv->setStatus(attIn->status()); - attEv->setDelegate(attIn->delegate()); - attEv->setDelegator(attIn->delegator()); + attEv.setStatus(attIn.status()); + attEv.setDelegate(attIn.delegate()); + attEv.setDelegator(attIn.delegator()); result = ResultSuccess; errorString.clear(); found = true; } } - if (!found && attIn->status() != Attendee::Declined) { + if (!found && attIn.status() != Attendee::Declined) { attendeesNew.append(attIn); } } + incidence->setAttendees(attendeesEv); bool attendeeAdded = false; - for (Attendee::List::ConstIterator it = attendeesNew.constBegin(), end = attendeesNew.constEnd(); - it != end; ++it) { - Attendee::Ptr attNew = *it; + for (const auto &attNew : qAsConst(attendeesNew)) { QString msg = i18nc("@info", "%1 wants to attend %2 but was not invited.", - attNew->fullName(), incidence->summary()); - if (!attNew->delegator().isEmpty()) { + attNew.fullName(), incidence->summary()); + if (!attNew.delegator().isEmpty()) { msg = i18nc("@info", "%1 wants to attend %2 on behalf of %3.", - attNew->fullName(), incidence->summary(), attNew->delegator()); + attNew.fullName(), incidence->summary(), attNew.delegator()); } if (KMessageBox::questionYesNo( nullptr, msg, i18nc("@title", "Uninvited attendee"), @@ -515,15 +510,15 @@ Incidence::Ptr cancel = incidence; cancel->addComment(i18nc("@info", "The organizer rejected your attendance at this meeting.")); - performTransaction(incidenceBase, iTIPCancel, attNew->fullName()); + performTransaction(incidenceBase, iTIPCancel, attNew.fullName()); continue; } - Attendee::Ptr a(new Attendee(attNew->name(), attNew->email(), attNew->RSVP(), - attNew->status(), attNew->role(), attNew->uid())); + Attendee a(attNew.name(), attNew.email(), attNew.RSVP(), + attNew.status(), attNew.role(), attNew.uid()); - a->setDelegate(attNew->delegate()); - a->setDelegator(attNew->delegator()); + a.setDelegate(attNew.delegate()); + a.setDelegator(attNew.delegator()); incidence->addAttendee(a); result = ResultSuccess; @@ -617,14 +612,14 @@ qCDebug(AKONADICALENDAR_LOG) << "freeBusyDirName:" << freeBusyDir(); - Person::Ptr from; + Person from; if (method == iTIPPublish) { from = freebusy->organizer(); } if ((method == iTIPReply) && (freebusy->attendeeCount() == 1)) { - Attendee::Ptr attendee = freebusy->attendees().at(0); - from->setName(attendee->name()); - from->setEmail(attendee->email()); + Attendee attendee = freebusy->attendees().at(0); + from.setName(attendee.name()); + from.setEmail(attendee.email()); } if (!d->mFreeBusyCache->saveFreeBusy(freebusy, from)) { diff -Nru akonadi-calendar-19.04.3/src/scheduler_p.h akonadi-calendar-19.12.3/src/scheduler_p.h --- akonadi-calendar-19.04.3/src/scheduler_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/scheduler_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -22,13 +22,13 @@ #include "calendarbase.h" -#include -#include +#include +#include #include #include -namespace KCalCore +namespace KCalendarCore { class ICalFormat; class FreeBusyCache; @@ -75,7 +75,7 @@ * @param incidence the incidence to send * @param recipients the people to send it to */ - virtual void publish(const KCalCore::IncidenceBase::Ptr &incidence, + virtual void publish(const KCalendarCore::IncidenceBase::Ptr &incidence, const QString &recipients) = 0; /** Performs iTIP transaction on incidence. The method is specified as the @@ -84,8 +84,8 @@ @param incidence the incidence for the transaction. Must be valid. @param method the iTIP transaction method to use. */ - virtual void performTransaction(const KCalCore::IncidenceBase::Ptr &incidence, - KCalCore::iTIPMethod method) = 0; + virtual void performTransaction(const KCalendarCore::IncidenceBase::Ptr &incidence, + KCalendarCore::iTIPMethod method) = 0; /** Performs iTIP transaction on incidence to specified recipient(s). @@ -95,8 +95,8 @@ @param method the iTIP transaction method to use. @param recipients the receipients of the transaction. */ - virtual void performTransaction(const KCalCore::IncidenceBase::Ptr &incidence, - KCalCore::iTIPMethod method, + virtual void performTransaction(const KCalendarCore::IncidenceBase::Ptr &incidence, + KCalendarCore::iTIPMethod method, const QString &recipients) = 0; /** @@ -114,10 +114,10 @@ Listen to the acceptTransactionFinished() signal to know the success. */ - void acceptTransaction(const KCalCore::IncidenceBase::Ptr &incidence, + void acceptTransaction(const KCalendarCore::IncidenceBase::Ptr &incidence, const Akonadi::CalendarBase::Ptr &calendar, - KCalCore::iTIPMethod method, - KCalCore::ScheduleMessage::Status status, + KCalendarCore::iTIPMethod method, + KCalendarCore::ScheduleMessage::Status status, const QString &email = QString()); /** @@ -128,49 +128,49 @@ /** Sets the free/busy cache used to store free/busy information. */ - void setFreeBusyCache(KCalCore::FreeBusyCache *c); + void setFreeBusyCache(KCalendarCore::FreeBusyCache *c); /** Returns the free/busy cache. */ - KCalCore::FreeBusyCache *freeBusyCache() const; + KCalendarCore::FreeBusyCache *freeBusyCache() const; protected: - void acceptPublish(const KCalCore::IncidenceBase::Ptr &incidence, + void acceptPublish(const KCalendarCore::IncidenceBase::Ptr &incidence, const Akonadi::CalendarBase::Ptr &calendar, - KCalCore::ScheduleMessage::Status status, - KCalCore::iTIPMethod method); + KCalendarCore::ScheduleMessage::Status status, + KCalendarCore::iTIPMethod method); - void acceptRequest(const KCalCore::IncidenceBase::Ptr &incidence, + void acceptRequest(const KCalendarCore::IncidenceBase::Ptr &incidence, const Akonadi::CalendarBase::Ptr &calendar, - KCalCore::ScheduleMessage::Status status, + KCalendarCore::ScheduleMessage::Status status, const QString &email); - void acceptAdd(const KCalCore::IncidenceBase::Ptr &incidence, - KCalCore::ScheduleMessage::Status status); + void acceptAdd(const KCalendarCore::IncidenceBase::Ptr &incidence, + KCalendarCore::ScheduleMessage::Status status); - void acceptCancel(const KCalCore::IncidenceBase::Ptr &incidence, + void acceptCancel(const KCalendarCore::IncidenceBase::Ptr &incidence, const Akonadi::CalendarBase::Ptr &calendar, - KCalCore::ScheduleMessage::Status status, + KCalendarCore::ScheduleMessage::Status status, const QString &attendee); - void acceptDeclineCounter(const KCalCore::IncidenceBase::Ptr &incidence, - KCalCore::ScheduleMessage::Status status); + void acceptDeclineCounter(const KCalendarCore::IncidenceBase::Ptr &incidence, + KCalendarCore::ScheduleMessage::Status status); - void acceptReply(const KCalCore::IncidenceBase::Ptr &incidence, + void acceptReply(const KCalendarCore::IncidenceBase::Ptr &incidence, const Akonadi::CalendarBase::Ptr &calendar, - KCalCore::ScheduleMessage::Status status, - KCalCore::iTIPMethod method); + KCalendarCore::ScheduleMessage::Status status, + KCalendarCore::iTIPMethod method); - void acceptRefresh(const KCalCore::IncidenceBase::Ptr &incidence, - KCalCore::ScheduleMessage::Status status); + void acceptRefresh(const KCalendarCore::IncidenceBase::Ptr &incidence, + KCalendarCore::ScheduleMessage::Status status); - void acceptCounter(const KCalCore::IncidenceBase::Ptr &incidence, - KCalCore::ScheduleMessage::Status status); + void acceptCounter(const KCalendarCore::IncidenceBase::Ptr &incidence, + KCalendarCore::ScheduleMessage::Status status); - void acceptFreeBusy(const KCalCore::IncidenceBase::Ptr &incidence, - KCalCore::iTIPMethod method); - KCalCore::ICalFormat *mFormat = nullptr; + void acceptFreeBusy(const KCalendarCore::IncidenceBase::Ptr &incidence, + KCalendarCore::iTIPMethod method); + KCalendarCore::ICalFormat *mFormat = nullptr; Q_SIGNALS: void transactionFinished(Akonadi::Scheduler::Result, const QString &errorMessage); diff -Nru akonadi-calendar-19.04.3/src/standardcalendaractionmanager.cpp akonadi-calendar-19.12.3/src/standardcalendaractionmanager.cpp --- akonadi-calendar-19.04.3/src/standardcalendaractionmanager.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/standardcalendaractionmanager.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -348,7 +348,7 @@ const QModelIndex index = mItemSelectionModel->selectedRows().at(0); if (index.isValid()) { const QString mimeType = index.data(EntityTreeModel::MimeTypeRole).toString(); - if (mimeType == KCalCore::Event::eventMimeType()) { + if (mimeType == KCalendarCore::Event::eventMimeType()) { if (mGenericManager->action(Akonadi::StandardActionManager::CopyItems)) { mGenericManager->setActionText(Akonadi::StandardActionManager::CopyItems, ki18np("Copy Event", "Copy %1 Events")); @@ -381,7 +381,7 @@ if (act) { act->setText(i18n("Edit Event...")); } - } else if (mimeType == KCalCore::Todo::todoMimeType()) { + } else if (mimeType == KCalendarCore::Todo::todoMimeType()) { if (mGenericManager->action(Akonadi::StandardActionManager::CopyItems)) { mGenericManager->setActionText(Akonadi::StandardActionManager::CopyItems, ki18np("Copy To-do", "Copy %1 To-dos")); @@ -414,7 +414,7 @@ if (act) { act->setText(i18n("Edit To-do...")); } - } else if (mimeType == KCalCore::Journal::journalMimeType()) { + } else if (mimeType == KCalendarCore::Journal::journalMimeType()) { if (mGenericManager->action(Akonadi::StandardActionManager::CopyItems)) { mGenericManager->setActionText(Akonadi::StandardActionManager::CopyItems, ki18np("Copy Journal", "Copy %1 Journals")); @@ -454,15 +454,15 @@ // update action states QAction *act = mActions.value(StandardCalendarActionManager::CreateEvent); if (act) { - act->setEnabled(hasWritableCollection(KCalCore::Event::eventMimeType())); + act->setEnabled(hasWritableCollection(KCalendarCore::Event::eventMimeType())); } act = mActions.value(StandardCalendarActionManager::CreateTodo); if (act) { - act->setEnabled(hasWritableCollection(KCalCore::Todo::todoMimeType())); + act->setEnabled(hasWritableCollection(KCalendarCore::Todo::todoMimeType())); } act = mActions.value(StandardCalendarActionManager::CreateJournal); if (act) { - act->setEnabled(hasWritableCollection(KCalCore::Journal::journalMimeType())); + act->setEnabled(hasWritableCollection(KCalendarCore::Journal::journalMimeType())); } act = mActions.value(StandardCalendarActionManager::EditIncidence); @@ -492,9 +492,9 @@ if (itemCount == 1) { const Akonadi::Item item = mGenericManager->selectedItems().at(0); - if (item.isValid() && item.hasPayload()) { + if (item.isValid() && item.hasPayload()) { if (QAction *act = mActions.value(StandardCalendarActionManager::CreateSubTodo)) { - act->setEnabled(hasWritableCollection(KCalCore::Todo::todoMimeType())); + act->setEnabled(hasWritableCollection(KCalendarCore::Todo::todoMimeType())); } } } diff -Nru akonadi-calendar-19.04.3/src/standardcalendaractionmanager.h akonadi-calendar-19.12.3/src/standardcalendaractionmanager.h --- akonadi-calendar-19.04.3/src/standardcalendaractionmanager.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/standardcalendaractionmanager.h 2020-02-21 17:12:44.000000000 +0000 @@ -25,7 +25,7 @@ #include "akonadi-calendar_export.h" #include -#include +#include #include diff -Nru akonadi-calendar-19.04.3/src/todopurger.cpp akonadi-calendar-19.12.3/src/todopurger.cpp --- akonadi-calendar-19.04.3/src/todopurger.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/todopurger.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -22,7 +22,7 @@ #include "fetchjobcalendar.h" #include "utils_p.h" -#include +#include #include using namespace Akonadi; @@ -81,7 +81,7 @@ Akonadi::Item::List toDelete; m_ignoredItems = 0; for (const Akonadi::Item &item : items) { - KCalCore::Todo::Ptr todo = CalendarUtils::incidence(item).dynamicCast(); + KCalendarCore::Todo::Ptr todo = CalendarUtils::incidence(item).dynamicCast(); if (!todo || !todo->isCompleted()) { continue; @@ -110,7 +110,7 @@ m_changer->setGroupwareCommunication(oldGroupware); } -bool TodoPurger::Private::treeIsDeletable(const KCalCore::Todo::Ptr &todo) +bool TodoPurger::Private::treeIsDeletable(const KCalendarCore::Todo::Ptr &todo) { Q_ASSERT(todo); @@ -118,13 +118,13 @@ return false; } - const KCalCore::Incidence::List childs = m_calendar->childIncidences(todo->uid()); + const KCalendarCore::Incidence::List childs = m_calendar->childIncidences(todo->uid()); if (childs.isEmpty()) { return true; } - for (const KCalCore::Incidence::Ptr &child : childs) { - KCalCore::Todo::Ptr childTodo = child.dynamicCast(); + for (const KCalendarCore::Incidence::Ptr &child : childs) { + KCalendarCore::Todo::Ptr childTodo = child.dynamicCast(); if (!childTodo) { return false; // This never happens diff -Nru akonadi-calendar-19.04.3/src/todopurger_p.h akonadi-calendar-19.12.3/src/todopurger_p.h --- akonadi-calendar-19.04.3/src/todopurger_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/todopurger_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -44,7 +44,7 @@ bool m_calendarOwnership; // If false it's not ours. void deleteTodos(); - Q_REQUIRED_RESULT bool treeIsDeletable(const KCalCore::Todo::Ptr &todo); + Q_REQUIRED_RESULT bool treeIsDeletable(const KCalendarCore::Todo::Ptr &todo); public Q_SLOTS: void onCalendarLoaded(bool success, const QString &message); diff -Nru akonadi-calendar-19.04.3/src/utils_p.cpp akonadi-calendar-19.12.3/src/utils_p.cpp --- akonadi-calendar-19.04.3/src/utils_p.cpp 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/utils_p.cpp 2020-02-21 17:12:44.000000000 +0000 @@ -86,9 +86,9 @@ return emailSettings.getSetting(KEMailSettings::EmailAddress); } -bool Akonadi::CalendarUtils::thatIsMe(const KCalCore::Attendee::Ptr &attendee) +bool Akonadi::CalendarUtils::thatIsMe(const KCalendarCore::Attendee &attendee) { - return KIdentityManagement::thatIsMe(attendee->email()); + return KIdentityManagement::thatIsMe(attendee.email()); } bool Akonadi::CalendarUtils::thatIsMe(const QString &_email) @@ -114,13 +114,13 @@ return emails; } -KCalCore::Incidence::Ptr Akonadi::CalendarUtils::incidence(const Akonadi::Item &item) +KCalendarCore::Incidence::Ptr Akonadi::CalendarUtils::incidence(const Akonadi::Item &item) { // With this try-catch block, we get a 2x performance improvement in retrieving the payload // since we don't call hasPayload() try { - return item.payload(); + return item.payload(); } catch (const Akonadi::PayloadException &) { - return KCalCore::Incidence::Ptr(); + return KCalendarCore::Incidence::Ptr(); } } diff -Nru akonadi-calendar-19.04.3/src/utils_p.h akonadi-calendar-19.12.3/src/utils_p.h --- akonadi-calendar-19.04.3/src/utils_p.h 2019-06-24 05:02:00.000000000 +0000 +++ akonadi-calendar-19.12.3/src/utils_p.h 2020-02-21 17:12:44.000000000 +0000 @@ -21,7 +21,7 @@ #ifndef AKONADI_CALENDAR_UTILS_P_ #define AKONADI_CALENDAR_UTILS_P_ -#include +#include #include #include @@ -43,11 +43,11 @@ Q_REQUIRED_RESULT bool thatIsMe(const QString &email); //faster version, because we know that attendee->email() is only the email address -Q_REQUIRED_RESULT bool thatIsMe(const KCalCore::Attendee::Ptr &attendee); +Q_REQUIRED_RESULT bool thatIsMe(const KCalendarCore::Attendee &attendee); Q_REQUIRED_RESULT QStringList allEmails(); -Q_REQUIRED_RESULT KCalCore::Incidence::Ptr incidence(const Akonadi::Item &item); +Q_REQUIRED_RESULT KCalendarCore::Incidence::Ptr incidence(const Akonadi::Item &item); Q_REQUIRED_RESULT Akonadi::Collection selectCollection(QWidget *parent, int &dialogCode,