Skip to content

Commit

Permalink
Merge branch 'refs/heads/develop' into Allow-to-set-the-matching-pool…
Browse files Browse the repository at this point in the history
…-token-&-amount-to-be-something-other-than-USD-#3839

# Conflicts:
#	src/apollo/gql/gqlProjects.ts
#	src/apollo/gql/gqlQF.ts
#	src/apollo/types/types.ts
  • Loading branch information
RamRamez committed May 6, 2024
2 parents 73e0f38 + beef62a commit 3fb2760
Show file tree
Hide file tree
Showing 34 changed files with 550 additions and 978 deletions.
1 change: 1 addition & 0 deletions lang/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,7 @@
"label.liked_projects": "Projectes Favorits",
"label.likes": "Favorits",
"label.link_to_your_giveth_project": "Enllaç al teu projecte de Giveth a les teves xarxes socials",
"label.project_social_link": "Enllaç Social del Projecte",
"label.liquid_giv_that_has_already_flowed": "GIV líquid que ja ha fluït del GIVstream",
"label.liquid_reward_token_that_has_flowed": "{rewardTokenSymbol} líquid que ha fluït del {rewardTokenSymbol}stream",
"label.listing": "Llistat",
Expand Down
1 change: 1 addition & 0 deletions lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,7 @@
"label.liked_projects": "Liked Projects",
"label.likes": "Likes",
"label.link_to_your_giveth_project": "Link to your Giveth project on your social media",
"label.project_social_link": "Project Social Link",
"label.liquid_giv_that_has_already_flowed": "Liquid GIV that has already flowed out of the GIVstream",
"label.liquid_reward_token_that_has_flowed": "Liquid {rewardTokenSymbol} that has already flowed out of the {rewardTokenSymbol}stream",
"label.listing": "Listing",
Expand Down
1 change: 1 addition & 0 deletions lang/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,7 @@
"label.liked_projects": "Proyectos Favoritos",
"label.likes": "Favoritos",
"label.link_to_your_giveth_project": "Enlace al proyecto de Giveth en sus redes sociales",
"label.project_social_link": "Proyecto Enlace Social",
"label.liquid_giv_that_has_already_flowed": "GIV liquido que ya ha fluido de tu GIVstream",
"label.liquid_reward_token_that_has_flowed": "{rewardTokenSymbol} liquido que ha fluido del {rewardTokenSymbol}stream",
"label.listing": "Listado",
Expand Down
Loading

0 comments on commit 3fb2760

Please sign in to comment.