merge conflict

This commit is contained in:
Parpaillax
2024-04-30 09:03:20 +02:00
134 changed files with 906 additions and 86 deletions

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: