Skip to content

Commit

Permalink
Merge pull request #1 from peercoin/master
Browse files Browse the repository at this point in the history
Updating master
  • Loading branch information
captainbuckkets committed Feb 23, 2021
2 parents fab9f31 + f70b341 commit 7981abd
Show file tree
Hide file tree
Showing 30 changed files with 28,318 additions and 9,535 deletions.
36,520 changes: 27,225 additions & 9,295 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"react-i18next": "^10.12.2",
"react-render-html": "^0.6.0",
"react-router-dom": "^5.0.1",
"react-scripts": "3.4.1",
"react-scripts": "3.4.4",
"react-transition-group": "^4.2.2",
"react-twitter-embed": "^2.0.8",
"react-youtube": "^7.9.0",
Expand Down Expand Up @@ -42,6 +42,6 @@
]
},
"devDependencies": {
"node-sass": "^4.12.0"
"node-sass": "^4.14.1"
}
}
Binary file removed public/img/exchanges/coinegg_green.png
Binary file not shown.
Binary file removed public/img/exchanges/coinmarketcap_green.png
Binary file not shown.
Binary file added public/img/exchanges/coinspot_green.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/exchanges/i2trading_green.png
Binary file not shown.
Binary file removed public/img/exchanges/livecoin_green.png
Binary file not shown.
Binary file removed public/img/exchanges/shapeshift_green.png
Binary file not shown.
Binary file added public/img/exchanges/swapzone_green.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/img/wallets/coinvault.png
100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/wallets/cryptonator.png
Binary file not shown.
Binary file removed public/img/wallets/magnum.png
Binary file not shown.
5 changes: 2 additions & 3 deletions public/locales/cn/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"generalFundPpcAddress": "General Fund - PPC Donation Address:",
"generalFundBtcAddress": "General Fund - BTC Donation Address:",
"exchangeBtcAddress": "Exchange Listing Fund - BTC Donation Address:",
"viewOnExplorer":"View on explorer",
"viewOnExplorer": "View on explorer",
"contactUsTitle": "联系我们",
"addressCountry": "The Netherlands"
},
Expand Down Expand Up @@ -214,7 +214,6 @@
"explorersMainnet": "Mainnet",
"explorersTestnet": "Testnet",
"toolsTitle": "Resources",
"toolsInflation": "通货膨胀",
"toolsMempool": "内存池",
"toolsEnergyStatistics": "能源统计",
"toolsTestnetFaucet": "Testnet水龙头",
Expand Down Expand Up @@ -357,4 +356,4 @@
},
"latestNewsTitle": "最新消息"
}
}
}
32 changes: 28 additions & 4 deletions public/locales/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"projects": "Projekte",
"blog": "Blog",
"peercoinFoundation": "Peercoin Foundation",
"contactUs": "Kontaktieren Sie uns"
"contactUs": "Kontaktieren Sie uns",
"contribute": "Mitwirken"
},
"wallet": {
"title": "Wallet"
Expand Down Expand Up @@ -123,10 +124,31 @@
"generalFundPpcAddress": "General Fund - PPC Donation Address:",
"generalFundBtcAddress": "General Fund - BTC Donation Address:",
"exchangeBtcAddress": "Exchange Listing Fund - BTC Donation Address:",
"viewOnExplorer":"View on explorer",
"viewOnExplorer": "View on explorer",
"contactUsTitle": "Kontakt",
"addressCountry": "The Netherlands"
},
"contributePage": {
"contributeTitle": "Mitwirken ",
"conributeDescription": "Wie Sie Peercoin besser machen können",
"contributeIntro": "Peercoin ist ein quelloffenes Projekt, und Sie können uns jederzeit helfen es besser zu machen! Es gibt viele Arten zu Helfen:",
"header": {
"reportBugs": "Fehler melden",
"helpOthers": "Anderen bei ihren Fehlermeldungen helfen",
"translate": "Übersetzen Sie Peercoin in Ihre Sprache",
"write": "Code schreiben"
},
"content": {
"reportBugs": "If you find bugs in Peercoin client, we need you to file them in our issue tracker. \n Your problem may have already been reported, so it’s a good idea to check to avoid filing a duplicate. \n You have suggestions for new features or enhancements? \n Open an issue at our GitHub.",
"helpOthers": "You can help the development team keep up with the bug reports by closing duplicates, helping to clarify reporters problems, and confirming that you can reproduce bugs. Our Discord or our forums would be a good start.",
"translate": "Peercoin has been translated into dozens of languages, but if the translation for your language doesn’t exist or is out of date, you can help bring Peercoin to entire new populations simply by translating some text.",
"write": "We welcome code contributions from anyone, whether you have a one-line fix or a big idea, a lot of experience programming or none at all."
},
"buttons": {
"help": "Forum",
"translate": "Transifex"
}
},
"contactPage": {
"contactTitle": "Kontakt",
"contactDescription": "Bei allgemeinen Anfragen, wenden Sie sich an die Peercoin Foundation - wir antworten Ihnen gerne!",
Expand Down Expand Up @@ -214,7 +236,6 @@
"explorersMainnet": "Mainnet",
"explorersTestnet": "Testnet",
"toolsTitle": "Resources",
"toolsInflation": "Inflation",
"toolsMempool": "Mempool",
"toolsEnergyStatistics": "Statistiken zum Energieverbrauch",
"toolsTestnetFaucet": "Testnet Faucet",
Expand Down Expand Up @@ -356,5 +377,8 @@
"communityText2": "Wichtige Updates können Sie auch direkt auf Ihr Smartphone bekommen über Plattformen wie <a href=\"https://blockfolio.com/\">Blockfolio</a>, <a href=\"https://delta.app/\">Delta</a>, und <a href=\"https://www.coingecko.com/\">CoinGecko</a>. Abonnieren Sie die News, um auf dem Laufenden zu bleiben."
},
"latestNewsTitle": "Aktuelles"
},
"notFoundPage": {
"title": "404 Angeforderte URL nicht gefunden"
}
}
}
40 changes: 33 additions & 7 deletions public/locales/en-US/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"projects": "Projects",
"blog": "Blog",
"peercoinFoundation": "Peercoin Foundation",
"contactUs": "Contact Us"
"contactUs": "Contact Us",
"contribute": "Contribute"
},
"wallet": {
"title": "Wallet"
Expand Down Expand Up @@ -121,13 +122,35 @@
"missionStatementText2": "The Peercoin blockchain network and the Peercoin project in general is an open-source decentralized ledger, with no governing body. The Peercoin Foundation makes no claims over intellectual property related to the Peercoin project, unless explicitly stated otherwise.",
"technicalSupportTitle": "Community Support",
"technicalSupportText": "If you would like to get involved with Peercoin, or would simply like to support the team, there are a handful of options at your disposal. If you are interested in becoming a developer for Peercoin or Peercoin related projects such as PeerAssets, send us an email at foundation@peercoin.net. If you would like to donate PPC to the Peercoin Foundation to support the expansion of a project, simply send your PPC donation to the multisignature address below.",
"generalFundPpcAddress": "General Fund - PPC Donation Address:",
"generalFundBtcAddress": "General Fund - BTC Donation Address:",
"exchangeBtcAddress": "Exchange Listing Fund - BTC Donation Address:",
"viewOnExplorer":"View on explorer",
"generalFundPpcAddress": "General Fund - <strong>PPC</strong> Donation Address:",
"generalFundBtcAddress": "General Fund - <strong>BTC</strong> Donation Address:",
"exchangeBtcAddress": "Exchange Listing Fund - <strong>BTC</strong> Donation Address:",
"viewOnExplorer": "View on explorer",
"openCollectiveNote": "Fiat Donations - <strong>USD/EUR</strong> by Credit/Debit/Wire:",
"contactUsTitle": "Contact Us",
"addressCountry": "The Netherlands"
},
"contributePage": {
"contributeTitle": "Contribute ",
"conributeDescription": "How You Can Help Make Peercoin Better",
"contributeIntro": "Peercoin is a free/open-source project, and you are more than welcome to help us make it better! There are many ways you can help:",
"header": {
"reportBugs": "Report Bugs",
"helpOthers": "Help Others With Their Bug Reports",
"translate": "Translate Peercoin Into Your Language",
"write": "Write Code"
},
"content": {
"reportBugs": "If you find bugs in Peercoin client, we need you to file them in our issue tracker. \n Your problem may have already been reported, so it’s a good idea to check to avoid filing a duplicate. \n You have suggestions for new features or enhancements? \n Open an issue at our GitHub.",
"helpOthers": "You can help the development team keep up with the bug reports by closing duplicates, helping to clarify reporters problems, and confirming that you can reproduce bugs. Our Discord or our forums would be a good start.",
"translate": "Peercoin has been translated into dozens of languages, but if the translation for your language doesn’t exist or is out of date, you can help bring Peercoin to entire new populations simply by translating some text.",
"write": "We welcome code contributions from anyone, whether you have a one-line fix or a big idea, a lot of experience programming or none at all."
},
"buttons": {
"help": "Forums",
"translate": "Transifex"
}
},
"contactPage": {
"contactTitle": "Contact Us",
"contactDescription": "For general inquiries, the Peercoin Foundation is here to answer!",
Expand Down Expand Up @@ -192,7 +215,7 @@
"contributeText": "Peercoin is always under development and any developer is welcome to contribute. There are a variety of ways to contribute, including core development and writing documentation. Please check our GitHub below to get started.",
"contributeBtn": "GitHub",
"documentationTitle": "Documentation",
"documentationText": "To learn more about the technical details of Peercoin and how to use existing tools or framework, it is recommended that you start by reading the Peercoin documentation.",
"documentationText": "To learn more about the technical details of Peercoin and how to use existing tools or framework, it is recommended that you start by reading the Peercoin documentation.",
"documentationBtn": "Documentation",
"miningTitle": "Mining",
"miningText1": "Peercoin uses the hashcash double iterated SHA-256 algorithm for proof-of-work mining. This means that any hardware that can mine Bitcoin can mine Peercoin as well.",
Expand All @@ -215,7 +238,7 @@
"explorersMainnet": "Mainnet",
"explorersTestnet": "Testnet",
"toolsTitle": "Resources",
"toolsInflation": "Inflation",
"toolsCharts": "Charts",
"toolsMempool": "Mempool",
"toolsEnergyStatistics": "Energy Statistics",
"toolsTestnetFaucet": "Testnet Faucet",
Expand Down Expand Up @@ -363,5 +386,8 @@
"communityText2": "Important updates can also be delivered directly to your mobile device through platforms like <a href=\"https://blockfolio.com/\">Blockfolio</a>, <a href=\"https://delta.app/\">Delta</a>, and <a href=\"https://www.coingecko.com/\">CoinGecko</a>. Subscribe to stay up to date with the latest news."
},
"latestNewsTitle": "Latest News"
},
"notFoundPage": {
"title": "404 Requested URL not found"
}
}
9 changes: 4 additions & 5 deletions public/locales/es/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"generalFundPpcAddress": "General Fund - PPC Donation Address:",
"generalFundBtcAddress": "General Fund - BTC Donation Address:",
"exchangeBtcAddress": "Exchange Listing Fund - BTC Donation Address:",
"viewOnExplorer":"View on explorer",
"viewOnExplorer": "View on explorer",
"contactUsTitle": "Contáctenos",
"addressCountry": "The Netherlands"
},
Expand Down Expand Up @@ -214,7 +214,6 @@
"explorersMainnet": "Mainnet",
"explorersTestnet": "Testnet",
"toolsTitle": "Recursos",
"toolsInflation": "Inflación",
"toolsMempool": "Mempool",
"toolsEnergyStatistics": "Estadísticas energéticas",
"toolsTestnetFaucet": "Testnet Faucet",
Expand Down Expand Up @@ -268,7 +267,7 @@
"text4": "Create peercoin.conf in <code>%APPDATA%\\PPCoin</code>",
"text5": "Correr <code>daemon\\peercoind</code>",
"text6": "Su billetera se encuentra en <code>C:\\Users\\{username}\\AppData</code> (carpeta oculta).",
"text7": "Abra la carpeta co <code>Menú de inicio -> Ejecutar ...</code> (o presione <code>Winkey-R</code>), escriba <code>%APPDATA%\\PPCoin</code> en el campo, y presione Enter.",
"text7": "Abra la carpeta co <code>Menú de inicio -> Ejecutar ...</code> (o presione <code>Winkey-R</code>), escriba <code>%APPDATA%\\PPCoin</code> en el campo, y presione Enter.",
"text8": "Ayuda adicional se puede encontrar de peercoin en su <a href=\"https://docs.peercoin.net/\">Peercoin Documentation</a> o preguntando por nuestro <a href=\"https://talk.peercoin.net/\">foros</a>."
},
"sectionMac": {
Expand Down Expand Up @@ -317,7 +316,7 @@
"userGovernanceText1": "En Peercoin, los propietarios de monedas (stakeholders) son quienes ejercen influencia sobre La red, produce nuevos bloques, y asegura la cadena. Las partes interesadas de Peercoin co-propietario de la cadena de bloques y decidir colectivamente su futuro a través de la votación de protocolo.",
"userGovernanceText2": "La votación se lleva a cabo de la misma manera que se asegura Peercoin, a través de un proceso llamado Proof-of-stake, la acuñación de Las partes interesadas participan en la acuñación simplemente instalando la versión de Peercoin que soportan, cargando su billetera con PPC, y sosteniendo ellos mientras que ocasionalmente son seleccionados por el protocolo de Peercoin para acuñar el próximo Bloque en la cadena. Cada bloque acuñado recompensa a las partes interesadas con un nuevo PPC y un voto.",
"userGovernanceText3": "Esto hace que Peercoin sea el primer blockchain capaz de permitir que sus reglas de protocolo ser gobernados directamente por sus usuarios, lo que hace que la red sea más descentralizada, Democrático, y fácilmente asegurado por personas de todo el mundo.",
"trustlessTitle": "Capa base sin confianza",
"trustlessTitle": "Capa base sin confianza",
"trustlessText1": "Dado que el blockchain es inmutable por su propia naturaleza y todos los datos registrados se almacena para siempre, la hinchazón de la cadena se convierte en un problema creciente a un mayor uso niveles que dañan tanto la seguridad como la capacidad de la red para escalar.",
"trustlessText2": "Para preservar la seguridad sin confianza de la cadena de bloques y garantizar su capacidad para escalar a los niveles de uso globales, los inventores de Peercoin adaptaron el blockchain y su economía para cumplir con el papel específico de la red de liquidación de capa base.",
"trustlessText3": "Este rol enfoca el desarrollo de Peercoin en la modularidad, manteniendo el protocolo simple y Asegúrelo con la menor cantidad de funciones posible, mientras mantiene la cadena de bloques como una base Estable sobre la cual se puede construir cualquier número de capas adicionales en la parte superior.",
Expand Down Expand Up @@ -357,4 +356,4 @@
},
"latestNewsTitle": "Últimas noticias"
}
}
}
5 changes: 2 additions & 3 deletions public/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"generalFundPpcAddress": "Fond Général - Adresse Donation PPC:",
"generalFundBtcAddress": "Fond Général - Adresse Donation BTC:",
"exchangeBtcAddress": "Fond pour l'inscription aux Exchanges - Adresse Donation BTC:",
"viewOnExplorer":"View on explorer",
"viewOnExplorer": "View on explorer",
"contactUsTitle": "Contactez-Nous",
"addressCountry": "The Netherlands"
},
Expand Down Expand Up @@ -214,7 +214,6 @@
"explorersMainnet": "Réseau principal",
"explorersTestnet": "Réseau de preuves",
"toolsTitle": "Resources",
"toolsInflation": "Inflation",
"toolsMempool": "Mempool",
"toolsEnergyStatistics": "Energy Statistics",
"toolsTestnetFaucet": "Testnet Faucet",
Expand Down Expand Up @@ -357,4 +356,4 @@
},
"latestNewsTitle": "Dernières nouvelles"
}
}
}
13 changes: 6 additions & 7 deletions public/locales/kr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"generalFundPpcAddress": "피어코인 재단 다중 서명 기부 주소:",
"generalFundBtcAddress": "피어코인 재단 비트코인 다중 서명 기부 주소:",
"exchangeBtcAddress": "Exchange Listing Fund - BTC Donation Address:",
"viewOnExplorer":"View on explorer",
"viewOnExplorer": "View on explorer",
"contactUsTitle": "문의하기",
"addressCountry": "The Netherlands"
},
Expand Down Expand Up @@ -214,7 +214,6 @@
"explorersMainnet": "메인넷",
"explorersTestnet": "테스트넷",
"toolsTitle": "리소스",
"toolsInflation": "인플레이션",
"toolsMempool": "메모리풀",
"toolsEnergyStatistics": "에너지 통계",
"toolsTestnetFaucet": "테스트넷 Faucet",
Expand Down Expand Up @@ -242,7 +241,7 @@
"brandIdentityGreen": "녹색",
"brandIdentityFont": "피어코인 텍스트 로고는 아래 폰트를 사용합니다",
"brandIdentityFontFont": "폰트",
"brandIdentityFontType": "타입,
"brandIdentityFontType": "타입",
"brandIdentityFontWebsite": "웹사이트",
"brandIdentityFontRoboto": " 피어코인 웹사이트와 지갑 컨텐츠는 Roboto 폰트를 사용합니다."
},
Expand All @@ -265,10 +264,10 @@
"text2": "기본 설치 폴더는 <code>C:\\Program Files\\PPCoin 또는 C:\\Program Files\\Peercoin</code>",
"text3": "<code>peercoin-qt</code> 또는 <code>peercoin</code> 을 시작 메뉴 또는 설치 디렉토리에서 실행하세요",
"title2": "데몬",
"text4": "ppcoin.conf 를 <code>%APPDATA%\PPCoin</code> 에 생성",
"text4": "ppcoin.conf 를 <code>%APPDATA%PPCoin</code> 에 생성",
"text5": "<code>daemon\\peercoind</code> 실행",
"text6": "당신의 지갑은 <code>C:\Users\&lt;username&gt;\AppData</code> 에 있습니다(숨김 폴더)..",
"text7": "<code>시작 메뉴 -> 실행...</code> (또는 단축키 <code>Winkey-R</code>) 메뉴를 선택하여 <code>%APPDATA%\PPCoin</code> 라고 입력 후 엔터를 클릭해서 폴더를 엽니다.",
"text6": "당신의 지갑은 <code>C:Users&lt;username&gt;AppData</code> 에 있습니다(숨김 폴더)..",
"text7": "<code>시작 메뉴 -> 실행...</code> (또는 단축키 <code>Winkey-R</code>) 메뉴를 선택하여 <code>%APPDATA%PPCoin</code> 라고 입력 후 엔터를 클릭해서 폴더를 엽니다.",
"text8": "추가적인 도움은 피어코인 <a href=\"https://docs.peercoin.net/\">문서</a> 또는 <a href=\"https://talk.peercoin.net/\">포럼</a> 에서 찾을 수 있습니다."
},
"sectionMac": {
Expand Down Expand Up @@ -357,4 +356,4 @@
},
"latestNewsTitle": "최신 소식"
}
}
}

0 comments on commit 7981abd

Please sign in to comment.