From e9158ee7835ddee6eb6c2ddc427205fc0c150bb1 Mon Sep 17 00:00:00 2001
From: eddyizm <eddyizm@gmail.com>
Date: Sat, 2 Aug 2025 19:30:35 -0700
Subject: [PATCH] merge conflicts

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

diff --git a/app/build.gradle b/app/build.gradle
index c13644d6..fe03c11b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         targetSdk 35
 
         versionCode 26
-        versionName '3.9.5'
+        versionName '3.9.6'
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 03a2f0db..715f8d45 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -159,6 +159,8 @@
     <string name="playlist_chooser_dialog_negative_button">Annuler</string>
     <string name="playlist_chooser_dialog_neutral_button">Créer</string>
     <string name="playlist_chooser_dialog_title">Ajouter à une playlist</string>
+    <string name="playlist_chooser_dialog_toast_add_success">Ajout d'une chanson à la playlist</string>
+    <string name="playlist_chooser_dialog_toast_add_failure">Échec de l'ajout d'une chanson à la playlist</string>
     <string name="playlist_counted_tracks">%1$d titres •  %2$s</string>
     <string name="playlist_duration">Durée  •  %1$s</string>
     <string name="playlist_editor_dialog_hint_name">Nom de la playlist</string>