Skip to content

Commit

Permalink
Merge branch 'main' into feat/paper_wallet
Browse files Browse the repository at this point in the history
  • Loading branch information
shanimal08 committed Oct 14, 2024
2 parents 27d5977 + f262c16 commit 1d75a78
Show file tree
Hide file tree
Showing 85 changed files with 665 additions and 603 deletions.
56 changes: 28 additions & 28 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@
"lint:fix": "eslint src/ --fix"
},
"dependencies": {
"@floating-ui/react": "^0.26.24",
"@floating-ui/react": "^0.26.25",
"@tauri-apps/api": "^1",
"emoji-regex": "^10.4.0",
"framer-motion": "^11.11.7",
"framer-motion": "^11.11.8",
"globals": "^15.11.0",
"i18next": "^23.15.2",
"i18next": "^23.16.0",
"i18next-browser-languagedetector": "^8.0.0",
"i18next-http-backend": "^2.6.2",
"linkify-react": "^4.1.3",
"lottie-react": "^2.4.0",
"react": "^18.3.1",
"react-dom": "^18.2.0",
"react-hook-form": "^7.52.2",
"react-i18next": "^15.0.2",
"react-i18next": "^15.0.3",
"react-icons": "^5.3.0",
"styled-components": "^6.1.12",
"uuid": "^10.0.0",
Expand All @@ -39,7 +39,7 @@
"@types/eslint__js": "^8.42.3",
"@types/node": "^22.7.5",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.2.7",
"@types/react-dom": "^18.3.1",
"@types/uuid": "^10.0.0",
"@typescript-eslint/parser": "^8.3.0",
"@vitejs/plugin-react": "^4.3.2",
Expand All @@ -48,12 +48,12 @@
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.1",
"eslint-plugin-react-hooks": "^5.1.0-rc-d48603a5-20240813",
"eslint-plugin-react-hooks": "^5.0.0",
"prettier": "3.3.3",
"prettier-eslint": "^16.3.0",
"react-qr-code": "^2.0.15",
"typescript": "^5.6.3",
"typescript-eslint": "^8.8.1",
"vite": "^5.4.8"
"vite": "^5.4.9"
}
}
3 changes: 2 additions & 1 deletion public/locales/af/airdrop.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@
"topTooltipText": "Kry \"n Tari Airdrop deur edelstene in te samel. Hoe meer edelstene jy verdien, hoe groter is jou airdrop.",
"topTooltipTitle": "Testnet Belonings",
"claimModalFinePrint": "<strong>Neem asseblief kennis:</strong> die eis van edelstene skakel analise aan sodat ons Universe kan verbeter",
"inviteFriendsText": "Kopieer skakel en deel dit"
"inviteFriendsText": "Kopieer skakel en deel dit",
"logged-in-as": "Aangemeld as <strong>@{{twitter}}</strong>"
}
12 changes: 7 additions & 5 deletions public/locales/af/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@
"mode": "Modus",
"day": "Dag",
"shutting-down": "Afskakel..",
"critical-error": "Critical error",
"please-try-again-later": "Please try again later. If the problem persists, please contact us.",
"close-tari-universe": "Close Tari Universe",
"critical-error": "Kritieke fout",
"please-try-again-later": "Probeer asseblief later weer. As die probleem voortduur, kontak ons asseblief.",
"close-tari-universe": "Sluit Tari Universe",
"tari-universe": "Tari Heelal",
"testnet": "Toetsnetwerk",
"continue": "Continue",
"restart": "Restart"
"continue": "Gaan voort",
"restart": "Herbegin",
"connection": "Verbinding",
"disconnect": "Ontkoppel"
}
18 changes: 9 additions & 9 deletions public/locales/af/components.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"field-error-message": {
"invalid": "Veld ongeldig",
"required": "Veld benodig",
"password-too-short": "Wagwoord moet ten minste 8 karakters hê",
"invalid-url": "Moet 'n geldige URL-adres wees",
"invalid-email": "Voer 'n geldige e-posadres in",
"invalid-date": "Datum is ongeldig",
"integers-only": "Slegs heelgetalle toegelaat"
}
"field-error-message": {
"invalid": "Veld ongeldig",
"required": "Veld benodig",
"password-too-short": "Wagwoord moet ten minste 8 karakters hê",
"invalid-url": "Moet 'n geldige URL-adres wees",
"invalid-email": "Voer 'n geldige e-posadres in",
"invalid-date": "Datum is ongeldig",
"integers-only": "Slegs heelgetalle toegelaat"
}
}
6 changes: 3 additions & 3 deletions public/locales/af/external-dependency-dialog.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"title": "External Dependencies",
"description": "The following external dependencies are required for the application to function correctly.",
"download-and-install": "Download and install"
"title": "Eksterne Afhanklikhede",
"description": "Die volgende eksterne afhanklikhede is nodig vir die toepassing om korrek te funksioneer.",
"download-and-install": "Laai af en installeer"
}
25 changes: 14 additions & 11 deletions public/locales/af/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
"last-block-added-time": "Tyd toe laaste blok by ketting gevoeg was",
"visual-mode": "Visuele modus",
"gpu-unavailable": "⚠️ GPU gedeaktiveer omdat jou hardeware dit nie ondersteun nie",
"reset-settings": "Reset Settings",
"reset-permanently": "Are you sure you want to reset all settings permanently?",
"reset-wallet": "Reset wallet",
"connected-to-tari": "Connected to the Tari Network",
"not-connected-to-tari": "Not connected to the Tari Network",
"connected-peers": "Connected Peers",
"should-use-system-language": "Use system language",
"reset-settings": "Stel Instellings Terug",
"reset-permanently": "Is jy seker jy wil alle instellings permanent terugstel?",
"reset-wallet": "Stel beursie terug",
"connected-to-tari": "Gekoppel aan die Tari Netwerk",
"not-connected-to-tari": "Nie aan die Tari Netwerk gekoppel nie",
"connected-peers": "Gekoppelde Eweknieë",
"should-use-system-language": "Gebruik stelsel taal",
"send-logs": "Stuur logs",
"your-feedback": "Beskryf asseblief u probleem",
"feedback-required": "Terugvoer is vereis",
Expand Down Expand Up @@ -57,8 +57,11 @@
"disconnect": "Ontkoppel van Airdrop",
"inviteCode": "Uitnodigingskode",
"use-tor": "Gebruik Tor",
"importing-wallet": "Importing wallet",
"action-requires-restart": "This action requires restart to apply changes",
"low-hash-rate-warning": "Your hash rate is very low. Try closing all apps other than Tari Universe",
"invalid-seed-words": "Enter 24 words separated by spaces"
"importing-wallet": "Beursie invoer",
"action-requires-restart": "Hierdie aksie vereis \"n herbegin om veranderinge toe te pas",
"low-hash-rate-warning": "Jou hash rate is baie laag. Probeer om alle toepassings behalwe Tari Universe te sluit",
"invalid-seed-words": "Voer 24 woorde in, geskei deur spasies",
"yes": "Yes",
"cancel": "Cancel",
"report-issue": "Rapporteer \"n probleem"
}
54 changes: 27 additions & 27 deletions public/locales/af/setup-view.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"setting-up": "Stel Tari waarheidsmasjien op...",
"this-might-take-a-few-minutes": "Hierdie mag 'n paar minute neem",
"dont-worry": "Moenie bekommerd wees nie, volgende keer sal dit nie so lank vat nie",
"title": {
"starting-up": "Begin",
"checking-latest-version-gpuminer": "Bepaal nuutste weergawe van xtrgpuminer",
"checking-latest-version-node": "Bepaal nuutste weergawe van node",
"checking-latest-version-mmproxy": "Bepaal nuutste weergawe van mmproxy",
"checking-latest-version-wallet": "Bepaal nuutste weergawe van beursie",
"checking-latest-version-xmrig": "Bepaal nuutste weergawe van xmrig",
"checking-latest-version-sha-p2pool": "Bepaal nuutste weergawe van sha-p2pool",
"waiting-for-wallet": "Wag vir beursie",
"waiting-for-node": "Wag vir node om te sinkroniseer",
"preparing-for-initial-sync": "Gekoppel aan netwerk nodes {{initial_connected_peers}}/{{required_peers}}",
"starting-mmproxy": "Begin mmproxy",
"starting-p2pool": "Begin P2Pool",
"application-started": "Toepassings het begin",
"downloading": "Besig om af te laai",
"download-completed": "Aflaai voltooi",
"waiting-for-header-sync": "Wag vir kopkopsinchronisasie. {{local_height}}/{{tip_height}} gesinchroniseer",
"waiting-for-block-sync": "Wag vir bloksinchronisasie. {{local_height}}/{{tip_height}} gesinchroniseer"
},
"new-tari-version-available": "'n Nuwe weergawe van Tari Universe is beskikbaar",
"would-you-like-to-install": "Wil jy nou Tari Universe {{version}} installeer?",
"yes": "Ja",
"no": "Nee"
}
"setting-up": "Stel Tari waarheidsmasjien op...",
"this-might-take-a-few-minutes": "Hierdie mag 'n paar minute neem",
"dont-worry": "Moenie bekommerd wees nie, volgende keer sal dit nie so lank vat nie",
"title": {
"starting-up": "Begin",
"checking-latest-version-gpuminer": "Bepaal nuutste weergawe van xtrgpuminer",
"checking-latest-version-node": "Bepaal nuutste weergawe van node",
"checking-latest-version-mmproxy": "Bepaal nuutste weergawe van mmproxy",
"checking-latest-version-wallet": "Bepaal nuutste weergawe van beursie",
"checking-latest-version-xmrig": "Bepaal nuutste weergawe van xmrig",
"checking-latest-version-sha-p2pool": "Bepaal nuutste weergawe van sha-p2pool",
"waiting-for-wallet": "Wag vir beursie",
"waiting-for-node": "Wag vir node om te sinkroniseer",
"preparing-for-initial-sync": "Gekoppel aan netwerk nodes {{initial_connected_peers}}/{{required_peers}}",
"starting-mmproxy": "Begin mmproxy",
"starting-p2pool": "Begin P2Pool",
"application-started": "Toepassings het begin",
"downloading": "Besig om af te laai",
"download-completed": "Aflaai voltooi",
"waiting-for-header-sync": "Wag vir kopkopsinchronisasie. {{local_height}}/{{tip_height}} gesinchroniseer",
"waiting-for-block-sync": "Wag vir bloksinchronisasie. {{local_height}}/{{tip_height}} gesinchroniseer"
},
"new-tari-version-available": "'n Nuwe weergawe van Tari Universe is beskikbaar",
"would-you-like-to-install": "Wil jy nou Tari Universe {{version}} installeer?",
"yes": "Ja",
"no": "Nee"
}
22 changes: 11 additions & 11 deletions public/locales/af/sidebar.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"auto-miner": "Outomatiese mynwerker",
"auto-miner-description": "Outomatiese mynwerker sal aanskakel wanneer jou masjien onaktief is",
"next-milestone": "Volgende mylpaal",
"wallet-balance": "Beursie balans",
"setup-scheduler": "Stel skeduleerder op",
"mining-schedules": "Mynskedules",
"mining-schedules-description": "Skeduleer jou myn-aktiwiteit",
"lost-connection": "Lost connection to the Tari Network. Reconnecting..",
"block": "Block",
"recent-wins": "Recent wins"
}
"auto-miner": "Outomatiese mynwerker",
"auto-miner-description": "Outomatiese mynwerker sal aanskakel wanneer jou masjien onaktief is",
"next-milestone": "Volgende mylpaal",
"wallet-balance": "Beursie balans",
"setup-scheduler": "Stel skeduleerder op",
"mining-schedules": "Mynskedules",
"mining-schedules-description": "Skeduleer jou myn-aktiwiteit",
"lost-connection": "Verbinding met die Tari Netwerk verloor. Herverbinding..",
"block": "Blok",
"recent-wins": "Onlangse oorwinnings"
}
2 changes: 1 addition & 1 deletion public/locales/af/tribes-view.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"title": "Stamme-sig"
"title": "Stamme-sig"
}
3 changes: 2 additions & 1 deletion public/locales/cn/airdrop.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@
"topTooltipText": "通过收集宝石获得 Tari 空投。你赚取的宝石越多,空投就越大。",
"topTooltipTitle": "测试网奖励",
"claimModalFinePrint": "<strong>请注意:</strong> 领取宝石会开启分析功能,以便我们改进 Universe",
"inviteFriendsText": "复制链接并分享"
"inviteFriendsText": "复制链接并分享",
"logged-in-as": "登录为 <strong>@{{twitter}}</strong>"
}
Loading

0 comments on commit 1d75a78

Please sign in to comment.