merge conflict
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user