mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 19:38:09 +00:00
Fix translations on updated/cancelled invitations.
Remove join and share buttons if cancelled.
This commit is contained in:
Julien Wadel
parent
b98d5992e4
commit
9820979300
17 changed files with 37 additions and 35 deletions
|
|
@ -592,12 +592,12 @@ Server url ikke konfigureret.</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
|
|
|||
|
|
@ -592,12 +592,12 @@ Server URL ist nicht konfiguriert.</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
|
|
|||
|
|
@ -592,13 +592,13 @@ Server URL not configured.</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation>Meeting has been cancelled</translation>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation>Meeting has been updated</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation>Meeting has been updated</translation>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation>Meeting has been cancelled</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
|
|
|||
|
|
@ -592,12 +592,12 @@ URL del servidor no configurada.</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
|
|
|||
|
|
@ -592,12 +592,12 @@ URL du serveur non configurée.</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
|
|
|||
|
|
@ -590,12 +590,12 @@ A kiszolgáló URL-je nincs konfigurálva.</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
|
|
|||
|
|
@ -592,12 +592,12 @@ URL del server non configurato.</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
|
|
|||
|
|
@ -590,12 +590,12 @@
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
|
|
|||
|
|
@ -594,12 +594,12 @@ Nesukonfigūruotas serverio url.</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
|
|
|||
|
|
@ -592,12 +592,12 @@ URL do servidor não configurado.</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
|
|
|||
|
|
@ -594,12 +594,12 @@
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
|
|
|||
|
|
@ -592,12 +592,12 @@ Serverwebbadressen är inte konfigurerad.</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
|
|
|||
|
|
@ -590,12 +590,12 @@ Sunucu url'si yapılandırılmadı.</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
|
|
|||
|
|
@ -594,12 +594,12 @@
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
|
|
|||
|
|
@ -590,12 +590,12 @@
|
|||
</message>
|
||||
<message>
|
||||
<source>icsUpdatedMeetingInvite</source>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>icsCancelledMeetingInvite</source>
|
||||
<extracomment>'Meeting has been updated' : ICS title for an updated invitation.</extracomment>
|
||||
<extracomment>'Meeting has been cancelled' : ICS title for a cancelled invitation.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue