mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes:

Browse source 
call bad signal icon color
Re-send option in message menu if not delivered

Do not show error message creating chatroom if in call as it is not being created by user #LINQT-2287
and do not try to create one if chat is not enabled in conference
This commit is contained in:
Gaelle Braud 2026-01-05 15:25:21 +01:00
parent 315cabf9d9
commit c88d9a7f2a
10 changed files with 168 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Linphone/core/App.cpp
View file

@ -384,9 +384,7 @@ void App::setSelf(QSharedPointer<App>(me)) {
mCoreModelConnection->makeConnectToModel(
&CoreModel::globalStateChanged,
[this](const std::shared_ptr<linphone::Core> &core, linphone::GlobalState gstate, const std::string &message) {
if (gstate == linphone::GlobalState::On) {
mCoreModelConnection->invokeToCore([this] { setCoreStarted(true); });
}
mCoreModelConnection->invokeToCore([this, gstate] { setCoreStarted(gstate == linphone::GlobalState::On); });
});
mCoreModelConnection->makeConnectToModel(&CoreModel::authenticationRequested, &App::onAuthenticationRequested);
// Config error message

96
Linphone/data/languages/de.ts
View file

@ -680,135 +680,135 @@
<translation>Möchten Sie die Remote-Konfiguration von dieser Adresse herunterladen und anwenden?</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="402"/>
<location filename="../../core/App.cpp" line="454"/>
<location filename="../../core/App.cpp" line="717"/>
<location filename="../../core/App.cpp" line="400"/>
<location filename="../../core/App.cpp" line="452"/>
<location filename="../../core/App.cpp" line="715"/>
<source>info_popup_error_title</source>
<extracomment>Error</extracomment>
<translation>Fehler</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="403"/>
<location filename="../../core/App.cpp" line="719"/>
<location filename="../../core/App.cpp" line="401"/>
<location filename="../../core/App.cpp" line="717"/>
<source>info_popup_configuration_failed_message</source>
<extracomment>Remote provisioning failed : %1</extracomment>
<translation>Remote-Provisionierung fehlgeschlagen: %1</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="457"/>
<location filename="../../core/App.cpp" line="455"/>
<source>info_popup_error_checking_update</source>
<extracomment>An error occured while trying to check update. Please try again later or contact support team.</extracomment>
<translation>Fehler bei der Update-Prüfung. Bitte später erneut versuchen oder Support-Team kontaktieren.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="464"/>
<location filename="../../core/App.cpp" line="462"/>
<source>info_popup_new_version_download_label</source>
<translation>Herunterladen!</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="467"/>
<location filename="../../core/App.cpp" line="465"/>
<source>info_popup_new_version_available_title</source>
<extracomment>New version available !</extracomment>
<translation>Neue Version verfügbar!</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="469"/>
<location filename="../../core/App.cpp" line="467"/>
<source>info_popup_new_version_available_message</source>
<extracomment>A new version of Linphone (%1) is available. %2</extracomment>
<translation>Eine neue Version von Linphone (%1) ist unter %1 verfügbar</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="475"/>
<location filename="../../core/App.cpp" line="473"/>
<source>info_popup_version_up_to_date_title</source>
<translation>Auf dem neuesten Stand</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="477"/>
<location filename="../../core/App.cpp" line="475"/>
<source>info_popup_version_up_to_date_message</source>
<extracomment>Your version is up to date</extracomment>
<translation>Ihre Version ist auf dem neuesten Stand</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="713"/>
<location filename="../../core/App.cpp" line="711"/>
<source>configuration_error_detail</source>
<extracomment>not reachable</extracomment>
<translation>nicht erreichbar</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1003"/>
<location filename="../../core/App.cpp" line="1001"/>
<source>application_description</source>
<extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment>
<translation>Ein kostenloses Open-Source SIP Video-Telefon.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1005"/>
<location filename="../../core/App.cpp" line="1003"/>
<source>command_line_arg_order</source>
<extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment>
<translation>Kommandozeilen-Befehl an die Anwendung schicken</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1009"/>
<location filename="../../core/App.cpp" line="1007"/>
<source>command_line_option_show_help</source>
<translation>Zeige Hilfe</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1014"/>
<location filename="../../core/App.cpp" line="1012"/>
<source>command_line_option_show_app_version</source>
<translation>App-Version anzeigen</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1022"/>
<location filename="../../core/App.cpp" line="1020"/>
<source>command_line_option_config_to_fetch</source>
<extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment>
<translation>Abzurufende Linphone-Konfigurationsdatei angeben. Sie wird mit der aktuellen Konfiguration zusammengeführt.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1024"/>
<location filename="../../core/App.cpp" line="1022"/>
<source>command_line_option_config_to_fetch_arg</source>
<extracomment>&quot;URL, path or file&quot;</extracomment>
<translation>URL, Pfad oder Datei</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1029"/>
<location filename="../../core/App.cpp" line="1027"/>
<source>command_line_option_minimized</source>
<translation>Minimieren</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1032"/>
<location filename="../../core/App.cpp" line="1030"/>
<source>command_line_option_log_to_stdout</source>
<translation>Debug-Informationen auf der Standardausgabe ausgeben</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1035"/>
<location filename="../../core/App.cpp" line="1033"/>
<source>command_line_option_print_app_logs_only</source>
<extracomment>&quot;Print only logs from the application&quot;</extracomment>
<translation>Nur Anwendungs-Logs ausgeben</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1479"/>
<location filename="../../core/App.cpp" line="1477"/>
<source>hide_action</source>
<extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment>
<translation>Ausblenden</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1479"/>
<location filename="../../core/App.cpp" line="1477"/>
<source>show_action</source>
<translation>Zeigen</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1494"/>
<location filename="../../core/App.cpp" line="1492"/>
<source>quit_action</source>
<extracomment>&quot;Quitter&quot;</extracomment>
<translation>Beenden</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1512"/>
<location filename="../../core/App.cpp" line="1510"/>
<source>check_for_update</source>
<extracomment>Check for update</extracomment>
<translation>Auf Updates prüfen</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1635"/>
<location filename="../../core/App.cpp" line="1633"/>
<source>mark_all_read_action</source>
<translation>Alle als gelesen markieren</translation>
</message>
@ -2192,25 +2192,25 @@
<context>
<name>ChatMessage</name>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="432"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="444"/>
<source>chat_message_copy_selection</source>
<extracomment>&quot;Copy selection&quot;</extracomment>
<translation>Ausgewählte kopieren</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="434"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="446"/>
<source>chat_message_copy</source>
<extracomment>&quot;Copy&quot;</extracomment>
<translation>Kopieren</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="442"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="454"/>
<source>chat_message_copied_to_clipboard_title</source>
<extracomment>Copied</extracomment>
<translation>Kopiert</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="444"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="456"/>
<source>chat_message_copied_to_clipboard_toast</source>
<extracomment>&quot;to clipboard&quot;</extracomment>
<translation>in der Zwischenablage</translation>
@ -2246,25 +2246,31 @@
<translation>Sie haben geantwortet</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="407"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="408"/>
<source>chat_message_send_again</source>
<extracomment>&quot;Re-send&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="419"/>
<source>chat_message_reception_info</source>
<extracomment>&quot;Reception info&quot;</extracomment>
<translation>Empfangsinformationen</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="419"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="431"/>
<source>chat_message_reply</source>
<extracomment>Reply</extracomment>
<translation>Antworten</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="451"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="463"/>
<source>chat_message_forward</source>
<extracomment>Forward</extracomment>
<translation>Weiterleiten</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="468"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="480"/>
<source>chat_message_delete</source>
<extracomment>&quot;Delete&quot;</extracomment>
<translation>Löschen</translation>
@ -2599,32 +2605,32 @@ Stellen Sie sicher, dass Sie keine sensiblen Informationen teilen!</translation>
<translation>Keine Chats in der Historie</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="279"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="278"/>
<source>chat_action_start_new_chat</source>
<extracomment>&quot;New chat&quot;</extracomment>
<translation>Neuer Chat</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="317"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="316"/>
<source>chat_start_group_chat_title</source>
<extracomment>&quot;Nouveau groupe&quot;</extracomment>
<translation>Neuer Gruppenchat</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="319"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="318"/>
<source>chat_action_start_group_chat</source>
<extracomment>&quot;Créer&quot;</extracomment>
<translation>Erstellen</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="335"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="358"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="363"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="334"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="357"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="362"/>
<source>information_popup_error_title</source>
<translation>Fehler</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="337"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="336"/>
<source>information_popup_chat_creation_failed_message</source>
<extracomment>&quot;La création a échoué&quot;</extracomment>
<translation>Erstellen fehlgeschlagen</translation>
@ -2635,25 +2641,25 @@ Stellen Sie sicher, dass Sie keine sensiblen Informationen teilen!</translation>
<translation type="obsolete">Der Codec konnte nicht installiert werden.</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="355"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="354"/>
<source>group_chat_error_must_have_name</source>
<extracomment>&quot;Un nom doit être donné au groupe</extracomment>
<translation>Für den Gruppenchat muss ein Name festgelegt werden</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="360"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="359"/>
<source>group_chat_error_no_participant</source>
<extracomment>&quot;Please select at least one participant</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="365"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="364"/>
<source>group_call_error_not_connected</source>
<extracomment>&quot;Vous n&apos;etes pas connecté&quot;</extracomment>
<translation>Sie sind nicht verbunden</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="371"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="370"/>
<source>chat_creation_in_progress</source>
<extracomment>Creation de la conversation en cours …</extracomment>
<translation>Chat-Erstellung ausstehend…</translation>

96
Linphone/data/languages/en.ts
View file

@ -661,135 +661,135 @@
<translation>Do you want to download and apply remote provisioning from this address ?</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="402"/>
<location filename="../../core/App.cpp" line="454"/>
<location filename="../../core/App.cpp" line="717"/>
<location filename="../../core/App.cpp" line="400"/>
<location filename="../../core/App.cpp" line="452"/>
<location filename="../../core/App.cpp" line="715"/>
<source>info_popup_error_title</source>
<extracomment>Error</extracomment>
<translation>Error</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="403"/>
<location filename="../../core/App.cpp" line="719"/>
<location filename="../../core/App.cpp" line="401"/>
<location filename="../../core/App.cpp" line="717"/>
<source>info_popup_configuration_failed_message</source>
<extracomment>Remote provisioning failed : %1</extracomment>
<translation>Remote provisioning failed : %1</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="457"/>
<location filename="../../core/App.cpp" line="455"/>
<source>info_popup_error_checking_update</source>
<extracomment>An error occured while trying to check update. Please try again later or contact support team.</extracomment>
<translation>An error occured while trying to check update. Please try again later or contact support team.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="464"/>
<location filename="../../core/App.cpp" line="462"/>
<source>info_popup_new_version_download_label</source>
<translation>Download it !</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="467"/>
<location filename="../../core/App.cpp" line="465"/>
<source>info_popup_new_version_available_title</source>
<extracomment>New version available !</extracomment>
<translation>New version available !</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="469"/>
<location filename="../../core/App.cpp" line="467"/>
<source>info_popup_new_version_available_message</source>
<extracomment>A new version of Linphone (%1) is available. %2</extracomment>
<translation>A new version of Linphone (%1) is available at %1</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="475"/>
<location filename="../../core/App.cpp" line="473"/>
<source>info_popup_version_up_to_date_title</source>
<translation>Up to date</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="477"/>
<location filename="../../core/App.cpp" line="475"/>
<source>info_popup_version_up_to_date_message</source>
<extracomment>Your version is up to date</extracomment>
<translation>Up to date Your version is up to date</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="713"/>
<location filename="../../core/App.cpp" line="711"/>
<source>configuration_error_detail</source>
<extracomment>not reachable</extracomment>
<translation>not reachable</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1003"/>
<location filename="../../core/App.cpp" line="1001"/>
<source>application_description</source>
<extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment>
<translation>A free and open source SIP video-phone.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1005"/>
<location filename="../../core/App.cpp" line="1003"/>
<source>command_line_arg_order</source>
<extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment>
<translation>Send an order to the application towards a command line</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1009"/>
<location filename="../../core/App.cpp" line="1007"/>
<source>command_line_option_show_help</source>
<translation>Show this help</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1014"/>
<location filename="../../core/App.cpp" line="1012"/>
<source>command_line_option_show_app_version</source>
<translation>Show app version</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1022"/>
<location filename="../../core/App.cpp" line="1020"/>
<source>command_line_option_config_to_fetch</source>
<extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment>
<translation>Specify the linphone configuration file to be fetched. It will be merged with the current configuration.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1024"/>
<location filename="../../core/App.cpp" line="1022"/>
<source>command_line_option_config_to_fetch_arg</source>
<extracomment>&quot;URL, path or file&quot;</extracomment>
<translation>URL, path or file</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1029"/>
<location filename="../../core/App.cpp" line="1027"/>
<source>command_line_option_minimized</source>
<translation>Minimize</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1032"/>
<location filename="../../core/App.cpp" line="1030"/>
<source>command_line_option_log_to_stdout</source>
<translation>Log to stdout some debug information while running</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1035"/>
<location filename="../../core/App.cpp" line="1033"/>
<source>command_line_option_print_app_logs_only</source>
<extracomment>&quot;Print only logs from the application&quot;</extracomment>
<translation>Print only logs from the application</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1479"/>
<location filename="../../core/App.cpp" line="1477"/>
<source>hide_action</source>
<extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment>
<translation>Hide</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1479"/>
<location filename="../../core/App.cpp" line="1477"/>
<source>show_action</source>
<translation>Show</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1494"/>
<location filename="../../core/App.cpp" line="1492"/>
<source>quit_action</source>
<extracomment>&quot;Quitter&quot;</extracomment>
<translation>Quit</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1512"/>
<location filename="../../core/App.cpp" line="1510"/>
<source>check_for_update</source>
<extracomment>Check for update</extracomment>
<translation>Check for update</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1635"/>
<location filename="../../core/App.cpp" line="1633"/>
<source>mark_all_read_action</source>
<translation>Marquer tout comme lu</translation>
</message>
@ -2155,25 +2155,25 @@
<context>
<name>ChatMessage</name>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="432"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="444"/>
<source>chat_message_copy_selection</source>
<extracomment>&quot;Copy selection&quot;</extracomment>
<translation>Copy selection</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="434"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="446"/>
<source>chat_message_copy</source>
<extracomment>&quot;Copy&quot;</extracomment>
<translation>Copy</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="442"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="454"/>
<source>chat_message_copied_to_clipboard_title</source>
<extracomment>Copied</extracomment>
<translation>Copied</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="444"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="456"/>
<source>chat_message_copied_to_clipboard_toast</source>
<extracomment>&quot;to clipboard&quot;</extracomment>
<translation>in clipboard</translation>
@ -2209,25 +2209,31 @@
<translation>You replied</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="407"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="408"/>
<source>chat_message_send_again</source>
<extracomment>&quot;Re-send&quot;</extracomment>
<translation>Re-send</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="419"/>
<source>chat_message_reception_info</source>
<extracomment>&quot;Reception info&quot;</extracomment>
<translation>Reception info</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="419"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="431"/>
<source>chat_message_reply</source>
<extracomment>Reply</extracomment>
<translation>Reply</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="451"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="463"/>
<source>chat_message_forward</source>
<extracomment>Forward</extracomment>
<translation>Forward</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="468"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="480"/>
<source>chat_message_delete</source>
<extracomment>&quot;Delete&quot;</extracomment>
<translation>Delete</translation>
@ -2557,56 +2563,56 @@ Only your correspondent can decrypt them.</translation>
<translation>No conversation in history</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="279"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="278"/>
<source>chat_action_start_new_chat</source>
<extracomment>&quot;New chat&quot;</extracomment>
<translation>New conversation</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="317"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="316"/>
<source>chat_start_group_chat_title</source>
<extracomment>&quot;Nouveau groupe&quot;</extracomment>
<translation>New group</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="319"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="318"/>
<source>chat_action_start_group_chat</source>
<extracomment>&quot;Créer&quot;</extracomment>
<translation>Create</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="335"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="358"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="363"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="334"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="357"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="362"/>
<source>information_popup_error_title</source>
<translation>Error</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="337"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="336"/>
<source>information_popup_chat_creation_failed_message</source>
<extracomment>&quot;La création a échoué&quot;</extracomment>
<translation>Creation failed</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="355"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="354"/>
<source>group_chat_error_must_have_name</source>
<extracomment>&quot;Un nom doit être donné au groupe</extracomment>
<translation>A name must be set for the group</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="360"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="359"/>
<source>group_chat_error_no_participant</source>
<extracomment>&quot;Please select at least one participant</extracomment>
<translation>Please select at least one participant</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="365"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="364"/>
<source>group_call_error_not_connected</source>
<extracomment>&quot;Vous n&apos;etes pas connecté&quot;</extracomment>
<translation>You are not connected</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="371"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="370"/>
<source>chat_creation_in_progress</source>
<extracomment>Creation de la conversation en cours …</extracomment>
<translation>Chat creation pending…</translation>

96
Linphone/data/languages/fr.ts
View file

@ -656,135 +656,135 @@
<translation>Voulez-vous télécharger et appliquer la configuration depuis cette adresse ?</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="402"/>
<location filename="../../core/App.cpp" line="454"/>
<location filename="../../core/App.cpp" line="717"/>
<location filename="../../core/App.cpp" line="400"/>
<location filename="../../core/App.cpp" line="452"/>
<location filename="../../core/App.cpp" line="715"/>
<source>info_popup_error_title</source>
<extracomment>Error</extracomment>
<translation>Erreur</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="403"/>
<location filename="../../core/App.cpp" line="719"/>
<location filename="../../core/App.cpp" line="401"/>
<location filename="../../core/App.cpp" line="717"/>
<source>info_popup_configuration_failed_message</source>
<extracomment>Remote provisioning failed : %1</extracomment>
<translation>La configuration distante a échoué : %1</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="457"/>
<location filename="../../core/App.cpp" line="455"/>
<source>info_popup_error_checking_update</source>
<extracomment>An error occured while trying to check update. Please try again later or contact support team.</extracomment>
<translation>Une erreur est survenue lors de la recherche de mise à jour. Merci de réessayer plus tard ou de contacter l&apos;équipe de support.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="464"/>
<location filename="../../core/App.cpp" line="462"/>
<source>info_popup_new_version_download_label</source>
<translation>Téléchargez-là&#x202f;!</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="467"/>
<location filename="../../core/App.cpp" line="465"/>
<source>info_popup_new_version_available_title</source>
<extracomment>New version available !</extracomment>
<translation>Nouvelle version disponible !</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="469"/>
<location filename="../../core/App.cpp" line="467"/>
<source>info_popup_new_version_available_message</source>
<extracomment>A new version of Linphone (%1) is available. %2</extracomment>
<translation>Une nouvelle version de Linphone (%1) est disponible. %2</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="475"/>
<location filename="../../core/App.cpp" line="473"/>
<source>info_popup_version_up_to_date_title</source>
<translation>À jour</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="477"/>
<location filename="../../core/App.cpp" line="475"/>
<source>info_popup_version_up_to_date_message</source>
<extracomment>Your version is up to date</extracomment>
<translation>Votre version est à jour</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="713"/>
<location filename="../../core/App.cpp" line="711"/>
<source>configuration_error_detail</source>
<extracomment>not reachable</extracomment>
<translation>indisponible</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1003"/>
<location filename="../../core/App.cpp" line="1001"/>
<source>application_description</source>
<extracomment>&quot;A free and open source SIP video-phone.&quot;</extracomment>
<translation>A free and open source SIP video-phone.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1005"/>
<location filename="../../core/App.cpp" line="1003"/>
<source>command_line_arg_order</source>
<extracomment>&quot;Send an order to the application towards a command line&quot;</extracomment>
<translation>Send an order to the application towards a command line</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1009"/>
<location filename="../../core/App.cpp" line="1007"/>
<source>command_line_option_show_help</source>
<translation>Show this help</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1014"/>
<location filename="../../core/App.cpp" line="1012"/>
<source>command_line_option_show_app_version</source>
<translation>Afficher la version de l&apos;application</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1022"/>
<location filename="../../core/App.cpp" line="1020"/>
<source>command_line_option_config_to_fetch</source>
<extracomment>&quot;Specify the linphone configuration file to be fetched. It will be merged with the current configuration.&quot;</extracomment>
<translation>Specify the linphone configuration file to be fetched. It will be merged with the current configuration.</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1024"/>
<location filename="../../core/App.cpp" line="1022"/>
<source>command_line_option_config_to_fetch_arg</source>
<extracomment>&quot;URL, path or file&quot;</extracomment>
<translation>URL, path or file</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1029"/>
<location filename="../../core/App.cpp" line="1027"/>
<source>command_line_option_minimized</source>
<translation>Minimiser</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1032"/>
<location filename="../../core/App.cpp" line="1030"/>
<source>command_line_option_log_to_stdout</source>
<translation>Log to stdout some debug information while running</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1035"/>
<location filename="../../core/App.cpp" line="1033"/>
<source>command_line_option_print_app_logs_only</source>
<extracomment>&quot;Print only logs from the application&quot;</extracomment>
<translation>Print only logs from the application</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1479"/>
<location filename="../../core/App.cpp" line="1477"/>
<source>hide_action</source>
<extracomment>&quot;Cacher&quot; &quot;Afficher&quot;</extracomment>
<translation>Cacher</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1479"/>
<location filename="../../core/App.cpp" line="1477"/>
<source>show_action</source>
<translation>Afficher</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1494"/>
<location filename="../../core/App.cpp" line="1492"/>
<source>quit_action</source>
<extracomment>&quot;Quitter&quot;</extracomment>
<translation>Quitter</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1512"/>
<location filename="../../core/App.cpp" line="1510"/>
<source>check_for_update</source>
<extracomment>Check for update</extracomment>
<translation>Rechercher une mise à jour</translation>
</message>
<message>
<location filename="../../core/App.cpp" line="1635"/>
<location filename="../../core/App.cpp" line="1633"/>
<source>mark_all_read_action</source>
<translation>Marquer tout comme lu</translation>
</message>
@ -2150,25 +2150,25 @@
<context>
<name>ChatMessage</name>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="432"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="444"/>
<source>chat_message_copy_selection</source>
<extracomment>&quot;Copy selection&quot;</extracomment>
<translation>Copier la sélection</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="434"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="446"/>
<source>chat_message_copy</source>
<extracomment>&quot;Copy&quot;</extracomment>
<translation>Copier</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="442"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="454"/>
<source>chat_message_copied_to_clipboard_title</source>
<extracomment>Copied</extracomment>
<translation>Copié</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="444"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="456"/>
<source>chat_message_copied_to_clipboard_toast</source>
<extracomment>&quot;to clipboard&quot;</extracomment>
<translation>dans le presse-papiers</translation>
@ -2204,25 +2204,31 @@
<translation>Vous avez répondu</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="407"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="408"/>
<source>chat_message_send_again</source>
<extracomment>&quot;Re-send&quot;</extracomment>
<translation>Ré-envoyer</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="419"/>
<source>chat_message_reception_info</source>
<extracomment>&quot;Reception info&quot;</extracomment>
<translation>Info de réception</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="419"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="431"/>
<source>chat_message_reply</source>
<extracomment>Reply</extracomment>
<translation>Répondre</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="451"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="463"/>
<source>chat_message_forward</source>
<extracomment>Forward</extracomment>
<translation>Transférer</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="468"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="480"/>
<source>chat_message_delete</source>
<extracomment>&quot;Delete&quot;</extracomment>
<translation>Supprimer</translation>
@ -2552,56 +2558,56 @@ en bout. Seul votre correspondant peut les déchiffrer.</translation>
<translation>Aucune conversation dans votre historique</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="279"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="278"/>
<source>chat_action_start_new_chat</source>
<extracomment>&quot;New chat&quot;</extracomment>
<translation>Nouvelle conversation</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="317"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="316"/>
<source>chat_start_group_chat_title</source>
<extracomment>&quot;Nouveau groupe&quot;</extracomment>
<translation>Nouveau groupe</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="319"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="318"/>
<source>chat_action_start_group_chat</source>
<extracomment>&quot;Créer&quot;</extracomment>
<translation>Créer</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="335"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="358"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="363"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="334"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="357"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="362"/>
<source>information_popup_error_title</source>
<translation>Erreur</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="337"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="336"/>
<source>information_popup_chat_creation_failed_message</source>
<extracomment>&quot;La création a échoué&quot;</extracomment>
<translation>La création a échoué</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="355"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="354"/>
<source>group_chat_error_must_have_name</source>
<extracomment>&quot;Un nom doit être donné au groupe</extracomment>
<translation>Un nom doit être donné au groupe</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="360"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="359"/>
<source>group_chat_error_no_participant</source>
<extracomment>&quot;Please select at least one participant</extracomment>
<translation>Veuillez sélectionner au moins un participant</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="365"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="364"/>
<source>group_call_error_not_connected</source>
<extracomment>&quot;Vous n&apos;etes pas connecté&quot;</extracomment>
<translation>Vous n&apos;êtes pas connecté</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="371"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="370"/>
<source>chat_creation_in_progress</source>
<extracomment>Creation de la conversation en cours …</extracomment>
<translation>Création de la conversation en cours…</translation>

7
Linphone/tool/Utils.cpp
View file

@ -1599,13 +1599,6 @@ VariantObject *Utils::getCurrentCallChat(CallGui *call) {
} else {
lWarning() << "[Utils] Failed to create 1-1 conversation with"
<< callModel->getRemoteAddress()->asStringUriOnly() << "!";
data->mConnection->invokeToCore([] {
//: Error
showInformationPopup(tr("information_popup_error_title"),
//: Failed to create 1-1 conversation with %1 !
tr("information_popup_chatroom_creation_error_message"), false,
getOrCreateCallsWindow());
});
return QVariant();
}
}

1
Linphone/view/Control/Display/Chat/AnimatedImageFileView.qml
View file

@ -1,7 +1,6 @@
import QtQuick
import QtQuick.Controls as Control
import QtQuick.Layouts
import QtMultimedia
import Linphone
import UtilsCpp

12
Linphone/view/Control/Display/Chat/ChatMessage.qml
View file

@ -401,6 +401,18 @@ Control.Control {
popup.padding: 0
popup.contentItem: ColumnLayout {
spacing: 0
IconLabelButton {
visible: mainItem.msgStatev === LinphoneEnums.ChatMessageState.StateNotDelivered
inverseLayout: true
//: "Re-send"
text: qsTr("chat_message_send_again")
icon.source: AppIcons.chatTeardropText
Layout.fillWidth: true
Layout.preferredHeight: Utils.getSizeWithScreenRatio(45)
onClicked: {
mainItem.chatMessage.lSend()
}
}
IconLabelButton {
inverseLayout: true
//: "Reception info"

1
Linphone/view/Control/Display/Chat/ChatMessageContent.qml
View file

@ -2,7 +2,6 @@ import QtQuick
import QtQuick.Effects
import QtQuick.Layouts
import QtQuick.Controls.Basic as Control
import QtMultimedia
import Linphone
import UtilsCpp

1
Linphone/view/Control/Display/Chat/ImageFileView.qml
View file

@ -1,7 +1,6 @@
import QtQuick
import QtQuick.Controls as Control
import QtQuick.Layouts
import QtMultimedia
import Linphone
import UtilsCpp

4
Linphone/view/Page/Window/Call/CallsWindow.qml
View file

@ -56,7 +56,7 @@ AbstractWindow {
zrtpValidation.open()
}
} else if (callState === LinphoneEnums.CallState.StreamsRunning) {
if (!mainWindow.chat)
if (!mainWindow.chat && mainWindow.conference.core.isChatEnabled)
mainWindow.chatObj = UtilsCpp.getCurrentCallChat(mainWindow.call)
} else if (callState === LinphoneEnums.CallState.Error
|| callState === LinphoneEnums.CallState.End) {
@ -551,7 +551,7 @@ AbstractWindow {
Layout.preferredHeight: Utils.getSizeWithScreenRatio(40)
Layout.rightMargin: Utils.getSizeWithScreenRatio(30)
icon.source: quality >= 4 ? AppIcons.cellSignalFull : quality >= 3 ? AppIcons.cellSignalMedium : quality >= 2 ? AppIcons.cellSignalLow : AppIcons.cellSignalNone
colorizationColor: DefaultStyle.grey_0
colorizationColor: quality >= 2 ? DefaultStyle.grey_0 : DefaultStyle.danger_500_main
style: ButtonStyle.noBackgroundLightBorder
Accessible.name: qsTr("open_statistic_panel_accessible_name")
onClicked: {