From 7349d37bad49f4703c46dc37ecba0a8b0818f9ee Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Tue, 4 Oct 2022 16:36:23 +0200
Subject: [PATCH] Weblate conflicts

---
 linphone-app/assets/languages/en.ts                           | 2 +-
 linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts
index 007cbb702..fa5a4f3e4 100644
--- a/linphone-app/assets/languages/en.ts
+++ b/linphone-app/assets/languages/en.ts
@@ -551,7 +551,7 @@ Server URL not configured.</translation>
     </message>
     <message>
         <source>icsconferenceAddressTitle</source>
-        <extracomment>&apos;Meeting address&apos; : Title for the conference address.</extracomment>
+        <extracomment>&apos;Meeting address&apos; : Title for the meeting address.</extracomment>
         <translation>Meeting address</translation>
     </message>
     <message>
diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml b/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml
index 1cbf4163d..4f8be65ec 100644
--- a/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml
+++ b/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml
@@ -301,7 +301,7 @@ Loader{
 					font.weight: Font.Bold
 					visible: !mainItem.isCancelled
 					
-					//: 'Meeting address' : Title for the conference address.
+					//: 'Meeting address' : Title for the meeting address.
 					text: qsTr('icsconferenceAddressTitle')
 				}
 				RowLayout{