M backend/src/api/email/locales/en.json → backend/src/api/email/locales/en.json

@@ -10,19 +10,15 @@ "content": "## New trip is available for \"<%= event.name %>\"\n\n**Car: <%= travel.vehicleName %>**\nCount of seats: <%= travel.seats %>\nDeparture location: <%= travel.meeting %>\nInformation: <%= travel.details %>.\n\n[Book my seat](<%= host %>/e/<%= event.uuid %>).\n\nYou are receiving this email because you are on the waiting list to find a carpool spot in this event."
     },
     "DeletedTrip": {
       "title": "<%= event.name %> - Trip removed",
-      "content": "Trip <%= travel.vehicleName %> in which you've subscribed to as been removed. Go to the [Caroster](<%= host %>/e/<%= event.uuid %>) page to find another car."
+      "content": "The trip '<%= travel.vehicleName %>' in which you've subscribed to as been removed. You can try to find another available trip for you [here](<%= host %>/e/<%= event.uuid %>)."
     },
     "DeletedYourTrip": {
       "title": "<%= event.name %> - Your trip has been removed",
       "content": "Your trip <%= travel.vehicleName %> has been removed by an administrator from [<%= event.name %>](<%= host %>/e/<%= event.uuid %>)."
     },
     "DeletedFromTrip": {
-      "title": "<%= event.name %> - You have been removed from car",
-      "content": "You have been removed from car <%= travel.vehicleName %> for [<%= event.name %>](<%= host %>/e/<%= event.uuid %>)."
-    },
-    "DeletedFromTrip": {
-      "title": "<%= event.name %> - You have been removed from car",
-      "content": "You have been removed from car <%= travel.vehicleName %> for [<%= event.name %>](<%= host %>/e/<%= event.uuid %>)."
+      "title": "<%= event.name %> - You have been removed from a trip",
+      "content": "You have been removed from the trip '<%= travel.vehicleName %>' for [<%= event.name %>](<%= host %>/e/<%= event.uuid %>)."
     },
     "NewPassengerInYourTrip": {
       "title": "<%= event.name %> - A passenger has been added to your trip",
@@ -49,8 +45,8 @@ "title": "<%= event.name %> - Contact trip driver",
       "content": "To organize your journey to <%= event.name %>, please contact the driver of the trip you've registered.\n\n**Car: <%= travel.vehicleName %>**\nDeparture: <%= travel.meeting %>\nDate/time: <%= datetime %>\nPhone: <%= travel.phone_mumber | 'Not provided' %>\nE-mail: <%= driver.email %>"
     },
     "EnabledCarosterPlus": {
-      "title": "<%= event.name %> - Caroster+ is now active for your event",
-      "content": "Module 'Caroster+' has been enabled for your event [<%= event.name %>](<%= host %>/e/<%= event.uuid %>)."
+      "title": "<%= event.name %> - Caroster Plus is now active for your event",
+      "content": "Module 'Caroster Plus' has been enabled for your event [<%= event.name %>](<%= host %>/e/<%= event.uuid %>)."
     }
   }
 }

M backend/src/api/email/locales/fr.json → backend/src/api/email/locales/fr.json

