diff --git a/linphone-app/assets/languages/cs.ts b/linphone-app/assets/languages/cs.ts index 5acbd0af2..ad5171a17 100644 --- a/linphone-app/assets/languages/cs.ts +++ b/linphone-app/assets/languages/cs.ts @@ -2465,10 +2465,6 @@ Klikněte zde: <a href="%1">%1</a> presenceOnline Dostupné - - presenceBusy - Zaneprázdněný - presenceDoNotDisturb Nerušit @@ -2477,6 +2473,11 @@ Klikněte zde: <a href="%1">%1</a> presenceOffline Offline + + presenceAway + 'Away' : presence label when user is away. + Nepřítomný + PresenceLevel diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index 59d950a04..cd4a84f6f 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -2451,10 +2451,6 @@ Klik her: <a href="%1">%1</a> presenceOnline Tilgængelig - - presenceBusy - Optaget - presenceDoNotDisturb Forstyr ikke @@ -2463,6 +2459,11 @@ Klik her: <a href="%1">%1</a> presenceOffline Offline + + presenceAway + 'Away' : presence label when user is away. + Fraværende + PresenceLevel diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index 3f92e6979..cfb708205 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -2451,10 +2451,6 @@ Klicken Sie hier: <a href="%1">%1</a> presenceOnline Verfügbar - - presenceBusy - Besetzt - presenceDoNotDisturb Nicht stören @@ -2463,6 +2459,11 @@ Klicken Sie hier: <a href="%1">%1</a> presenceOffline Offline + + presenceAway + 'Away' : presence label when user is away. + Abwesend + PresenceLevel diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index 3937bb0bf..143cfb87f 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -2452,10 +2452,6 @@ Click here: <a href="%1">%1</a> presenceOnline Available - - presenceBusy - Busy - presenceDoNotDisturb Do not disturb @@ -2464,6 +2460,11 @@ Click here: <a href="%1">%1</a> presenceOffline Offline + + presenceAway + 'Away' : presence label when user is away. + Away + PresenceLevel diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index 171417aef..16953639b 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -2451,10 +2451,6 @@ Haga clic aquí: <a href="%1">%1 </a> presenceOnline Disponible - - presenceBusy - Ocupado - presenceDoNotDisturb No molestar @@ -2463,6 +2459,11 @@ Haga clic aquí: <a href="%1">%1 </a> presenceOffline Desconectado + + presenceAway + 'Away' : presence label when user is away. + Ausente + PresenceLevel diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index b52916cda..a132abd38 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -2451,10 +2451,6 @@ Cliquez ici : <a href="%1">%1</a> presenceOnline En ligne - - presenceBusy - Occupé - presenceDoNotDisturb Ne pas déranger @@ -2463,6 +2459,11 @@ Cliquez ici : <a href="%1">%1</a> presenceOffline Hors-ligne + + presenceAway + 'Away' : presence label when user is away. + Absent + PresenceLevel diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index c39173b94..a117ec8ef 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -2438,10 +2438,6 @@ Kattintson ide: <a href="%1">%1</a> presenceOnline Elérhető - - presenceBusy - Elfoglalt - presenceDoNotDisturb Ne zavarjanak @@ -2450,6 +2446,11 @@ Kattintson ide: <a href="%1">%1</a> presenceOffline Kapcsolat nélküli + + presenceAway + 'Away' : presence label when user is away. + Hiányzó + PresenceLevel diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index 9b39b8210..5285dafe9 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -2451,10 +2451,6 @@ Clicca: <a href="%1">%1</a> presenceOnline Disponibile - - presenceBusy - Occupato - presenceDoNotDisturb Non disturbare @@ -2463,6 +2459,11 @@ Clicca: <a href="%1">%1</a> presenceOffline Offline + + presenceAway + 'Away' : presence label when user is away. + Assente + PresenceLevel diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index 0f6a05cc4..bdca01705 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -2438,10 +2438,6 @@ presenceOnline 利用可能 - - presenceBusy - 話中 - presenceDoNotDisturb 不在 @@ -2450,6 +2446,11 @@ presenceOffline オフライン + + presenceAway + 'Away' : presence label when user is away. + 不在 + PresenceLevel diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index 52a879e0f..5ed352c0d 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -2464,10 +2464,6 @@ Spustelėkite čia: <a href="%1">%1</a> presenceOnline Pasiekiamas - - presenceBusy - Užsiėmęs - presenceDoNotDisturb Netrukdyti @@ -2476,6 +2472,11 @@ Spustelėkite čia: <a href="%1">%1</a> presenceOffline Atsijungęs + + presenceAway + 'Away' : presence label when user is away. + Nėra + PresenceLevel diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index cb98f6a80..e7a018520 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -2451,10 +2451,6 @@ Clique aqui: <a href="%1">%1 </a> presenceOnline Disponível - - presenceBusy - Ocupado - presenceDoNotDisturb Não perturbe @@ -2463,6 +2459,11 @@ Clique aqui: <a href="%1">%1 </a> presenceOffline Offline + + presenceAway + 'Away' : presence label when user is away. + Ausente + PresenceLevel diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index 323d5b013..688391ce0 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -2464,10 +2464,6 @@ presenceOnline Доступен - - presenceBusy - Занят - presenceDoNotDisturb Не беспокоить @@ -2476,6 +2472,11 @@ presenceOffline Офлайн + + presenceAway + 'Away' : presence label when user is away. + Отсутствующий + PresenceLevel diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index 56b3acffd..1931536aa 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -2451,10 +2451,6 @@ Klicka här: <a href="%1">%1</a> presenceOnline Tillgänglig - - presenceBusy - Upptagen - presenceDoNotDisturb Stör inte @@ -2463,6 +2459,11 @@ Klicka här: <a href="%1">%1</a> presenceOffline Frånkopplad + + presenceAway + 'Away' : presence label when user is away. + Frånvarande + PresenceLevel diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index 2ab5b2054..b4de956a3 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -2438,10 +2438,6 @@ Buraya tıklayın: <a href="%1">%1</a> presenceOnline Uygun - - presenceBusy - Meşgul - presenceDoNotDisturb Rahatsız etme @@ -2450,6 +2446,11 @@ Buraya tıklayın: <a href="%1">%1</a> presenceOffline Çevrim dışı + + presenceAway + 'Away' : presence label when user is away. + Mevcut olmayan + PresenceLevel diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index 1a1fc9904..7da386180 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -2464,10 +2464,6 @@ presenceOnline Доступний - - presenceBusy - Зайнятий - presenceDoNotDisturb Не бентежити @@ -2476,6 +2472,11 @@ presenceOffline Не в мережі + + presenceAway + 'Away' : presence label when user is away. + Відсутній + PresenceLevel diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index 6e707ae64..8e94471c4 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -2438,10 +2438,6 @@ presenceOnline 有空 - - presenceBusy - 忙碌 - presenceDoNotDisturb 请勿打扰 @@ -2450,6 +2446,11 @@ presenceOffline 离线 + + presenceAway + 'Away' : presence label when user is away. + 缺席的 + PresenceLevel diff --git a/linphone-app/src/components/presence/OwnPresenceModel.cpp b/linphone-app/src/components/presence/OwnPresenceModel.cpp index 8d5d7df3a..b6e6a0d5a 100644 --- a/linphone-app/src/components/presence/OwnPresenceModel.cpp +++ b/linphone-app/src/components/presence/OwnPresenceModel.cpp @@ -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; diff --git a/linphone-app/src/components/presence/Presence.cpp b/linphone-app/src/components/presence/Presence.cpp index a9cdcb1e4..da9a7a102 100644 --- a/linphone-app/src/components/presence/Presence.cpp +++ b/linphone-app/src/components/presence/Presence.cpp @@ -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"); } diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatContent.qml b/linphone-app/ui/modules/Linphone/Chat/ChatContent.qml index 206fb76e6..711d4b5ed 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatContent.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatContent.qml @@ -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