diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index 61f6f1661..e3a96b37a 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -592,12 +592,12 @@ Server url ikke konfigureret. icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. + 'Meeting has been updated' : ICS title for an updated invitation. icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. + 'Meeting has been cancelled' : ICS title for a cancelled invitation. diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index 2ee87c2af..844e7c198 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -592,12 +592,12 @@ Server URL ist nicht konfiguriert. icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. + 'Meeting has been updated' : ICS title for an updated invitation. icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. + 'Meeting has been cancelled' : ICS title for a cancelled invitation. diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index 56d889f53..dc5afd344 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -592,13 +592,13 @@ Server URL not configured. icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. - Meeting has been cancelled + 'Meeting has been updated' : ICS title for an updated invitation. + Meeting has been updated icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. - Meeting has been updated + 'Meeting has been cancelled' : ICS title for a cancelled invitation. + Meeting has been cancelled diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index 59b6550b3..8b0fe63f2 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -592,12 +592,12 @@ URL del servidor no configurada. icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. + 'Meeting has been updated' : ICS title for an updated invitation. icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. + 'Meeting has been cancelled' : ICS title for a cancelled invitation. diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index 1febcb7f9..35119b129 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -592,12 +592,12 @@ URL du serveur non configurée. icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. + 'Meeting has been updated' : ICS title for an updated invitation. icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. + 'Meeting has been cancelled' : ICS title for a cancelled invitation. diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index 08597a416..04dfe70b3 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -590,12 +590,12 @@ A kiszolgáló URL-je nincs konfigurálva. icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. + 'Meeting has been updated' : ICS title for an updated invitation. icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. + 'Meeting has been cancelled' : ICS title for a cancelled invitation. diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index f72787403..4a6f2dcf6 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -592,12 +592,12 @@ URL del server non configurato. icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. + 'Meeting has been updated' : ICS title for an updated invitation. icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. + 'Meeting has been cancelled' : ICS title for a cancelled invitation. diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index 652fbe28a..dffdaf34b 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -590,12 +590,12 @@ icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. + 'Meeting has been updated' : ICS title for an updated invitation. icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. + 'Meeting has been cancelled' : ICS title for a cancelled invitation. diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index ce36b7937..83af8a769 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -594,12 +594,12 @@ Nesukonfigūruotas serverio url. icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. + 'Meeting has been updated' : ICS title for an updated invitation. icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. + 'Meeting has been cancelled' : ICS title for a cancelled invitation. diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index 477bbb69c..018250531 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -592,12 +592,12 @@ URL do servidor não configurado. icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. + 'Meeting has been updated' : ICS title for an updated invitation. icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. + 'Meeting has been cancelled' : ICS title for a cancelled invitation. diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index 3bfa7e2bd..08d6685a1 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -594,12 +594,12 @@ icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. + 'Meeting has been updated' : ICS title for an updated invitation. icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. + 'Meeting has been cancelled' : ICS title for a cancelled invitation. diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index b8e771b3e..9cb8d95f9 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -592,12 +592,12 @@ Serverwebbadressen är inte konfigurerad. icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. + 'Meeting has been updated' : ICS title for an updated invitation. icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. + 'Meeting has been cancelled' : ICS title for a cancelled invitation. diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index 5d86724a8..6e27182c9 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -590,12 +590,12 @@ Sunucu url'si yapılandırılmadı. icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. + 'Meeting has been updated' : ICS title for an updated invitation. icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. + 'Meeting has been cancelled' : ICS title for a cancelled invitation. diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index 3e395ece3..34b2a7ac4 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -594,12 +594,12 @@ icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. + 'Meeting has been updated' : ICS title for an updated invitation. icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. + 'Meeting has been cancelled' : ICS title for a cancelled invitation. diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index 55b5ddf4f..a1b330e17 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -590,12 +590,12 @@ icsUpdatedMeetingInvite - 'Meeting has been cancelled' : ICS title for a cancelled invitation. + 'Meeting has been updated' : ICS title for an updated invitation. icsCancelledMeetingInvite - 'Meeting has been updated' : ICS title for an updated invitation. + 'Meeting has been cancelled' : ICS title for a cancelled invitation. diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatConferenceInvitationMessage.qml b/linphone-app/ui/modules/Linphone/Chat/ChatConferenceInvitationMessage.qml index 27a9669ac..80aea114e 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatConferenceInvitationMessage.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatConferenceInvitationMessage.qml @@ -87,10 +87,10 @@ Loader{ font.pointSize: ChatCalendarMessageStyle.type.pointSize font.weight: Font.Bold text: (mainItem.conferenceInfoModel.state == LinphoneEnums.ConferenceInfoStateUpdated - //: 'Meeting has been cancelled' : ICS title for a cancelled invitation. + //: 'Meeting has been updated' : ICS title for an updated invitation. ? qsTr('icsUpdatedMeetingInvite') : mainItem.conferenceInfoModel.state == LinphoneEnums.ConferenceInfoStateCancelled - //: 'Meeting has been updated' : ICS title for an updated invitation. + //: 'Meeting has been cancelled' : ICS title for a cancelled invitation. ? qsTr('icsCancelledMeetingInvite') //: 'Meeting invite' : ICS title that is an invitation. : qsTr('icsMeetingInvite') @@ -264,6 +264,7 @@ Loader{ } ActionButton{ id: shareButton + visible: joinButton.visible iconSize: joinButton.height/2 isCustom: true colorSet: ChatCalendarMessageStyle.shareButton @@ -276,6 +277,7 @@ Loader{ TextButtonC{ id: joinButton addHeight: 20 + visible: mainItem.conferenceInfoModel.state != LinphoneEnums.ConferenceInfoStateCancelled //: 'Join' : Action button to join the conference. text: qsTr('icsJoinButton').toUpperCase() onClicked: CallsListModel.prepareConferenceCall(mainItem.conferenceInfoModel) diff --git a/linphone-app/ui/modules/Linphone/Contact/Contact.qml b/linphone-app/ui/modules/Linphone/Contact/Contact.qml index a59fc1e98..81a7a73f2 100644 --- a/linphone-app/ui/modules/Linphone/Contact/Contact.qml +++ b/linphone-app/ui/modules/Linphone/Contact/Contact.qml @@ -36,7 +36,7 @@ Rectangle { ? entry.contactModel.vcard.username : UtilsCpp.getDisplayName(entry.sipAddress || entry.fullPeerAddress || entry.peerAddress || '') : '' - property string organizer: entry.conferenceInfoModel ? UtilsCpp.getDisplayName(entry.conferenceInfoModel.organizer) : '' + property string organizer: entry && entry.conferenceInfoModel ? UtilsCpp.getDisplayName(entry.conferenceInfoModel.organizer) : '' signal avatarClicked(var mouse) // ---------------------------------------------------------------------------