Skip to content

Commit

Permalink
Merge branch 'master' into 20.0.0-dev-merge-master
Browse files Browse the repository at this point in the history
  • Loading branch information
thephez committed Nov 15, 2023
2 parents d381513 + 82c3e4f commit b4828bd
Show file tree
Hide file tree
Showing 1,081 changed files with 105,583 additions and 117,579 deletions.
6 changes: 0 additions & 6 deletions .tx/config
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,6 @@ source_lang = en
type = PO
minimum_perc = 0

[o:dash:p:dash-docs:r:docs--user--masternodes--advanced]
file_filter = locale/<lang>/LC_MESSAGES/docs/user/masternodes/advanced.po
source_file = locale/pot/docs/user/masternodes/advanced.pot
source_lang = en
type = PO

[o:dash:p:dash-docs:r:docs--user--masternodes--hosting]
file_filter = locale//<lang>/LC_MESSAGES/docs/user/masternodes/hosting.po
source_file = locale/pot/docs/user/masternodes/hosting.pot
Expand Down
1 change: 1 addition & 0 deletions _templates/languages.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<option value="en" selected="selected">English</option>
<option value="es">Español</option>
<option value="fr">Français</option>
<option value="it">Italiano</option>
<option value="pt">Português</option>
<option value="tl">Tagalog</option>
<option value="vi">Tiếng Việt</option>
Expand Down
11 changes: 6 additions & 5 deletions _templates/sidebar-main.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,17 @@
<ul class="nav bd-sidenav">

<li class="toctree-l1"><a class="reference internal"
href="https://dashplatform.readme.io/docs/introduction-what-is-dash-platform">Introduction</a></li>
href="https://docs.dash.org/projects/platform/en/stable/docs/intro/what-is-dash-platform.html">Introduction</a>
</li>
<li class="toctree-l1"><a class="reference internal"
href="https://dashplatform.readme.io/docs/tutorials-introduction">Tutorials</a>
href="https://docs.dash.org/projects/platform/en/stable/docs/tutorials/introduction.html">Tutorials</a>
</li>
<li class="toctree-l1"><a class="reference internal"
href="https://dashplatform.readme.io/docs/explanation-dapi">Explanations</a></li>
href="https://docs.dash.org/projects/platform/en/stable/docs/explanations/dapi.html">Explanations</a></li>
<li class="toctree-l1"><a class="reference internal"
href="https://dashplatform.readme.io/docs/reference-dapi-endpoints">Reference</a></li>
href="https://docs.dash.org/projects/platform/en/stable/docs/reference/dapi-endpoints.html">Reference</a></li>
<li class="toctree-l1"><a class="reference internal"
href="https://dashplatform.readme.io/docs/platform-protocol-reference-overview">Platform Protocol</a></li>
href="https://docs.dash.org/projects/platform/en/stable/docs/protocol-ref/overview.html">Platform Protocol</a></li>
</li>

</ul>
Expand Down
3 changes: 2 additions & 1 deletion conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
# -- intersphinx configuration -----------------------------------------------
intersphinx_mapping = {
"core": ("https://docs.dash.org/projects/core/en/stable/", None),
"platform": ("https://docs.dash.org/projects/platform/en/stable/", None),
}

# We recommend adding the following config value.
Expand All @@ -138,7 +139,7 @@
html_theme_options = {
"external_links": [
{"name": "Core docs", "url": "https://docs.dash.org/projects/core/en/stable/docs/index.html"},
{"name": "Platform docs", "url": "https://dashplatform.readme.io"},
{"name": "Platform docs", "url": "https://docs.dash.org/projects/platform/en/stable/docs/index.html"},
{"name": "Dash.org", "url": "https://www.dash.org"},
{"name": "Forum", "url": "https://www.dash.org/forum"},
],
Expand Down
2 changes: 1 addition & 1 deletion docs/user/developers/integration-apis.rst
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ providers.
- Documentation: https://nownodes.io/documentation

Tokenview
--------
---------

.. image:: img/tokenview.png
:width: 200px
Expand Down
2 changes: 1 addition & 1 deletion docs/user/introduction/information.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Official sites
- **Website:** https://www.dash.org
- **User documentation:** https://docs.dash.org
- **Dash Core Documentation:** https://docs.dash.org/core
- **Dash Platform Documentation:** https://dashplatform.readme.io
- **Dash Platform Documentation:** https://docs.dash.org/platform
- **GitHub:** https://github.com/dashpay
- **GitHub (Evolution):** https://github.com/dashevo
- **Roadmap:** https://www.dash.org/roadmap/
Expand Down
11 changes: 6 additions & 5 deletions docs/user/masternodes/hosting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,17 @@ NodeHub.io
.. image:: img/nodehub.png
:width: 200px
:align: right
:target: https://nodehub.io
:target: https://nodehub.io?utm_source=dashpay-docs&utm_medium=hosting-services

https://nodehub.io

- Operated by: NodeHub.io Platform
- Services: Hosting, Governance, Stats
- Cost: $9.90/month (charged daily at $0.33)
- `Site <https://nodehub.io>`__
- Operated by: NodeHub LLC
- Services: Hosting, Governance, Stats, Monitoring
- Cost: $3.90/month (charged daily at $0.13)
- `Site <https://nodehub.io?utm_source=dashpay-docs&utm_medium=hosting-services>`__
- `Email <[email protected]>`__
- `Twitter <https://twitter.com/nodehubio>`__
- `Telegram <https://t.me/nodehub>`__
- `Discord <https://discord.nodehub.io>`__


Expand Down
2 changes: 1 addition & 1 deletion docs/user/masternodes/setup-evonode.rst
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ dashmate dependencies::
newgrp docker
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
source ~/.bashrc
nvm install 16
nvm install 18

Install dashmate::

Expand Down
10 changes: 5 additions & 5 deletions docs/user/masternodes/understanding.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ means that Dash can scale more efficiently and deploy services more
quickly than a blockchain run entirely by unpaid volunteers. The more
masternodes, the better and safer the Dash network.

As of November 2018, the Dash network has `over 5000 masternodes located
<http://178.254.23.111/~pub/masternode_count.png>`_ in over `45
countries <https://chainz.cryptoid.info/dash/masternodes.dws>`_ and
As of September 2023, the Dash network has `almost 3500 masternodes located
<http://178.254.23.111/~pub/masternode_count.png>`_ in `19
countries <https://chainz.cryptoid.info/dash/#!network>`_ and
hosted on `over 140 ISPs
<http://178.254.23.111/~pub/Dash/masternode_ISPs.html>`_. The block
reward is approximately 3.34 Dash, so the selected masternode receives
1.67 Dash per payment or approximately 6 Dash per month. The block
reward is approximately 2.310 Dash, so the selected masternode receives
1.344 Dash per payment or approximately 6 Dash per month. The block
reward decreases by 7.14% approximately once per year, so the annual
earnings for a masternode owner is approximately 7% of the collateral,
and will decrease over time `as calculated here
Expand Down
67 changes: 45 additions & 22 deletions docs/user/wallets/dashcore/advanced.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,40 +45,36 @@ affecting the locked UTXOs.
Locking UTXOs in Dash Core wallet


.. _dashcore-hd:
.. _dashcore-testnet:

HD Wallets
==========
Running Dash Testnet
====================

.. _dashcore-hd-default:
It is recommended to run Dash Core on testnet for your experimentations.
To start on testnet via the command line, do the following:

Enable HD Wallet Creation
-------------------------
For Linux::

Dash Core includes an implementation of BIP39/BIP44 compatible hierarchical
deterministic (HD) key generation. We will use the Windows GUI wallet in this
example, but the commands are similar if using ``dash-qt`` or ``dashd`` on other
operating systems. Enter the following command to configure Dash Core to
generate HD wallets by default::
./dash-qt -testnet

dash-qt.exe -usehd
For Mac (run from Applications/Dash-Qt.app/Contents/MacOS)::

To make this configuration persist between restarts, add ``usehd=1`` to the
``dash.conf`` file.
Dash-Qt -testnet

Note: You may need to allow an app from an unknown developer before running this.
Cmd+Click on the application and click **Open**.

View HD wallet information
--------------------------
Now, open Mac Terminal and run::

Open the console from **Window > Console** or issue the following RPC command
from ``dash-cli`` to view the mnemonic seed::
cd /Applications/Dash-Qt.app/Contents/MacOS
./Dash-Qt -testnet

dumphdinfo
You may top up your testnet wallet by `accessing the faucet <http://faucet.testnet.networks.dash.org/>`_.

Dash Core will display the HD seed in both hexadecimal and BIP39 mnemonic
formats. It will also display the mnemonic passphrase if one was used when
creating the wallet.
.. _dashcore-hd:

HD Wallets
==========

.. _dashcore-hd-upgrade:

Expand All @@ -105,6 +101,17 @@ or ``dash-cli``::

help upgradetohd

View HD wallet information
--------------------------

Open the console from **Window > Console** or issue the following RPC command
from ``dash-cli`` to view the mnemonic seed::

dumphdinfo

Dash Core will display the HD seed in both hexadecimal and BIP39 mnemonic
formats. It will also display the mnemonic passphrase if one was used when
creating the wallet.

.. _dashcore-hd-restore:

Expand All @@ -128,6 +135,22 @@ is often also referred to as the "25th word" or "extension word". The wallet
passphrase encrypts the wallet file itself, while the mnemonic passphrase is
used to specify different derivation branches from the same mnemonic seed.

.. _dashcore-hd-default:

Enable HD Wallet Creation By Default
------------------------------------

Dash Core includes an implementation of BIP39/BIP44 compatible hierarchical
deterministic (HD) key generation. We will use the Windows GUI wallet in this
example, but the commands are similar if using ``dash-qt`` or ``dashd`` on other
operating systems. Enter the following command to configure Dash Core to
generate HD wallets by default::

dash-qt.exe -usehd

To make this configuration persist between restarts, add ``usehd=1`` to the
``dash.conf`` file.

.. _dashcore-multisig:

Multisignature
Expand Down
6 changes: 3 additions & 3 deletions index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ learning about :ref:`safety <safety>` or joining one of the many

.. grid-item-card:: 🚀 Platform Docs
:margin: 2 2 auto auto
:link-type: url
:link: https://dashplatform.readme.io
:link-type: ref
:link: platform:platform-index

Start working with Dash Platform and discover how you can use its powerful capabilities to power your Web3 project.

+++
`Click to begin <https://dashplatform.readme.io>`__
:ref:`Click to begin <platform:platform-index>`

.. image:: img/businessplan.svg
:class: no-scaled-link
Expand Down
2 changes: 1 addition & 1 deletion locale/ar/LC_MESSAGES/docs/user/developers/compiling.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Dash latest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-04 12:28-0400\n"
"POT-Creation-Date: 2023-09-26 10:05-0400\n"
"PO-Revision-Date: 2022-12-27 18:55+0000\n"
"Last-Translator: Hasna Brania <[email protected]>, 2022\n"
"Language-Team: Arabic (https://app.transifex.com/dash/teams/37570/ar/)\n"
Expand Down
72 changes: 26 additions & 46 deletions locale/ar/LC_MESSAGES/docs/user/developers/index.po
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2023, Dash Core Group, Inc
# This file is distributed under the same license as the Dash package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
#
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Hasna Brania <[email protected]>, 2022
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Dash latest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-23 15:49-0400\n"
"POT-Creation-Date: 2023-09-26 10:05-0400\n"
"PO-Revision-Date: 2022-12-27 18:55+0000\n"
"Last-Translator: Hasna Brania <[email protected]>, 2022\n"
"Language: ar\n"
"Language-Team: Arabic (https://app.transifex.com/dash/teams/37570/ar/)\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : "
"n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.12.1\n"
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"

#: ../../docs/user/developers/index.rst:-1
#: ../../docs/user/developers/index.rst-1
msgid "Developers guide and information about Dash version history"
msgstr ""

#: ../../docs/user/developers/index.rst:-1
#: ../../docs/user/developers/index.rst-1
msgid "dash, developers, version history"
msgstr ""

Expand All @@ -40,28 +39,28 @@ msgid ""
"<https://dashplatform.readme.io/>`_ contains technical documentation "
"intended to help developers quickly and easily get started with Dash "
"Platform. The :ref:`Dash Core Developer Documentation <core:core-index>` "
"provides detailed documentation on the Dash Core code base, and serves as"
" a reference for experienced developers. These documentation portals can "
"help developers to quickly and efficiently integrate external "
"applications with the Dash ecosystem. Anyone can contribute to the "
"documentation by suggesting edits in the documentation system."
"provides detailed documentation on the Dash Core code base, and serves as a "
"reference for experienced developers. These documentation portals can help "
"developers to quickly and efficiently integrate external applications with "
"the Dash ecosystem. Anyone can contribute to the documentation by suggesting"
" edits in the documentation system."
msgstr ""

#: ../../docs/user/developers/index.rst:21
msgid ""
"The Dash Core Team also maintains the `Dash Roadmap "
"<https://www.dash.org/roadmap/>`_, which sets out delivery milestones for"
" future releases of Dash and includes specific technical details "
"describing how the development team plans to realise each challenge. The "
"Dash Roadmap is complemented by the `Dash Improvement Proposals "
"<https://www.dash.org/roadmap/>`_, which sets out delivery milestones for "
"future releases of Dash and includes specific technical details describing "
"how the development team plans to realise each challenge. The Dash Roadmap "
"is complemented by the `Dash Improvement Proposals "
"<https://github.com/dashpay/dips>`_, which contain detailed technical "
"explanations of proposed changes to the Dash protocol itself."
msgstr ""

#: ../../docs/user/developers/index.rst:29
msgid ""
"The Dash community organise discussion and development of Dash apps using"
" the following resources:"
"The Dash community organise discussion and development of Dash apps using "
"the following resources:"
msgstr ""

#: ../../docs/user/developers/index.rst:32
Expand All @@ -75,17 +74,17 @@ msgstr ""
#: ../../docs/user/developers/index.rst:34
msgid ""
"`Dash Bounty Board "
"<https://trello.com/invite/b/FPJzDcok/ea9fc798043d35d61aa8a5df0917cba7"
"/dash-bounty-board>`__"
"<https://trello.com/invite/b/FPJzDcok/ea9fc798043d35d61aa8a5df0917cba7/dash-"
"bounty-board>`__"
msgstr ""

#: ../../docs/user/developers/index.rst:36
msgid ""
"The remaining sections available below describe practical steps to carry "
"out common development tasks in Dash."
"The remaining sections available below describe practical steps to carry out"
" common development tasks in Dash."
msgstr ""
"توضح الأقسام المتبقية أدناه الخطوات العملية لتنفيذ مهام التطوير المشتركة "
"في داش."
"توضح الأقسام المتبقية أدناه الخطوات العملية لتنفيذ مهام التطوير المشتركة في "
"داش."

#: ../../docs/user/developers/index.rst:53
msgid "Version History"
Expand All @@ -98,22 +97,3 @@ msgstr "تتوفر هنا ملاحظات الإصدار الكاملة وتار
#: ../../docs/user/developers/index.rst:57
msgid "https://github.com/dashpay/dash/blob/master/doc/release-notes.md"
msgstr "https://github.com/dashpay/dash/blob/master/doc/release-notes.md"

#~ msgid ""
#~ "The `Dash Platform Developer Documentation "
#~ "<https://dashplatform.readme.io/>`_ contains technical "
#~ "documentation intended to help developers "
#~ "quickly and easily get started with "
#~ "Dash Platform. The `Dash Core Developer"
#~ " Documentation <https://dashcore.readme.io/>`_ provides"
#~ " detailed documentation on the Dash "
#~ "Core code base, and serves as a"
#~ " reference for experienced developers. "
#~ "These documentation portals can help "
#~ "developers to quickly and efficiently "
#~ "integrate external applications with the "
#~ "Dash ecosystem. Anyone can contribute to"
#~ " the documentation by suggesting edits "
#~ "in the documentation system."
#~ msgstr ""

Loading

0 comments on commit b4828bd

Please sign in to comment.