@@ -5,20 +5,16 @@ "footer": "---\n💝 Vous pensez aussi que Caroster est génial ? Aidez-nous à le maintenir libre et gratuit en faisant une donation !\n\n👉 [Open collective](https://opencollective.com/caroster)\n\n<center><a href='https://caroster.io'>https://caroster.io</a></center>"
   },
   "notifications": {
     "NewTrip": {
-      "title": "<%= event.name %> - Une nouvelle voiture est disponible",
+      "title": "<%= event.name %> - Nouveau trajet disponible",
       "content": "## Nouveau trajet pour \"<%= event.name %>\"\n\n**Voiture: <%= travel.vehicleName %>**\nNombre de places: <%= travel.seats %>\nLieu de départ: <%= travel.meeting %>\nInformations: <%= travel.details %>.\n\n[Réserver ma place](<%= host %>/e/<%= event.uuid %>).\n\nVous recevez cet e-mail, car vous êtes inscrit en liste d'attente pour trouver une place de covoiturage dans cet événement."
     },
     "DeletedTrip": {
       "title": "<%= event.name %> - Trajet supprimé",
-      "content": "Le trajet <%= travel.vehicleName %> pour lequelle vous vous êtes inscrit.e.s a été supprimé. Rendez-vous sur la page du [Caroster](<%= host %>/e/<%= event.uuid %>) pour trouver un autre trajet."
+      "content": "Le trajet '<%= travel.vehicleName %>' pour lequel vous vous êtes inscrit.e.s a été supprimé. Vous pouvez chercher un autre trajet vous correspondant [ici](<%= host %>/e/<%= event.uuid %>)."
     },
     "DeletedYourTrip": {
       "title": "<%= event.name %> - Votre voiture a été supprimée",
       "content": "Votre trajet <%= travel.vehicleName %> a été supprimé par un administrateur de l'événement [<%= event.name %>](<%= host %>/e/<%= event.uuid %>). \n Il n'est plus disponible pour l'événement et les passagers ont été informés."
-    },
-    "DeletedFromTrip": {
-      "title": "<%= event.name %> - Vous avez été retiré(e) d'une voiture",
-      "content": "Vous avez été retiré(e) de la voiture <%= travel.vehicleName %> pour l'événement [<%= event.name %>](<%= host %>/e/<%= event.uuid %>)."
     },
     "DeletedFromTrip": {
       "title": "<%= event.name %> - Vous avez été retiré(e) d'une voiture",
@@ -49,8 +45,8 @@ "title": "<%= event.name %> - Contacter la conductrice ou le conducteur du trajet",
       "content": "Afin d'organiser votre voyage pour [<%= event.name %>](<%= host %>/e/<%= event.uuid %>), merci de contacter la conductrice ou le conducteur du trajet pour lequel vous vous êtes inscrit⸱e.\n\n**Voiture: <%= travel.vehicleName %>**\nDépart: <%= travel.meeting %>\nDate/heure: <%= datetime %>\nTéléphone: <%= travel.phone_mumber || 'Non précisé' %>\nE-mail: <%= driver.email %>"
     },
     "EnabledCarosterPlus": {
-      "title": "<%= event.name %> - Caroster+ a été activé pour votre événement",
-      "content": "Le module 'Caroster+' a été activé pour votre événement [<%= event.name %>](<%= host %>/e/<%= event.uuid %>)."
+      "title": "<%= event.name %> - Caroster Plus a été activé pour votre événement",
+      "content": "Le module 'Caroster Plus' a été activé pour votre événement [<%= event.name %>](<%= host %>/e/<%= event.uuid %>)."
     }
   }
 }

M frontend/locales/en.json → frontend/locales/en.json

@@ -231,8 +231,8 @@ "tour.welcome.nope": "Later",
   "tour.welcome.onboard": "OK, let's go!",
   "tour.welcome.text": "Would you like to take a feature tour?",
   "tour.welcome.title": "Welcome to Caroster!",
-  "travel.actions.remove_alert": "Are you sure you want to remove this car and add the subscribers to the waiting list?",
-  "travel.actions.remove_alert.caroster_plus": "Are you sure you want to remove this car? Passengers will be notified.",
+  "travel.actions.remove_alert": "Are you sure you want to remove this trip and add the subscribers to the waiting list?",
+  "travel.actions.remove_alert.caroster_plus": "Are you sure you want to remove this trip? Passengers will be notified.",
   "travel.actions.removed": "The car has been removed and its passengers moved to the waiting list.",
   "travel.actions.removed.caroster_plus": "The car has been removed and its passengers have been notified.",
   "travel.creation.car.title": "Car and driver",