From 81bb7156dc1bf925bb355a6bef638594f099209e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 18 Apr 2024 10:19:59 +0200
Subject: [PATCH] Fixed merge calls into conference dialog label

---
 app/src/main/res/layout/dialog_merge_calls_into_conference.xml | 2 +-
 app/src/main/res/values-fr/strings.xml                         | 1 +
 app/src/main/res/values/strings.xml                            | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/dialog_merge_calls_into_conference.xml b/app/src/main/res/layout/dialog_merge_calls_into_conference.xml
index 0c8ea1ec0..b9f354e83 100644
--- a/app/src/main/res/layout/dialog_merge_calls_into_conference.xml
+++ b/app/src/main/res/layout/dialog_merge_calls_into_conference.xml
@@ -68,7 +68,7 @@
             android:layout_marginTop="16dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
-            android:text="@string/dialog_delete"
+            android:text="@string/calls_list_dialog_merge_into_conference_label"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/cancel"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6b891fcec..854e7adb9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -538,6 +538,7 @@
     <string name="calls_count_label">%s appels</string>
     <string name="calls_paused_count_label">%s appels en pause</string>
     <string name="calls_list_dialog_merge_into_conference_title">Fusionner les appels en une conférence ?</string>
+    <string name="calls_list_dialog_merge_into_conference_label">Créer une conférence</string>
 
     <string name="call_dialog_zrtp_validate_trust_title">Valider l\'appareil</string>
     <string name="call_dialog_zrtp_validate_trust_subtitle">Dites %s puis cliquez sur les lettres données par votre correspondant :</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d1e02ae8f..468eecfd0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -574,6 +574,7 @@
     <string name="calls_count_label">%s calls</string>
     <string name="calls_paused_count_label">%s paused calls</string>
     <string name="calls_list_dialog_merge_into_conference_title">Merge all calls into conference?</string>
+    <string name="calls_list_dialog_merge_into_conference_label">Create conference</string>
 
     <string name="call_dialog_zrtp_validate_trust_title">Validate the device</string>
     <string name="call_dialog_zrtp_validate_trust_subtitle">Say %s and click on the letters given by your correspondent:</string>