johanleroy/ENI-enchere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Parpaillax
2024-04-30 09:03:20 +02:00
parent ed8a5939a2 474dec272c
commit 36952b957f
134 changed files with 906 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/resources/i18n/messages_en.properties
View File

@@ -12,12 +12,17 @@ home.sell.finish = My completed sales
home.button.search = Search
home.button.lang = Passer en fran\u00E7ais
home.button.lang2 = EN
home.button.first = First
home.button.end = End
home.button.next = Next
home.button.previous = Previous
home.credit = My credits:
home.nav.enchere = Auctions
home.nav.vend = Sell an item
home.nav.login = Register / Log in
home.profil.profil = Profile
home.profil.logout = Log out
home.profil.bank = Credit
home.article.sellprice = Sale price:
home.article.seller = Seller:
home.article.end = End of auction:

7
src/main/resources/i18n/messages_fr.properties
View File

@@ -12,15 +12,20 @@ home.sell.finish = Mes ventes termin\u00E9es
home.button.search = Recherche
home.button.lang = Switch to English
home.button.lang2 = FR
home.button.first = D\u00e9but
home.button.end = Fin
home.button.next = Suivant
home.button.previous = Pr\u00e9cedent
home.credit = Mes cr\u00e9dits :
home.nav.enchere = Encheres
home.nav.vend = Vendre un article
home.nav.login = S'inscrire / Se connecter
home.profil.profil = Profil
home.profil.logout = D\u00e9connexion
home.profil.bank = Cr\u00e9diter
home.article.sellprice = Prix de vente:
home.article.seller = Vendeur:
home.article.end = Fin de l'ench\u00E8re:
home.article.end = Fin de l'ench\u00E8re:
footer.desc = Cr\u00e9\u00e9e par l'association "Les objets sont nos amis", ENI-Ench\u00e9res a pour objectif d'aider ses membres \u00E0 vendre ou acheter des objets de tout genre.
footer.