From 112a26571161720e99a14365772513c8f6d9b4ee Mon Sep 17 00:00:00 2001
From: Arnaud Rajon <arnaud.rajon@epfl.ch>
Date: Sun, 1 Dec 2024 17:48:43 +0100
Subject: [PATCH 1/4] chore: translate non-translated string

Translated avery string that wasn't translated in the app, and fixed a bug (explained in detail in the PR)
---
 .../java/com/android/unio/MainActivity.kt     | 17 ++++
 .../unio/model/association/Association.kt     | 30 +++---
 .../unio/ui/association/EditAssociation.kt    |  4 +-
 .../com/android/unio/ui/explore/Explore.kt    | 10 +-
 .../ui/navigation/BottomNavigationMenu.kt     |  5 +-
 .../unio/ui/navigation/NavigationAction.kt    | 21 +++++
 .../com/android/unio/ui/settings/Settings.kt  | 20 +---
 .../java/com/android/unio/ui/theme/Theme.kt   |  2 +
 .../com/android/unio/ui/user/UserProfile.kt   | 10 +-
 app/src/main/res/values-fr/strings.xml        | 92 +++++++++++++------
 app/src/main/res/values/strings.xml           | 73 ++++++++++-----
 11 files changed, 191 insertions(+), 93 deletions(-)

diff --git a/app/src/main/java/com/android/unio/MainActivity.kt b/app/src/main/java/com/android/unio/MainActivity.kt
index 54eabe33a..bf9e24f5b 100644
--- a/app/src/main/java/com/android/unio/MainActivity.kt
+++ b/app/src/main/java/com/android/unio/MainActivity.kt
@@ -18,6 +18,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -29,6 +30,7 @@ import com.android.unio.model.event.EventViewModel
 import com.android.unio.model.image.ImageRepositoryFirebaseStorage
 import com.android.unio.model.map.MapViewModel
 import com.android.unio.model.map.nominatim.NominatimLocationSearchViewModel
+import com.android.unio.model.preferences.AppPreferences
 import com.android.unio.model.search.SearchViewModel
 import com.android.unio.model.user.UserViewModel
 import com.android.unio.ui.association.AssociationProfileScreen
@@ -56,7 +58,9 @@ import com.android.unio.ui.user.UserProfileEditionScreen
 import com.android.unio.ui.user.UserProfileScreen
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.HiltAndroidApp
+import java.util.Locale
 import javax.inject.Inject
+import me.zhanghai.compose.preference.LocalPreferenceFlow
 import me.zhanghai.compose.preference.ProvidePreferenceLocals
 
 @AndroidEntryPoint
@@ -82,6 +86,19 @@ class MainActivity : ComponentActivity() {
 
 @Composable
 fun UnioApp(imageRepository: ImageRepositoryFirebaseStorage) {
+  // sets language according to LocalPreferences
+  val preferences by LocalPreferenceFlow.current.collectAsState()
+  val context = LocalContext.current
+  val language = preferences.get<String>(AppPreferences.LANGUAGE) ?: AppPreferences.Language.default
+  val locale = Locale(language)
+  Locale.setDefault(locale)
+
+  val configuration = context.resources.configuration
+  configuration.setLocale(locale)
+  configuration.setLayoutDirection(locale)
+  context.createConfigurationContext(configuration)
+  context.resources.updateConfiguration(configuration, context.resources.displayMetrics)
+
   val navController = rememberNavController()
 
   val navigationActions = NavigationAction(navController)
diff --git a/app/src/main/java/com/android/unio/model/association/Association.kt b/app/src/main/java/com/android/unio/model/association/Association.kt
index 941ff46af..4d36ff2ec 100644
--- a/app/src/main/java/com/android/unio/model/association/Association.kt
+++ b/app/src/main/java/com/android/unio/model/association/Association.kt
@@ -5,11 +5,11 @@ import androidx.appsearch.annotation.Document.Id
 import androidx.appsearch.annotation.Document.Namespace
 import androidx.appsearch.annotation.Document.StringProperty
 import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig
+import com.android.unio.R
 import com.android.unio.model.event.Event
 import com.android.unio.model.firestore.ReferenceElement
 import com.android.unio.model.firestore.ReferenceList
 import com.android.unio.model.firestore.UniquelyIdentifiable
-import com.android.unio.model.strings.AssociationStrings
 import com.android.unio.model.user.User
 
 /**
@@ -54,20 +54,20 @@ data class Association(
  *
  * @property displayName A human-readable name for the category.
  */
-enum class AssociationCategory(val displayName: String) {
-  EPFL_BODIES(AssociationStrings.EPFL_BODIES),
-  REPRESENTATION(AssociationStrings.REPRESENTATION),
-  PROJECTS(AssociationStrings.PROJECTS),
-  EPFL_STUDENTS(AssociationStrings.EPFL_STUDENTS),
-  COUNTRIES(AssociationStrings.COUNTRIES),
-  SUSTAINABILITY(AssociationStrings.SUSTAINABILITY),
-  SCIENCE_TECH(AssociationStrings.SCIENCE_TECH),
-  CULTURE_SOCIETY(AssociationStrings.CULTURE_SOCIETY),
-  ARTS(AssociationStrings.ARTS),
-  ENTERTAINMENT(AssociationStrings.ENTERTAINMENT),
-  SPORTS(AssociationStrings.SPORTS),
-  GUIDANCE(AssociationStrings.GUIDANCE),
-  UNKNOWN(AssociationStrings.UNKNOWN)
+enum class AssociationCategory(val displayNameId: Int) {
+  EPFL_BODIES(R.string.association_category_epfl_bodies),
+  REPRESENTATION(R.string.association_category_representation),
+  PROJECTS(R.string.association_category_projects),
+  EPFL_STUDENTS(R.string.association_category_epfl_students),
+  COUNTRIES(R.string.association_category_countries),
+  SUSTAINABILITY(R.string.association_category_sustainability),
+  SCIENCE_TECH(R.string.association_category_science_tech),
+  CULTURE_SOCIETY(R.string.association_category_culture_society),
+  ARTS(R.string.association_category_arts),
+  ENTERTAINMENT(R.string.association_category_entertainment),
+  SPORTS(R.string.association_category_sports),
+  GUIDANCE(R.string.association_category_guidance),
+  UNKNOWN(R.string.association_category_unknown)
 }
 
 /**
diff --git a/app/src/main/java/com/android/unio/ui/association/EditAssociation.kt b/app/src/main/java/com/android/unio/ui/association/EditAssociation.kt
index 42488f0d6..463ca3fa4 100644
--- a/app/src/main/java/com/android/unio/ui/association/EditAssociation.kt
+++ b/app/src/main/java/com/android/unio/ui/association/EditAssociation.kt
@@ -171,13 +171,13 @@ fun EditAssociationScaffold(
                   onClick = { expanded = true },
                   modifier =
                       Modifier.fillMaxWidth().testTag(EditAssociationTestTags.CATEGORY_BUTTON)) {
-                    Text(text = category.displayName)
+                    Text(text = context.getString(category.displayNameId))
                   }
 
               DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
                 AssociationCategory.entries.forEach { categoryOption ->
                   DropdownMenuItem(
-                      text = { Text(text = categoryOption.displayName) },
+                      text = { Text(text = context.getString(categoryOption.displayNameId)) },
                       onClick = {
                         category = categoryOption
                         expanded = false
diff --git a/app/src/main/java/com/android/unio/ui/explore/Explore.kt b/app/src/main/java/com/android/unio/ui/explore/Explore.kt
index be66b4a6d..02feeee32 100644
--- a/app/src/main/java/com/android/unio/ui/explore/Explore.kt
+++ b/app/src/main/java/com/android/unio/ui/explore/Explore.kt
@@ -1,5 +1,6 @@
 package com.android.unio.ui.explore
 
+import android.content.Context
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -12,7 +13,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -69,7 +69,6 @@ fun ExploreScreen(
  * @param padding The padding values to apply to the content.
  * @param navigationAction The navigation action to use when an association is clicked.
  */
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ExploreScreenContent(
     padding: PaddingValues,
@@ -107,14 +106,14 @@ fun ExploreScreenContent(
             contentPadding = PaddingValues(vertical = 16.dp),
             verticalArrangement = Arrangement.spacedBy(16.dp),
         ) {
-          getSortedEntriesAssociationsByCategory(associationsByCategory).forEach {
+          getSortedEntriesAssociationsByCategory(context, associationsByCategory).forEach {
               (category, associations) ->
             val alphabeticalAssociations = getFilteredAssociationsByAlphabeticalOrder(associations)
 
             if (alphabeticalAssociations.isNotEmpty()) {
               item {
                 Text(
-                    text = category.displayName,
+                    text = context.getString(category.displayNameId),
                     style = AppTypography.headlineSmall,
                     modifier =
                         Modifier.padding(horizontal = 16.dp)
@@ -197,7 +196,8 @@ fun getFilteredAssociationsByAlphabeticalOrder(associations: List<Association>):
 
 /** Returns the entries of the association map sorted by the key's display name. */
 fun getSortedEntriesAssociationsByCategory(
+    context: Context,
     associationsByCategory: Map<AssociationCategory, List<Association>>
 ): List<Map.Entry<AssociationCategory, List<Association>>> {
-  return associationsByCategory.entries.sortedBy { it.key.displayName }
+  return associationsByCategory.entries.sortedBy { context.getString(it.key.displayNameId) }
 }
diff --git a/app/src/main/java/com/android/unio/ui/navigation/BottomNavigationMenu.kt b/app/src/main/java/com/android/unio/ui/navigation/BottomNavigationMenu.kt
index 62eb1f3a2..a51edeff7 100644
--- a/app/src/main/java/com/android/unio/ui/navigation/BottomNavigationMenu.kt
+++ b/app/src/main/java/com/android/unio/ui/navigation/BottomNavigationMenu.kt
@@ -6,6 +6,7 @@ import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import com.android.unio.model.strings.test_tags.NavigationActionTestTags
 
@@ -19,7 +20,9 @@ fun BottomNavigationMenu(
     tabList.map { tld ->
       NavigationBarItem(
           modifier = Modifier.testTag(tld.textId),
-          label = { Text(tld.route) },
+          label = {
+            Text(Route.toTranslatedString(context = LocalContext.current, route = tld.route))
+          },
           icon = { Icon(tld.icon, tld.textId) },
           selected = selectedItem == tld.route,
           onClick = { onSelection(tld) })
diff --git a/app/src/main/java/com/android/unio/ui/navigation/NavigationAction.kt b/app/src/main/java/com/android/unio/ui/navigation/NavigationAction.kt
index 9a9113cad..c300e268d 100644
--- a/app/src/main/java/com/android/unio/ui/navigation/NavigationAction.kt
+++ b/app/src/main/java/com/android/unio/ui/navigation/NavigationAction.kt
@@ -1,5 +1,7 @@
 package com.android.unio.ui.navigation
 
+import android.content.Context
+import android.util.Log
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.FavoriteBorder
 import androidx.compose.material.icons.outlined.Home
@@ -8,6 +10,7 @@ import androidx.compose.material.icons.outlined.Search
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
+import com.android.unio.R
 import com.android.unio.model.strings.test_tags.BottomNavBarTestTags
 
 open class NavigationAction(val navController: NavHostController) {
@@ -120,6 +123,24 @@ object Route {
   const val EXPLORE = "Explore"
   const val SAVED = "Saved"
   const val MY_PROFILE = "Profile"
+
+  fun toTranslatedString(context: Context, route: String): String {
+
+    val strId =
+        when (route) {
+          HOME -> R.string.bottom_nav_home
+          SAVED -> R.string.bottom_nav_saved
+          EXPLORE -> R.string.bottom_nav_explore
+          MY_PROFILE -> R.string.bottom_nav_profile
+          AUTH -> R.string.nav_auth
+          else -> {
+            Log.e("NavigationAction", "The provided route string does not exist.")
+            0
+          }
+        }
+
+    return context.getString(strId)
+  }
 }
 
 object Screen {
diff --git a/app/src/main/java/com/android/unio/ui/settings/Settings.kt b/app/src/main/java/com/android/unio/ui/settings/Settings.kt
index dcf75b479..7dcb15265 100644
--- a/app/src/main/java/com/android/unio/ui/settings/Settings.kt
+++ b/app/src/main/java/com/android/unio/ui/settings/Settings.kt
@@ -38,7 +38,6 @@ import com.android.unio.model.user.UserViewModel
 import com.android.unio.ui.navigation.NavigationAction
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
-import java.util.Locale
 import me.zhanghai.compose.preference.LocalPreferenceFlow
 import me.zhanghai.compose.preference.ProvidePreferenceLocals
 import me.zhanghai.compose.preference.listPreference
@@ -110,16 +109,6 @@ fun SettingsContainer(onPasswordChange: (() -> Unit) -> Unit) {
       }
 
   /** Language * */
-  val language = preferences.get<String>(AppPreferences.LANGUAGE) ?: AppPreferences.Language.default
-  val locale = Locale(language)
-  Locale.setDefault(locale)
-
-  val configuration = context.resources.configuration
-  configuration.setLocale(locale)
-  configuration.setLayoutDirection(locale)
-  context.createConfigurationContext(configuration)
-  context.resources.updateConfiguration(configuration, context.resources.displayMetrics)
-
   ProvidePreferenceLocals(flow = LocalPreferenceFlow.current) {
     LazyColumn(
         modifier = Modifier.testTag(SettingsTestTags.CONTAINER),
@@ -201,16 +190,15 @@ fun SettingsContainer(onPasswordChange: (() -> Unit) -> Unit) {
             Icon(
                 imageVector = Icons.Default.Lock,
                 contentDescription = context.getString(R.string.settings_reset_password))
-          },
-          onClick = {
-            onPasswordChange({
+          }) {
+            onPasswordChange {
               Toast.makeText(
                       context,
                       context.getString(R.string.settings_reset_password_sent),
                       Toast.LENGTH_SHORT)
                   .show()
-            })
-          })
+            }
+          }
     }
   }
 }
diff --git a/app/src/main/java/com/android/unio/ui/theme/Theme.kt b/app/src/main/java/com/android/unio/ui/theme/Theme.kt
index 7cf8037ad..1961f3afb 100644
--- a/app/src/main/java/com/android/unio/ui/theme/Theme.kt
+++ b/app/src/main/java/com/android/unio/ui/theme/Theme.kt
@@ -275,6 +275,8 @@ fun AppTheme(
   val preferences by LocalPreferenceFlow.current.collectAsState()
 
   val theme = (preferences.asMap().getOrDefault(AppPreferences.THEME, AppPreferences.Theme.SYSTEM))
+  val language =
+      preferences.asMap().getOrDefault(AppPreferences.LANGUAGE, AppPreferences.Language.default)
 
   val colorScheme =
       when {
diff --git a/app/src/main/java/com/android/unio/ui/user/UserProfile.kt b/app/src/main/java/com/android/unio/ui/user/UserProfile.kt
index 869f667cd..b7157e708 100644
--- a/app/src/main/java/com/android/unio/ui/user/UserProfile.kt
+++ b/app/src/main/java/com/android/unio/ui/user/UserProfile.kt
@@ -260,7 +260,9 @@ fun UserProfileScreenContent(
           if (joinedAssociations.isNotEmpty()) {
             HorizontalDivider()
 
-            Text("Joined", style = AppTypography.headlineSmall)
+            Text(
+                context.getString(R.string.user_profile_association_joined),
+                style = AppTypography.headlineSmall)
             Column(
                 modifier = Modifier.fillMaxWidth().testTag(UserProfileTestTags.JOINED_ASSOCIATIONS),
                 verticalArrangement = Arrangement.spacedBy(4.dp),
@@ -268,12 +270,14 @@ fun UserProfileScreenContent(
               joinedAssociations.map { AssociationSmall(it) { onAssociationClick(it.uid) } }
             }
           } else {
-            Text("You are not member of any association yet", style = AppTypography.bodySmall)
+            Text(
+                context.getString(R.string.user_profile_no_associations),
+                style = AppTypography.bodySmall)
 
             Button(
                 onClick = onClaimAssociationClick,
                 modifier = Modifier.testTag(UserProfileTestTags.CLAIMING_BUTTON)) {
-                  Text("Claim Association")
+                  Text(context.getString(R.string.user_profile_claim_association))
                 }
           }
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 55cebc8a2..a927c91ee 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -14,7 +14,7 @@
 
     <!-- Association Strings -->
     <string name="association_toast_error" translatable="true">Une erreur est survenue.</string>
-    <string name="association_upcoming_events">Evenement à venir</string>
+    <string name="association_upcoming_events">Évenements à venir</string>
     <string name="association_go_back">Retour</string>
     <string name="association_see_more">Voir plus</string>
     <string name="association_share">Partager l\'association</string>
@@ -24,10 +24,10 @@
     </string>
     <string name="association_follower">abonnés</string>
     <string name="association_member">membres</string>
-    <string name="association_follow">S\'abonner</string>
+    <string name="association_follow">Suivre</string>
     <string name="association_unfollow">Se désabonner</string>
     <string name="association_join">Rejoindre</string>
-    <string name="association_no_event">Pas d\'événement plannifié pour l\'instant</string>
+    <string name="association_no_event">Pas d\'événement planifié pour l\'instant</string>
     <string name="association_not_found">Erreur : Association introuvable</string>
     <string name="association_content_description_sharing_icon">Icône de partage d\'association</string>
     <string name="association_content_description_add_icon">Icône ajouter</string>
@@ -47,7 +47,7 @@
     <string name="cancel_button_text">Annuler</string>
     <string name="save_button_text">Enregistrer</string>
     <string name="category_button_text">Sélectionner la catégorie</string>
-    <string name="save_failed_message">Échec de la sauvegarde de l\'Association</string>
+    <string name="save_failed_message">Échec de la sauvegarde de l\'association</string>
 
     /**
     * package: authentication
@@ -61,9 +61,8 @@
 
     <!-- Social Overlay Strings -->
     <string name="social_overlay_title" translatable="true">Vos réseaux sociaux</string>
-    <string name="social_overlay_description" translatable="true">
-        Ceux-ci vont être visibles sur votre page personnelle pour que d\'autres étudiants puissent vous contacter</string>
-    <string name="social_overlay_add_social" translatable="true">Ajouter Réseau Social</string>
+    <string name="social_overlay_description" translatable="true">Ceux-ci vont être visibles sur votre page personnelle pour que d\'autres étudiants puissent vous contacter</string>
+    <string name="social_overlay_add_social" translatable="true">Ajouter un réseau</string>
     <string name="social_overlay_save_changes" translatable="true">Sauvegarder les changements</string>
     <string name="social_overlay_empty_field" translatable="true">L\'entrée est vide</string>
     <string name="social_overlay_invalid_phone_number" translatable="true">Le numéro de téléphone a un format incorrect</string>
@@ -80,8 +79,8 @@
     <string name="account_details_add_interests" translatable="true">Ajoutez des centres d\'intérêts</string>
     <string name="account_details_add_socials" translatable="true">Ajoutez des liens à d\'autres réseaux sociaux</string>
     <string name="account_details_continue" translatable="true">Continuer</string>
-    <string name="account_details_first_name_error">Veuillez remplir votre Prénom</string>
-    <string name="account_details_last_name_error">Veuillez remplir votre Nom</string>
+    <string name="account_details_first_name_error">Veuillez remplir votre prénom</string>
+    <string name="account_details_last_name_error">Veuillez remplir votre nom</string>
     <string name="account_details_created_successfully">Compte créé avec succès</string>
     <string name="account_details_image_upload_error">ERREUR: Échec du chargement de l\'image</string>
     <string name="account_details_content_description_account_circle">Cercle de compte</string>
@@ -92,7 +91,7 @@
     <string name="account_details_content_description_remove_pfp">Supprimer la photo de profil</string>
 
     <!-- UserSettings Strings -->
-    <string name="user_settings_content_description_remove_social" translatable="false">Remove User Social</string>
+    <string name="user_settings_content_description_remove_social" translatable="false">Supprimer le réseau social de l\'utilisateur</string>
     <string name="user_settings_first_name" translatable="true">Modifier Prénom</string>
     <string name="user_settings_last_name" translatable="true">Modifier Nom</string>
     <string name="user_settings_bio" translatable="true">Modifier Biographie</string>
@@ -100,13 +99,13 @@
     <string name="user_settings_edit_socials" translatable="true">Modifier vos réseaux sociaux</string>
     <string name="user_settings_discard_changes" translatable="true">Annuler vos modifications</string>
     <string name="user_settings_save_changes" translatable="true">Sauvegarder vos modifications</string>
-    <string name="user_settings_modified_successfully" translatable="true">Changements correctement modifié</string>
+    <string name="user_settings_modified_successfully" translatable="true">Changements correctement modifiés</string>
 
 
 
     <!-- EmailVerification Strings -->
-    <string name="email_verification_refresh_failed">Echec de l\'actualisation</string>
-    <string name="email_verification_sent_failed">Echec de l\'envoi de l\'email</string>
+    <string name="email_verification_refresh_failed">Échec de l\'actualisation</string>
+    <string name="email_verification_sent_failed">Échec de l\'envoi de l\'email</string>
     <string name="email_verification_verified">Email vérifié!</string>
     <string name="email_verification_verified_continue">Continuer</string>
     <string name="email_verification_verify_request">Veuillez vérifier votre email</string>
@@ -114,7 +113,7 @@
     <string name="email_verification_email_sent_to_verify">. Veuillez vérifier votre email pour continuer.</string>
     <string name="email_verification_email_resend">Renvoyer l\'email</string>
     <string name="email_verification_email_refresh">Rafraîchir</string>
-    <string name="email_verification_content_description_go_back">Retourner</string>
+    <string name="email_verification_content_description_go_back">Retour</string>
     <string name="email_verification_content_description_refresh">Rafraîchir</string>
 
     <!-- Welcome Screen Strings -->
@@ -123,7 +122,7 @@
     <string name="welcome_email_enter">Entrez votre adresse email</string>
     <string name="welcome_email_display">john.doe@epfl.ch</string>
     <string name="welcome_password_enter">Entrez votre mot de passe</string>
-    <string name="welcome_password_error_correction">Min. 6 charactères and 1 chiffre</string>
+    <string name="welcome_password_error_correction">Min. 6 caractères and 1 chiffre</string>
     <string name="welcome_malformed_email_password">Email ou mot de passe mal formé.</string>
     <string name="welcome_button_continue">Continuer</string>
     <string name="welcome_toast_invalid_creds">Identifiants invalides</string>
@@ -134,19 +133,19 @@
     <string name="welcome_toast_account_created">Compte créé avec succès</string>
     <string name="welcome_content_description_hide_password">Cacher le mot de passe</string>
     <string name="welcome_content_description_show_password">Montrer le mot de passe</string>
-    <string name="welcome_forgot_password">Oublié votre mot de passe ?</string>
+    <string name="welcome_forgot_password">Oubli de mot de passe ?</string>
 
     /**
     * package: event
     */
 
     <!-- Event Card Strings -->
-    <string name="event_event_title">Titre de lévènement</string>
+    <string name="event_event_title">Titre de l\'évènement</string>
     <string name="event_catchy_description">Description accrocheuse</string>
     <string name="event_card_content_description_event_image">Image de l\'évènement</string>
     <string name="event_card_content_description_saved_event">Sauvegardé</string>
     <string name="event_card_content_description_not_saved_event">Non sauvegardé</string>
-    <string name="event_card_content_description_association_logo">Logo d\'association</string>
+    <string name="event_card_content_description_association_logo">Logo de l\'association</string>
 
     <!-- Event Creation Strings -->
     <string name="event_creation_screen">Création d\'un évènement</string>
@@ -187,7 +186,7 @@
     <string name="associations_overlay_coauthors_title" translatable="true">Co-organisateurs</string>
     <string name="associations_overlay_coauthors_description" translatable="true">Choisir quels associations organisent l\'évènement avec vous</string>
     <string name="associations_overlay_tagged_title" translatable="true">Tag associations</string>
-    <string name="associations_overlay_tagged_description" translatable="true">Choisir quels associations seront présentes a l\'évènement</string>
+    <string name="associations_overlay_tagged_description" translatable="true">Choisir quelles associations seront présentes a l\'évènement</string>
     <string name="associations_overlay_search_no_results" translatable="true">Aucun résultat trouvé</string>
     <string name="associations_overlay_remove" translatable="true">Supprimer</string>
 
@@ -196,7 +195,7 @@
     */
 
     <!-- Explore Screen Strings -->
-    <string name="explore_content_screen_title">Explorez nos Associations</string>
+    <string name="explore_content_screen_title">Explorez les Associations</string>
     <string name="search_placeholder">Recherche</string>
     <string name="explore_search_error_message">Une erreur s\'est produite lors de la recherche</string>
     <string name="explore_search_no_results">Aucun résultat trouvé</string>
@@ -249,7 +248,7 @@
     <string name="settings_location_summary_granted">Toutes les permissions de localisation ont été accordées</string>
     <string name="settings_location_summary_denied">Il manque des permissions de localisation</string>
     <string name="settings_location_content_description">Réglages de localisation</string>
-    <string name="settings_language_title">Language</string>
+    <string name="settings_language_title">Langue</string>
     <string name="settings_language_content_description">Réglages de Langue</string>
     <string name="settings_reset_password">Réinitialiser le mot de passe</string>
     <string name="settings_reset_password_sent">L\'email de modification de mot de passe a bien été envoyé</string>
@@ -261,13 +260,16 @@
 
     <!-- UserProfile Strings -->
     <string name="user_profile_toast_error">Une erreur est survenue.</string>
-    <string name="user_profile_your_profile_text">Votre profile</string>
+    <string name="user_profile_your_profile_text">Votre profil</string>
     <string name="user_profile_content_description_more">Voir plus</string>
     <string name="user_profile_content_description_pfp">Photo de Profil</string>
     <string name="user_profile_following_associations_text">Suivis</string>
     <string name="user_profile_bottom_sheet_edit">Modifier le profil</string>
     <string name="user_profile_bottom_sheet_settings">Paramètres</string>
     <string name="user_profile_bottom_sheet_sign_out">Se déconnecter</string>
+    <string name="user_profile_claim_association">Revendiquer l\'association</string>
+    <string name="user_profile_no_associations">Vous n\'êtes membre d\'aucune association pour le moment.</string>
+    <string name="user_profile_association_joined">Rejointe</string>
 
     <!-- UserClaimAssociation Strings -->
     <string name="user_claim_association_association_go_back">Retour</string>
@@ -280,7 +282,7 @@
 
     <!-- UserClaimAssociationPresidentialRights Strings -->
     <string name="user_claim_association_presidential_rights_claim_presidential_rights">Réclamer les droits présidentiels</string>
-    <string name="user_claim_association_presidential_rights_enter_presidential_email">Entrez l\'adresse email présidentielle :</string>
+    <string name="user_claim_association_presidential_rights_enter_presidential_email">Entrez l\'adresse email de présidence :</string>
     <string name="user_claim_association_presidential_rights_email_address">Adresse e-mail</string>
     <string name="user_claim_association_presidential_rights_incorrect_email_error">Adresse e-mail incorrecte. Veuillez réessayer.</string>
     <string name="user_claim_association_presidential_rights_enter_verification_code">Entrez le code envoyé :</string>
@@ -317,7 +319,7 @@
 
     <!-- Event Types Strings from EventType.kt -->
     <string name="event_type_festival">Festival</string>
-    <string name="event_type_aperitif">Aperitif</string>
+    <string name="event_type_aperitif">Apéritif</string>
     <string name="event_type_night_party">Soirée</string>
     <string name="event_type_jam">Jam</string>
     <string name="event_type_networking">Réseautage</string>
@@ -344,7 +346,7 @@
     <string name="interest_science" translatable="true">Science</string>
     <string name="interest_literature" translatable="true">Littérature</string>
     <string name="interest_travel" translatable="true">Voyage</string>
-    <string name="interest_food" translatable="true">Nourritue</string>
+    <string name="interest_food" translatable="true">Nourriture</string>
     <string name="interest_gaming" translatable="true">Gaming</string>
     <string name="interest_festivals" translatable="true">Festivals</string>
     <string name="settings_back_content_description">Retour</string>
@@ -354,11 +356,11 @@
 
     <!-- Reset Password Strings -->
     <string name="reset_password_success_toast">Un email a été envoyé à l\'adresse indiquée</string>
-    <string name="reset_password_error_toast">Echec de l\'envoi de l\'email de réinitialisation</string>
+    <string name="reset_password_error_toast">Echec de l\'envoi de l\'email</string>
     <string name="reset_password_text">Veuillez entrer un mail de récupération</string>
     <string name="reset_password_email_place_holder">Le lien va être envoyé à cette addresse</string>
     <string name="reset_password_button">Confirmer</string>
-    <string name="reset_password_invalid_email">Veuillez entrer un addresse email valide</string>
+    <string name="reset_password_invalid_email">Veuillez entrer une addresse email valide</string>
 
 
 
@@ -366,5 +368,41 @@
     <string name="notification_event_reminder" translatable="true">L\'évènement va bientôt commencer :)</string>
     <string name="notification_event_reminder_default_message" translatable="true">Un évènement va bientôt avoir lieu</string>
 
+
+    <string name="event_edit_date_picker_desc">Sélectionner une date</string>
+    <string name="event_edit_time_picker_desc">Sélectionner une heure</string>
+    <string name="event_sign_up">Je viens !</string>
+    <string name="event_not_found">ERREUR: évènement introuvable</string>
+    <string name="event_details_content_description_saved">Sauvegardé</string>
+    <string name="event_details_content_description_not_saved">Non sauvegardé</string>
+    <string name="event_price_free">Gratuite !</string>
+    <string name="event_price">Entrée</string>
+    <string name="event_places_remaining">places restantes</string>
+    <string name="event_location_button_description">Icône pour voir la localisation de l\'évènement</string>
+    <string name="event_signup_button_description">Icône pour s\'inscrire à l\'évènement.</string>
+    <string name="association_image_description">Image de l\'association</string>
+    <string name="reset_password_go_back">Retour à la page d\'accueil</string>
+
+    <!-- Bottom Navigation Strings -->
+    <string name="bottom_nav_home">Accueil</string>
+    <string name="bottom_nav_saved">Sauvegardés</string>
+    <string name="bottom_nav_explore">Découverte</string>
+    <string name="bottom_nav_profile">Profil</string>
+    <string name="nav_auth">Authentification</string>
+
+    <string name="association_category_epfl_bodies">Corps EPFL</string>
+    <string name="association_category_representation">Représentation</string>
+    <string name="association_category_projects">Projets Interdisciplinaires</string>
+    <string name="association_category_epfl_students">Étudiants EPFL</string>
+    <string name="association_category_countries">Étudiants par pays</string>
+    <string name="association_category_sustainability">Durabilité</string>
+    <string name="association_category_science_tech">Science et Technologie</string>
+    <string name="association_category_culture_society">Culture et société</string>
+    <string name="association_category_arts">Arts</string>
+    <string name="association_category_entertainment">Divertissement</string>
+    <string name="association_category_sports">Sports</string>
+    <string name="association_category_guidance">Orientation professionnelle</string>
+    <string name="association_category_unknown">Inconnue</string>
+
 </resources>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 10fbd7c0d..b2c7d36b1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,11 +66,11 @@
     <string name="overlay_save" translatable="true">Save</string>
 
     <!-- Social Overlay Strings -->
-    <string name="social_overlay_title" translatable="true">Your social media</string>
+    <string name="social_overlay_title" translatable="true">Your socials</string>
     <string name="social_overlay_description" translatable="true">These will be displayed on your profile to allow other students to contact you</string>
     <string name="social_overlay_add_social" translatable="true">Add social</string>
     <string name="social_overlay_save_changes" translatable="true">Save changes</string>
-    <string name="social_overlay_empty_field" translatable="true">The input is empty or blank</string>
+    <string name="social_overlay_empty_field" translatable="true">The input is empty</string>
     <string name="social_overlay_invalid_phone_number" translatable="true">The phone number has wrong format</string>
     <string name="social_overlay_invalid_website" translatable="true">The website is not encoded with https</string>
     <string name="social_overlay_content_description_close" translatable="true">Close</string>
@@ -83,7 +83,7 @@
     <string name="account_details_bio" translatable="true">Bio</string>
     <string name="account_details_add_profile_picture" translatable="true">Maybe add a profile picture?</string>
     <string name="account_details_add_interests" translatable="true">Add centers of interest</string>
-    <string name="account_details_add_socials" translatable="true">Add links to other social media</string>
+    <string name="account_details_add_socials" translatable="true">Add links to other socials</string>
     <string name="account_details_continue" translatable="true">Continue</string>
     <string name="account_details_first_name_error">Please fill in your first name</string>
     <string name="account_details_last_name_error">Please fill in your last name</string>
@@ -97,7 +97,7 @@
     <string name="account_details_content_description_remove_pfp">Remove Profile Picture</string>
 
     <!-- UserSettings Strings -->
-    <string name="user_settings_content_description_remove_social" translatable="false">Remove User Social</string>
+    <string name="user_settings_content_description_remove_social">Remove User Social</string>
     <string name="user_settings_first_name" translatable="true">Edit First name</string>
     <string name="user_settings_last_name" translatable="true">Edit Last name</string>
     <string name="user_settings_bio" translatable="true">Edit Biography</string>
@@ -145,7 +145,7 @@
     */
 
     <!-- Event Card Strings -->
-    <string name="event_event_title">Event Title</string>
+    <string name="event_event_title">Event title</string>
     <string name="event_catchy_description">Catchy Description</string>
     <string name="event_card_content_description_event_image">Image of the event</string>
     <string name="event_card_content_description_saved_event">Saved</string>
@@ -188,8 +188,8 @@
     <string name="event_edit_save_button">Save</string>
 
     <!-- Event Edit Component Strings -->
-    <string name="event_edit_date_picker_desc" translatable="false">Select date</string>
-    <string name="event_edit_time_picker_desc" translatable="false">Select time</string>
+    <string name="event_edit_date_picker_desc">Select date</string>
+    <string name="event_edit_time_picker_desc">Select time</string>
 
     <!-- Associations Overlay Strings -->
     <string name="associations_overlay_coauthors_title" translatable="true">Coauthors</string>
@@ -201,20 +201,20 @@
 
 
     <!-- Event Details Strings -->
-    <string name="event_sign_up" translatable="false">I\'m going.</string>
-    <string name="event_not_found" translatable="false">ERROR : event not found.</string>
-    <string name="event_details_content_description_saved" translatable="false">Saved</string>
-    <string name="event_details_content_description_not_saved" translatable="false">Not saved</string>
-    <string name="event_price_free" translatable="false">Free !</string>
-    <string name="event_price" translatable="false">Entry: </string>
-    <string name="event_places_remaining" translatable="false"> places remaining</string>
+    <string name="event_sign_up">I\'m going !</string>
+    <string name="event_not_found">ERROR : event not found.</string>
+    <string name="event_details_content_description_saved">Saved</string>
+    <string name="event_details_content_description_not_saved">Not saved</string>
+    <string name="event_price_free">Free !</string>
+    <string name="event_price">Entry: </string>
+    <string name="event_places_remaining"> places remaining</string>
 
     /**
     * package: explore
     */
 
     <!-- Explore Screen Strings -->
-    <string name="explore_content_screen_title">Explore our Associations</string>
+    <string name="explore_content_screen_title">Explore the Associations</string>
     <string name="search_placeholder">Search</string>
     <string name="explore_search_error_message">An error occurred while searching</string>
     <string name="explore_search_no_results">No results found</string>
@@ -299,6 +299,9 @@
     <string name="user_profile_bottom_sheet_edit">Edit Profile</string>
     <string name="user_profile_bottom_sheet_settings">Settings</string>
     <string name="user_profile_bottom_sheet_sign_out">Sign Out</string>
+    <string name="user_profile_claim_association">Claim Association</string>
+    <string name="user_profile_no_associations">You are not member of any association yet</string>
+    <string name="user_profile_association_joined">Joined</string>
 
     <!-- SomeoneElseUserProfile Strings -->
     <string name="someone_else_user_profile_screen_title" translatable="false">Someone else user profile screen</string>
@@ -328,7 +331,6 @@
     <string name="user_claim_association_presidential_rights_verification_request_not_found">Verification request not found</string>
     <string name="user_claim_association_presidential_rights_service_unavailable">Service unavailable. Please try later</string>
 
-
     /**
     * Other
     */
@@ -350,9 +352,9 @@
     <string name="event_save_button_description">Icon for saving event</string>
     <string name="event_share_button_description">Icon for sharing event</string>
     <string name="event_association_icon_description" translatable="false">Icon of the event\'s organiser</string>
-    <string name="event_location_button_description" translatable="false">Icon for seeing event\'s location</string>
-    <string name="event_signup_button_description" translatable="false">Icon to sign up to the event</string>
-    <string name="association_image_description" translatable="false">Association Image</string>
+    <string name="event_location_button_description">Icon for seeing event\'s location</string>
+    <string name="event_signup_button_description">Icon to sign up to the event</string>
+    <string name="association_image_description">Association Image</string>
 
     <!-- Event Types Strings from EventType.kt -->
     <string name="event_type_festival">Festival</string>
@@ -365,10 +367,10 @@
     <string name="event_type_other">Other</string>
 
     <!-- EventRepositoryFirestore Strings -->
-    <string name="event_error_converting_document" translatable="false">Error while converting db document to Event object</string>
-    <string name="event_error_no_id_provided" translatable="false">No event ID was provided</string>
-    <string name="event_error_failed_to_add" translatable="false">Failed to add event</string>
-    <string name="event_error_failed_to_delete" translatable="false">Failed to delete event</string>
+    <string name="event_error_converting_document">Error while converting db document to Event object</string>
+    <string name="event_error_no_id_provided">No event ID was provided</string>
+    <string name="event_error_failed_to_add">Failed to add event</string>
+    <string name="event_error_failed_to_delete">Failed to delete event</string>
 
     <!-- Firestore Paths Strings from FirestorePaths.kt -->
     <string name="firestore_path_association" translatable="false">associations</string>
@@ -404,7 +406,7 @@
     <!-- Reset Password Strings -->
     <string name="reset_password_success_toast">An email has been sent to the given address</string>
     <string name="reset_password_error_toast">Failed to send the email</string>
-    <string name="reset_password_go_back" translatable="false">Go back to home page</string>
+    <string name="reset_password_go_back">Go back to home page</string>
     <string name="reset_password_text">Please provide an email address</string>
     <string name="reset_password_email_place_holder">The link will be sent to this address</string>
     <string name="reset_password_button">Confirm</string>
@@ -416,6 +418,29 @@
     <string name="notification_event_reminder_default_message" translatable="true">"An event will occur soon"</string>
     <string name="notification_event_reminder_default_title" translatable="false">Unio</string>
 
+    <!-- Bottom Navigation Strings -->
+    <string name="bottom_nav_home">Home</string>
+    <string name="bottom_nav_saved">Saved</string>
+    <string name="bottom_nav_explore">Explore</string>
+    <string name="bottom_nav_profile">Profile</string>
+    <string name="nav_auth">Authentication</string>
+
+    <!-- Association Category Strings -->
+    <string name="association_category_epfl_bodies">EPFL bodies</string>
+    <string name="association_category_representation">Representation</string>
+    <string name="association_category_projects">Interdisciplinary projects</string>
+    <string name="association_category_epfl_students">EPFL students</string>
+    <string name="association_category_countries">Students by country</string>
+    <string name="association_category_sustainability">Sustainability</string>
+    <string name="association_category_science_tech">Science and technology</string>
+    <string name="association_category_culture_society">Culture and society</string>
+    <string name="association_category_arts">Arts</string>
+    <string name="association_category_entertainment">Entertainment</string>
+    <string name="association_category_sports">Sports</string>
+    <string name="association_category_guidance">Vocational guidance</string>
+    <string name="association_category_unknown">Unknown</string>
+
+
 
     <!-- Debug/Temporary Strings -->
     <string name="debug_lorem_ipsum" translatable="false">Lorem ipsum dolor sit amet, consectetur

From 9536f566d26f8d155535a02a577078c452bdc20b Mon Sep 17 00:00:00 2001
From: Arnaud Rajon <arnaud.rajon@epfl.ch>
Date: Sun, 1 Dec 2024 18:08:37 +0100
Subject: [PATCH 2/4] chore: remove unused object

---
 .../com/android/unio/model/strings/Strings.kt    | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/app/src/main/java/com/android/unio/model/strings/Strings.kt b/app/src/main/java/com/android/unio/model/strings/Strings.kt
index b1396f991..8917a43e5 100644
--- a/app/src/main/java/com/android/unio/model/strings/Strings.kt
+++ b/app/src/main/java/com/android/unio/model/strings/Strings.kt
@@ -1,21 +1,5 @@
 package com.android.unio.model.strings
 
-object AssociationStrings {
-  const val EPFL_BODIES = "EPFL bodies"
-  const val REPRESENTATION = "Representation"
-  const val PROJECTS = "Interdisciplinary projects"
-  const val EPFL_STUDENTS = "EPFL Students"
-  const val COUNTRIES = "Students by country"
-  const val SUSTAINABILITY = "Sustainability"
-  const val SCIENCE_TECH = "Science and technology"
-  const val CULTURE_SOCIETY = "Culture and society"
-  const val ARTS = "Arts"
-  const val ENTERTAINMENT = "Entertainment"
-  const val SPORTS = "Sports"
-  const val GUIDANCE = "Vocational guidance"
-  const val UNKNOWN = "Unknown"
-}
-
 object FirestorePathsStrings {
   const val ASSOCIATION_PATH = "associations"
   const val USER_PATH = "users"

From dde7530fa2fb28e73877018c5879b57581280264 Mon Sep 17 00:00:00 2001
From: Arnaud Rajon <arnaud.rajon@epfl.ch>
Date: Sun, 1 Dec 2024 18:38:40 +0100
Subject: [PATCH 3/4] chore: fix test

---
 .../unio/components/explore/ExploreScreenTest.kt       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/com/android/unio/components/explore/ExploreScreenTest.kt b/app/src/androidTest/java/com/android/unio/components/explore/ExploreScreenTest.kt
index e29ddc975..735bb4b30 100644
--- a/app/src/androidTest/java/com/android/unio/components/explore/ExploreScreenTest.kt
+++ b/app/src/androidTest/java/com/android/unio/components/explore/ExploreScreenTest.kt
@@ -1,5 +1,6 @@
 package com.android.unio.components.explore
 
+import android.content.Context
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertTextEquals
 import androidx.compose.ui.test.junit4.createComposeRule
@@ -47,6 +48,7 @@ class ExploreScreenTest : TearDown() {
       ConcurrentAssociationUserRepositoryFirestore
   @MockK private lateinit var eventRepository: EventRepositoryFirestore
   @MockK private lateinit var imageRepository: ImageRepositoryFirebaseStorage
+  @MockK private lateinit var context: Context
   private lateinit var associationViewModel: AssociationViewModel
 
   @get:Rule val composeTestRule = createComposeRule()
@@ -63,6 +65,9 @@ class ExploreScreenTest : TearDown() {
 
     // Mock the navigation action to do nothing
     every { navigationAction.navigateTo(any<String>()) } returns Unit
+    every { context.getString(AssociationCategory.ARTS.displayNameId) } returns "Arts"
+    every { context.getString(AssociationCategory.SCIENCE_TECH.displayNameId) } returns
+        "Science and technology"
 
     associations =
         listOf(
@@ -80,7 +85,7 @@ class ExploreScreenTest : TearDown() {
         }
 
     sortedByCategoryAssociations =
-        getSortedEntriesAssociationsByCategory(associations.groupBy { it.category })
+        getSortedEntriesAssociationsByCategory(context, associations.groupBy { it.category })
 
     associationViewModel =
         AssociationViewModel(
@@ -127,7 +132,8 @@ class ExploreScreenTest : TearDown() {
   fun testGetFilteredAssociationsByCategory() {
     val associationsByCategory = associations.groupBy { it.category }
     val sortedByCategoryAssociations =
-        getSortedEntriesAssociationsByCategory(associationsByCategory)
+        getSortedEntriesAssociationsByCategory(context, associationsByCategory)
+    println(sortedByCategoryAssociations)
 
     assertEquals(AssociationCategory.ARTS, sortedByCategoryAssociations[0].key)
     assertEquals(AssociationCategory.SCIENCE_TECH, sortedByCategoryAssociations[1].key)

From f2f8f68223432f17c2dc933058f30aabb527760a Mon Sep 17 00:00:00 2001
From: Arnaud Rajon <arnaud.rajon@epfl.ch>
Date: Thu, 5 Dec 2024 20:13:48 +0100
Subject: [PATCH 4/4] chore: fix merge

---
 app/src/main/res/values-fr/strings.xml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3e58ece90..8c525ca09 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -91,7 +91,6 @@
     <string name="account_details_content_description_remove_pfp">Supprimer la photo de profil</string>
 
     <!-- UserSettings Strings -->
-    <string name="user_edition_content_description_remove_social" translatable="false">Remove User Social</string>
     <string name="user_edition_delete_user" translatable="true">Supprimer le compte</string>
     <string name="user_edition_delete_user_confirmation" translatable="true">Toutes vos données seront supprimées, êtes-vous sûr de poursuivre ?</string>
     <string name="user_edition_delete_user_confirm" translatable="true">Confirmer</string>
@@ -99,15 +98,15 @@
     <string name="user_edition_delete_user_failure" translatable="true">Echec de suppression de compte, veuillez essayer plus tard</string>
     <string name="user_edition_modified_offline" translatable="true">Suppression du compte hors ligne</string>
     <string name="user_edition_delete_user_offline" translatable="true">Veuillez être connecté à l\'Internet pour supprimer votre compte</string>
-    <string name="user_settings_content_description_remove_social" translatable="false">Supprimer le réseau social de l\'utilisateur</string>
-    <string name="user_settings_first_name" translatable="true">Modifier Prénom</string>
-    <string name="user_settings_last_name" translatable="true">Modifier Nom</string>
-    <string name="user_settings_bio" translatable="true">Modifier Biographie</string>
-    <string name="user_settings_edit_interests" translatable="true">Modifier vos centres d\'intérêts</string>
-    <string name="user_settings_edit_socials" translatable="true">Modifier vos réseaux sociaux</string>
-    <string name="user_settings_discard_changes" translatable="true">Annuler vos modifications</string>
-    <string name="user_settings_save_changes" translatable="true">Sauvegarder vos modifications</string>
-    <string name="user_settings_modified_successfully" translatable="true">Changements correctement modifiés</string>
+    <string name="user_edition_content_description_remove_social" translatable="false">Supprimer le réseau social de l\'utilisateur</string>
+    <string name="user_edition_first_name" translatable="true">Modifier Prénom</string>
+    <string name="user_edition_last_name" translatable="true">Modifier Nom</string>
+    <string name="user_edition_bio" translatable="true">Modifier Biographie</string>
+    <string name="user_edition_edit_interests" translatable="true">Modifier vos centres d\'intérêts</string>
+    <string name="user_edition_edit_socials" translatable="true">Modifier vos réseaux sociaux</string>
+    <string name="user_edition_discard_changes" translatable="true">Annuler vos modifications</string>
+    <string name="user_edition_save_changes" translatable="true">Sauvegarder vos modifications</string>
+    <string name="user_edition_modified_successfully" translatable="true">Changements correctement modifiés</string>