Commit 26c940c0 authored by Allen Winter's avatar Allen Winter
Browse files

Merge branch 'release/20.04'

parents 38591597 5f1be6ec
cmake_minimum_required(VERSION 3.5)
# Do NOT add quote
set(KDEPIM_DEV_VERSION beta1)
set(KDEPIM_DEV_VERSION rc)
# add an extra space
if(DEFINED KDEPIM_DEV_VERSION)
set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
endif()
set(KDEPIM_VERSION_NUMBER "5.13.80")
set(RELEASE_SERVICE_VERSION "20.03.80")
set(KDEPIM_VERSION_NUMBER "5.13.90")
set(RELEASE_SERVICE_VERSION "20.03.90")
set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})")
......
......@@ -309,7 +309,7 @@ public:
const Akonadi::Collection::Id colId = collection.id();
if (colId == CalendarSupport::KCalPrefs::instance()->defaultCalendarId()) {
return i18nc("this is the default calendar", "%1 (Default Calendar)", collection.displayName());
return i18nc("this is the default calendar", "%1 (Default)", collection.displayName());
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment