Skip to content

Commit

Permalink
Merge pull request #4892 from Giveth/merge_main_to_develop
Browse files Browse the repository at this point in the history
Merge main to develop
  • Loading branch information
RamRamez authored Dec 5, 2024
2 parents 5c134c7 + 2bd4228 commit 2981622
Show file tree
Hide file tree
Showing 27 changed files with 1,148 additions and 126 deletions.
2 changes: 2 additions & 0 deletions lang/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@
"component.title.user_guides": "Guies d'Usuari",
"component.title.we_hiring": "Estem contractant!",
"component.title.what_is_giveth": "Què és Giveth?",
"component.title.qacc": "Q/acc",
"component.title.qacc_news": "Q/acc News",
"component.title.with_your_donation": "amb la teva donació",
"component.tooltip.donate_anonymously": "En marcar això, no considerarem la informació del teu perfil com a donant per a aquesta donació i no la mostrarem a les pàgines públiques.",
"component.tooltip.donate_privately": "Si marques això, amagarem el teu nom i l'enllaç de la transacció de donació de la pàgina del projecte, i no mostrarem aquesta donació a la teva pàgina de perfil públic.",
Expand Down
2 changes: 2 additions & 0 deletions lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@
"component.title.tos": "Terms of Use",
"component.title.user_guides": "User Guides",
"component.title.we_hiring": "We're Hiring!",
"component.title.qacc": "Q/acc",
"component.title.qacc_news": "Q/acc News",
"component.title.what_is_giveth": "What is Giveth?",
"component.title.with_your_donation": "with your Donation",
"component.tooltip.donate_anonymously": "By checking this, we won't consider your profile information as a donor for this donation and won't show it on public pages.",
Expand Down
2 changes: 2 additions & 0 deletions lang/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,8 @@
"label.on": "en",
"label.onboarding_guide": "Guía de incorporación",
"label.one_million_giv": "1 Millón de GIV",
"component.title.qacc": "Q/acc",
"component.title.qacc_news": "Q/acc News",
"label.one_round": "1 Ronda",
"label.one_time_donation": "Donación Única",
"label.on_gnosis_and": "en el red de Gnosis Chain y además, ¡el 80% de las tarifas de registro van al 'Matching Pool' de Giveth!",
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "givethdapp",
"version": "2.33.2",
"version": "2.34.0",
"private": true,
"scripts": {
"build": "next build",
Expand Down Expand Up @@ -72,8 +72,8 @@
"styled-components": "^6.1.12",
"swiper": "^11.1.3",
"unsplash-js": "^7.0.19",
"viem": "^2.21.16",
"wagmi": "^2.12.16"
"viem": "^2.21.19",
"wagmi": "^2.12.17"
},
"devDependencies": {
"@babel/preset-typescript": "^7.23.3",
Expand Down
Binary file added public/images/tokens/cbBTC.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/tokens/cbBTC.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2981622

Please sign in to comment.