diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index 2817fa3..c578bb9 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -24,7 +24,7 @@ Page { spacing: Theme.paddingMedium //: App version Label { text: qsTr("Versioun"); color: Theme.primaryColor } - Label { text: "2.3-2"; color: Theme.highlightColor } + Label { text: "2.3-3"; color: Theme.highlightColor } Label { text: qsTr("Debug-Modus"); visible: debug; color: Theme.secondaryColor } } diff --git a/qml/pages/EventPage.qml b/qml/pages/EventPage.qml index 1a12249..00ede8c 100644 --- a/qml/pages/EventPage.qml +++ b/qml/pages/EventPage.qml @@ -69,6 +69,7 @@ Page { Button { anchors.horizontalCenter: parent.horizontalCenter visible: event.ics_url.length > 0 + enabled: !appSettings.alternativeAPI //: Import the event into the calendar text: qsTr("An de Kalenner importéieren") DBusInterface { diff --git a/qml/pages/EventsPage.qml b/qml/pages/EventsPage.qml index 2bc0b88..1f5aff3 100644 --- a/qml/pages/EventsPage.qml +++ b/qml/pages/EventsPage.qml @@ -46,7 +46,7 @@ Page { header: PageHeader { //: Header of the events page - title: qsTr("Agenda") + title: qsTr("ACEL Agenda") } model: JSONListModel { diff --git a/qml/pages/SettingsPage.qml b/qml/pages/SettingsPage.qml index c06b199..2b6e57c 100644 --- a/qml/pages/SettingsPage.qml +++ b/qml/pages/SettingsPage.qml @@ -116,8 +116,8 @@ Page { } SectionHeader { - //: API (Application Programmable Interface) - text: qsTr("API") + //: AcelApi (Application Programmable Interface) + text: qsTr("AcelApi") } TextSwitch { //: Alternative API diff --git a/rpm/harbour-lidderbuch.changes b/rpm/harbour-lidderbuch.changes index ae9c1f6..1f04e25 100644 --- a/rpm/harbour-lidderbuch.changes +++ b/rpm/harbour-lidderbuch.changes @@ -8,6 +8,9 @@ # * date Author's Name version-release # - Summary of changes +* Mon Apr 02 2018 Scharel Clemens 2.3-3 +- Disable calendar import when using the alternative API + * Mon Mar 26 2018 Scharel Clemens 2.3-2 - Alternative API on https://www.scharel.name/harbour/lidderbuch/ - Fixed issue #8 about the cover action diff --git a/rpm/harbour-lidderbuch.spec b/rpm/harbour-lidderbuch.spec index 8c43bac..ecfc620 100644 --- a/rpm/harbour-lidderbuch.spec +++ b/rpm/harbour-lidderbuch.spec @@ -14,7 +14,7 @@ Name: harbour-lidderbuch %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: ACEL Lidderbuch Version: 2.3 -Release: 2 +Release: 3 Group: Qt/Qt License: LICENSE URL: http://example.org/ diff --git a/rpm/harbour-lidderbuch.yaml b/rpm/harbour-lidderbuch.yaml index dc700a3..d18aac8 100644 --- a/rpm/harbour-lidderbuch.yaml +++ b/rpm/harbour-lidderbuch.yaml @@ -1,7 +1,7 @@ Name: harbour-lidderbuch Summary: ACEL Lidderbuch Version: 2.3 -Release: 2 +Release: 3 # The contents of the Group field should be one of the groups listed here: # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS Group: Qt/Qt diff --git a/translations/harbour-lidderbuch.ts b/translations/harbour-lidderbuch.ts index f43c9f8..4b22a78 100644 --- a/translations/harbour-lidderbuch.ts +++ b/translations/harbour-lidderbuch.ts @@ -204,11 +204,6 @@ Updated - - Agenda - Header of the events page - - Näischt an der Agenda No envent available @@ -233,6 +228,11 @@ never + + ACEL Agenda + Header of the events page + + SettingsPage @@ -330,11 +330,6 @@ Section to manipulate the look of the SongPage - - API - API (Application Programmable Interface) - - Alternativ API Alternative API @@ -345,6 +340,11 @@ Use this if you have problems with the API + + AcelApi + AcelApi (Application Programmable Interface) + + SongPage