Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-30 03:23:48 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge conflicts in translations.yaml resolved.

Browse Source 
# Conflicts:
#   src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
#   src/Bundle/ChillMainBundle/translations/messages.fr.yml
This commit is contained in:
LenaertsJ
2021-10-04 11:22:03 +00:00
parent cd6dec5082 fe9b76a1fb
commit 4c55631297
170 changed files with 3615 additions and 1970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
View File

@@ -43,7 +43,7 @@ crud:
Create a new aside activity type: Nouvelle categorie d'activité annexe
Back to the list: Retour à la liste
Choose the duration: Choisir la durée
Choose a category: Choisir un categorie
Choose a category: Choisir une catégorie
Is active: Actif
Agent: Utilisateur
date: Date
@@ -153,7 +153,7 @@ Are you sure you want to remove the aside activity concerning "%name%" ?: Êtes-
The activity has been successfully removed.: L'activité a été supprimée.
#Menu
Create an aside activity: "Creér une activité annexe"
Create an aside activity: "Créer une activité annexe"
Aside activity configuration menu: "Menu de configuration des activités annexes"
Aside activity configuration: "Configuration des activités annexes"
Phonecall: "Appel téléphonique"