mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-05-06 20:23:08 +00:00
Remove "do not disturb" status as it is not really supported.
This commit is contained in:
Julien Wadel
parent
6c031a97fc
commit
990dbc610a
19 changed files with 87 additions and 72 deletions
|
|
@ -2465,10 +2465,6 @@ Klikněte zde: <a href="%1">%1</a>
|
|||
<source>presenceOnline</source>
|
||||
<translation>Dostupné</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>Zaneprázdněný</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>Nerušit</translation>
|
||||
|
|
@ -2477,6 +2473,11 @@ Klikněte zde: <a href="%1">%1</a>
|
|||
<source>presenceOffline</source>
|
||||
<translation>Offline</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">Nepřítomný</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2451,10 +2451,6 @@ Klik her: <a href="%1">%1</a>
|
|||
<source>presenceOnline</source>
|
||||
<translation>Tilgængelig</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>Optaget</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>Forstyr ikke</translation>
|
||||
|
|
@ -2463,6 +2459,11 @@ Klik her: <a href="%1">%1</a>
|
|||
<source>presenceOffline</source>
|
||||
<translation>Offline</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">Fraværende</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2451,10 +2451,6 @@ Klicken Sie hier: <a href="%1">%1</a>
|
|||
<source>presenceOnline</source>
|
||||
<translation>Verfügbar</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>Besetzt</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>Nicht stören</translation>
|
||||
|
|
@ -2463,6 +2459,11 @@ Klicken Sie hier: <a href="%1">%1</a>
|
|||
<source>presenceOffline</source>
|
||||
<translation>Offline</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">Abwesend</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2452,10 +2452,6 @@ Click here: <a href="%1">%1</a>
|
|||
<source>presenceOnline</source>
|
||||
<translation>Available</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>Busy</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>Do not disturb</translation>
|
||||
|
|
@ -2464,6 +2460,11 @@ Click here: <a href="%1">%1</a>
|
|||
<source>presenceOffline</source>
|
||||
<translation>Offline</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation>Away</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2451,10 +2451,6 @@ Haga clic aquí: <a href="%1">%1 </a>
|
|||
<source>presenceOnline</source>
|
||||
<translation>Disponible</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>Ocupado</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>No molestar</translation>
|
||||
|
|
@ -2463,6 +2459,11 @@ Haga clic aquí: <a href="%1">%1 </a>
|
|||
<source>presenceOffline</source>
|
||||
<translation>Desconectado</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">Ausente</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2451,10 +2451,6 @@ Cliquez ici : <a href="%1">%1</a>
|
|||
<source>presenceOnline</source>
|
||||
<translation>En ligne</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>Occupé</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>Ne pas déranger</translation>
|
||||
|
|
@ -2463,6 +2459,11 @@ Cliquez ici : <a href="%1">%1</a>
|
|||
<source>presenceOffline</source>
|
||||
<translation>Hors-ligne</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">Absent</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2438,10 +2438,6 @@ Kattintson ide: <a href="%1">%1</a>
|
|||
<source>presenceOnline</source>
|
||||
<translation>Elérhető</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>Elfoglalt</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>Ne zavarjanak</translation>
|
||||
|
|
@ -2450,6 +2446,11 @@ Kattintson ide: <a href="%1">%1</a>
|
|||
<source>presenceOffline</source>
|
||||
<translation>Kapcsolat nélküli</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">Hiányzó</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2451,10 +2451,6 @@ Clicca: <a href="%1">%1</a>
|
|||
<source>presenceOnline</source>
|
||||
<translation>Disponibile</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>Occupato</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>Non disturbare</translation>
|
||||
|
|
@ -2463,6 +2459,11 @@ Clicca: <a href="%1">%1</a>
|
|||
<source>presenceOffline</source>
|
||||
<translation>Offline</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">Assente</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2438,10 +2438,6 @@
|
|||
<source>presenceOnline</source>
|
||||
<translation>利用可能</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>話中</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>不在</translation>
|
||||
|
|
@ -2450,6 +2446,11 @@
|
|||
<source>presenceOffline</source>
|
||||
<translation>オフライン</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">不在</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2464,10 +2464,6 @@ Spustelėkite čia: <a href="%1">%1</a>
|
|||
<source>presenceOnline</source>
|
||||
<translation>Pasiekiamas</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>Užsiėmęs</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>Netrukdyti</translation>
|
||||
|
|
@ -2476,6 +2472,11 @@ Spustelėkite čia: <a href="%1">%1</a>
|
|||
<source>presenceOffline</source>
|
||||
<translation>Atsijungęs</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">Nėra</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2451,10 +2451,6 @@ Clique aqui: <a href="%1">%1 </a>
|
|||
<source>presenceOnline</source>
|
||||
<translation>Disponível</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>Ocupado</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>Não perturbe</translation>
|
||||
|
|
@ -2463,6 +2459,11 @@ Clique aqui: <a href="%1">%1 </a>
|
|||
<source>presenceOffline</source>
|
||||
<translation>Offline</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">Ausente</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2464,10 +2464,6 @@
|
|||
<source>presenceOnline</source>
|
||||
<translation>Доступен</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>Занят</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>Не беспокоить</translation>
|
||||
|
|
@ -2476,6 +2472,11 @@
|
|||
<source>presenceOffline</source>
|
||||
<translation>Офлайн</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">Отсутствующий</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2451,10 +2451,6 @@ Klicka här: <a href="%1">%1</a>
|
|||
<source>presenceOnline</source>
|
||||
<translation>Tillgänglig</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>Upptagen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>Stör inte</translation>
|
||||
|
|
@ -2463,6 +2459,11 @@ Klicka här: <a href="%1">%1</a>
|
|||
<source>presenceOffline</source>
|
||||
<translation>Frånkopplad</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">Frånvarande</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2438,10 +2438,6 @@ Buraya tıklayın: <a href="%1">%1</a>
|
|||
<source>presenceOnline</source>
|
||||
<translation>Uygun</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>Meşgul</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>Rahatsız etme</translation>
|
||||
|
|
@ -2450,6 +2446,11 @@ Buraya tıklayın: <a href="%1">%1</a>
|
|||
<source>presenceOffline</source>
|
||||
<translation>Çevrim dışı</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">Mevcut olmayan</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2464,10 +2464,6 @@
|
|||
<source>presenceOnline</source>
|
||||
<translation>Доступний</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>Зайнятий</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>Не бентежити</translation>
|
||||
|
|
@ -2476,6 +2472,11 @@
|
|||
<source>presenceOffline</source>
|
||||
<translation>Не в мережі</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">Відсутній</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -2438,10 +2438,6 @@
|
|||
<source>presenceOnline</source>
|
||||
<translation>有空</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceBusy</source>
|
||||
<translation>忙碌</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceDoNotDisturb</source>
|
||||
<translation>请勿打扰</translation>
|
||||
|
|
@ -2450,6 +2446,11 @@
|
|||
<source>presenceOffline</source>
|
||||
<translation>离线</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>presenceAway</source>
|
||||
<extracomment>'Away' : presence label when user is away.</extracomment>
|
||||
<translation type="unfinished">缺席的</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PresenceLevel</name>
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ QVariantList OwnPresenceModel::getStatuses () const {
|
|||
|
||||
addBuildStatus(statuses, Presence::Online);
|
||||
addBuildStatus(statuses, Presence::Busy);
|
||||
addBuildStatus(statuses, Presence::DoNotDisturb);
|
||||
//addBuildStatus(statuses, Presence::DoNotDisturb); // Do not propose this status as it is not fully supported
|
||||
//addBuildStatus(statuses, Presence::Offline); // Do not propose this status as it is not fully supported
|
||||
|
||||
return statuses;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ Presence::PresenceLevel Presence::getPresenceLevel (const linphone::Consolidated
|
|||
case linphone::ConsolidatedPresence::Busy:
|
||||
return Orange;
|
||||
case linphone::ConsolidatedPresence::DoNotDisturb:
|
||||
return Red;
|
||||
return Orange;// Use Red when DND is fully supported.
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
@ -47,14 +47,13 @@ QString Presence::getPresenceStatusAsString (const linphone::ConsolidatedPresenc
|
|||
switch (status) {
|
||||
case linphone::ConsolidatedPresence::Online:
|
||||
return tr("presenceOnline");
|
||||
case linphone::ConsolidatedPresence::Busy:
|
||||
return tr("presenceBusy");
|
||||
case linphone::ConsolidatedPresence::DoNotDisturb:
|
||||
return tr("presenceDoNotDisturb");
|
||||
case linphone::ConsolidatedPresence::Busy: case linphone::ConsolidatedPresence::DoNotDisturb:
|
||||
//: 'Away' : presence label when user is away.
|
||||
return tr("presenceAway");
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
QString dummy = tr("presenceDoNotDisturb");// Dnd is not yet fully supported. Keep this line in order to not loss translations.
|
||||
return tr("presenceOffline");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ Loader{// Use of Loader because of Repeater (items cannot be loaded dynamically)
|
|||
Component.onCompleted: messagesTextsList.updateBestWidth()
|
||||
delegate:
|
||||
ChatTextMessage {
|
||||
width: parent && parent.width
|
||||
width: parent ? parent.width : 0
|
||||
contentModel: $modelData
|
||||
onLastTextSelectedChanged: mainItem.lastTextSelectedChanged(lastTextSelected)
|
||||
color: mainItem.useTextColor
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue