Skip to content

Commit

Permalink
Merge pull request dashpay#17 from barrystyle/0.14-communitycontrib
Browse files Browse the repository at this point in the history
Contributions from community and testnet members.
  • Loading branch information
barrystyle authored and barrystyle committed Sep 9, 2019
2 parents 55cd48b + 3ee8280 commit d1656a9
Show file tree
Hide file tree
Showing 45 changed files with 5,446 additions and 149 deletions.
11 changes: 6 additions & 5 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ QT_TS = \
qt/locale/dash_tr.ts \
qt/locale/dash_vi.ts \
qt/locale/dash_zh_CN.ts \
qt/locale/dash_zh_TW.ts
qt/locale/dash_zh_TW.ts \
qt/locale/dash_ua.ts

QT_FORMS_UI = \
qt/forms/addressbookpage.ui \
Expand Down Expand Up @@ -327,7 +328,7 @@ RES_CSS = \

RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)

BITCOIN_RC = qt/res/dash-qt-res.rc
BITCOIN_RC = qt/res/pacglobal-qt-res.rc

BITCOIN_QT_INCLUDES = -I$(builddir)/qt -I$(srcdir)/qt -I$(srcdir)/qt/forms \
-I$(builddir)/qt/forms -DQT_NO_KEYWORDS
Expand Down Expand Up @@ -355,7 +356,7 @@ $(qt_libpacglobalqt_a_OBJECTS) $(qt_pacglobal_qt_OBJECTS) : | $(QT_MOC)
$(QT_MOC): $(PROTOBUF_H)
$(QT_MOC_CPP): $(PROTOBUF_H)

# dash-qt binary #
# pacglobal-qt binary #
qt_pacglobal_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
$(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS)
qt_pacglobal_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
Expand Down Expand Up @@ -410,9 +411,9 @@ CLEAN_QT = $(nodist_qt_libpacglobalqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcd
CLEANFILES += $(CLEAN_QT)

dash_qt_clean: FORCE
rm -f $(CLEAN_QT) $(qt_libpacglobalqt_a_OBJECTS) $(qt_pacglobal_qt_OBJECTS) qt/dash-qt$(EXEEXT) $(LIBBITCOINQT)
rm -f $(CLEAN_QT) $(qt_libpacglobalqt_a_OBJECTS) $(qt_pacglobal_qt_OBJECTS) qt/pacglobal-qt$(EXEEXT) $(LIBBITCOINQT)

dash_qt : qt/dash-qt$(EXEEXT)
dash_qt : qt/pacglobal-qt$(EXEEXT)

ui_%.h: %.ui
@test -f $(UIC)
Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

/**
* Name of client reported in the 'version' message. Report the same name
* for both dashd and dash-qt, to make it harder for attackers to
* for both pacglobald and pacglobal-qt, to make it harder for attackers to
* target servers or GUI users specifically.
*/
const std::string CLIENT_NAME("PACGlobal");
Expand Down
9 changes: 5 additions & 4 deletions src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -644,12 +644,13 @@ std::string HelpMessage(HelpMessageMode mode)

std::string LicenseInfo()
{
const std::string URL_SOURCE_CODE = "<https://github.com/dashpay/dash>";
const std::string URL_WEBSITE = "<https://dash.org>";
const std::string URL_SOURCE_CODE = "<https://github.com/PACGlobalOfficial/PAC>";
const std::string URL_WEBSITE = "<https://pacglobal.io>";

return CopyrightHolders(_("Copyright (C)"), 2014, COPYRIGHT_YEAR) + "\n" +
"\n" +
strprintf(_("Please contribute if you find %s useful. "
strprintf(_("A special thankyou to Serik, Unick, Luka, zerocool, gpenco, in_the_know, carbon2000, fozzyblob, Macish, dijida and to all those we forgot.. \n\n"
"Please contribute if you find %s useful. "
"Visit %s for further information about the software."),
PACKAGE_NAME, URL_WEBSITE) +
"\n" +
Expand Down Expand Up @@ -1719,7 +1720,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
}

if((!fLiteMode && fTxIndex == false)
&& chainparams.NetworkIDString() != CBaseChainParams::REGTEST) { // TODO remove this when pruning is fixed. See https://github.com/dashpay/dash/pull/1817 and https://github.com/dashpay/dash/pull/1743
&& chainparams.NetworkIDString() != CBaseChainParams::REGTEST) { // TODO remove this when pruning is fixed. See https://github.com/PACGlobalOfficial/PAC/pull/1817 and https://github.com/PACGlobalOfficial/PAC/pull/1743
return InitError(_("Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index."));
}

Expand Down
2 changes: 1 addition & 1 deletion src/pacglobald.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*
* \section intro_sec Introduction
*
* This is the developer documentation of the reference client for an experimental new digital currency called PACGlobal (https://www.dash.org/),
* This is the developer documentation of the reference client for an experimental new digital currency called PACGlobal (https://www.pacglobal.io/),
* which enables instant payments to anyone, anywhere in the world. PACGlobal uses peer-to-peer technology to operate
* with no central authority: managing transactions and issuing money are carried out collectively by the network.
*
Expand Down
2 changes: 1 addition & 1 deletion src/pow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ unsigned int static KimotoGravityWell(const CBlockIndex* pindexLast, const Conse
}

unsigned int static DarkGravityWave(const CBlockIndex* pindexLast, const Consensus::Params& params) {
/* current difficulty formula, dash - DarkGravity v3, written by Evan Duffield - evan@dash.org */
/* current difficulty formula, dash - DarkGravity v3, written by Evan Duffield - evan@pacglobal.io */
const arith_uint256 bnPowLimit = UintToArith256(params.powLimit);
int64_t nPastBlocks = 24;

Expand Down
2 changes: 1 addition & 1 deletion src/qt/bitcoingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ void BitcoinGUI::createActions()
sendCoinsMenuAction->setToolTip(sendCoinsMenuAction->statusTip());

receiveCoinsAction = new QAction(QIcon(":/icons/receiving_addresses"), tr("&Receive"), this);
receiveCoinsAction->setStatusTip(tr("Request payments (generates QR codes and dash: URIs)"));
receiveCoinsAction->setStatusTip(tr("Request payments (generates QR codes and pac: URIs)"));
receiveCoinsAction->setToolTip(receiveCoinsAction->statusTip());
receiveCoinsAction->setCheckable(true);
#ifdef Q_OS_MAC
Expand Down
4 changes: 2 additions & 2 deletions src/qt/dash.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ void BitcoinApplication::initializeResult(bool success)

#ifdef ENABLE_WALLET
// Now that initialization/startup is done, process any command-line
// dash: URIs or payment requests:
// pac: URIs or payment requests:
connect(paymentServer, SIGNAL(receivedPaymentRequest(SendCoinsRecipient)),
window, SLOT(handlePaymentRequest(SendCoinsRecipient)));
connect(window, SIGNAL(receivedURI(QString)),
Expand Down Expand Up @@ -690,7 +690,7 @@ int main(int argc, char *argv[])
exit(EXIT_SUCCESS);

// Start up the payment server early, too, so impatient users that click on
// dash: links repeatedly have their payment requests routed to this process:
// pac: links repeatedly have their payment requests routed to this process:
app.createPaymentServer();
#endif

Expand Down
1 change: 1 addition & 0 deletions src/qt/dash_locale.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<file alias="sv">locale/dash_sv.qm</file>
<file alias="th">locale/dash_th.qm</file>
<file alias="tr">locale/dash_tr.qm</file>
<file alias="ua">locale/dash_ua.qm</file>
<file alias="vi">locale/dash_vi.qm</file>
<file alias="zh_CN">locale/dash_zh_CN.qm</file>
<file alias="zh_TW">locale/dash_zh_TW.qm</file>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/forms/optionsdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@
</property>
<property name="text">
<string>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/projects/p/dash/</string>
https://www.transifex.com/projects/p/pacglobal/</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/guiconstants.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static const int MAX_URI_LENGTH = 255;
#define SPINNER_FRAMES 36

#define QAPP_ORG_NAME "PACGlobal"
#define QAPP_ORG_DOMAIN "dash.org"
#define QAPP_ORG_DOMAIN "pacglobal.io"
#define QAPP_APP_NAME_DEFAULT "PACGlobal-Qt"
#define QAPP_APP_NAME_TESTNET "PACGlobal-Qt-testnet"
#define QAPP_APP_NAME_DEVNET "PACGlobal-Qt-%s"
Expand Down
2 changes: 1 addition & 1 deletion src/qt/guiutil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out)

bool parseBitcoinURI(QString uri, SendCoinsRecipient *out)
{
// Convert dash:// to dash:
// Convert dash:// to pac:
//
// Cannot handle this later, because dash:// will cause Qt to see the part after // as host,
// which will lower-case it (and thus invalidate the address).
Expand Down
8 changes: 4 additions & 4 deletions src/qt/locale/dash_ar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
<translation>استقبل</translation>
</message>
<message>
<source>Request payments (generates QR codes and dash: URIs)</source>
<source>Request payments (generates QR codes and pac: URIs)</source>
<translation>أطلب دفعات (يولد كودات الرمز المربع وبيت كوين: العناوين المعطاة)</translation>
</message>
<message>
Expand Down Expand Up @@ -1435,9 +1435,9 @@
</message>
<message>
<source>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/projects/p/dash/</source>
https://www.transifex.com/projects/p/pacglobal/</source>
<translation>لغة مفقودة أو ترجمة غير مكتملة؟ مساعدة في المساهمة بالترجمات هنا:
https://www.transifex.com/projects/p/dash/</translation>
https://www.transifex.com/projects/p/pacglobal/</translation>
</message>
<message>
<source>User Interface Theme:</source>
Expand Down Expand Up @@ -1780,7 +1780,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<translation>خطأ في طلب الدفع</translation>
</message>
<message>
<source>Cannot start dash: click-to-pay handler</source>
<source>Cannot start pac: click-to-pay handler</source>
<translation>لا يمكن بدء داش: معالج الدفع مقابل الدفع</translation>
</message>
<message>
Expand Down
10 changes: 5 additions & 5 deletions src/qt/locale/dash_bg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
<translation>&amp;Получаване</translation>
</message>
<message>
<source>Request payments (generates QR codes and dash: URIs)</source>
<source>Request payments (generates QR codes and pac: URIs)</source>
<translation>Заявка за плащане (генерира QR кодове и PACGlobal: URI)</translation>
</message>
<message>
Expand Down Expand Up @@ -1459,9 +1459,9 @@
</message>
<message>
<source>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/projects/p/dash/</source>
https://www.transifex.com/projects/p/pacglobal/</source>
<translation>Липсва език или превода е непълен? Можете да помогнете с превода тук:
https://www.transifex.com/projects/p/dash/</translation>
https://www.transifex.com/projects/p/pacglobal/</translation>
</message>
<message>
<source>User Interface Theme:</source>
Expand Down Expand Up @@ -1804,8 +1804,8 @@ https://www.transifex.com/projects/p/dash/</translation>
<translation>Грешка в заявката за плащане</translation>
</message>
<message>
<source>Cannot start dash: click-to-pay handler</source>
<translation>Не може да стартира dash: кликни за плащане на притежателя</translation>
<source>Cannot start pac: click-to-pay handler</source>
<translation>Не може да стартира pac: кликни за плащане на притежателя</translation>
</message>
<message>
<source>URI handling</source>
Expand Down
8 changes: 4 additions & 4 deletions src/qt/locale/dash_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
<translation>&amp;Empfangen</translation>
</message>
<message>
<source>Request payments (generates QR codes and dash: URIs)</source>
<source>Request payments (generates QR codes and pac: URIs)</source>
<translation>Zahlungen anfordern (erzeugt QR-Codes und "dash:"-URIs)</translation>
</message>
<message>
Expand Down Expand Up @@ -1460,9 +1460,9 @@ Der Mixing-Prozeß läuft nach dem Start vollständig im Hintergrund, d.h. es is
</message>
<message>
<source>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/projects/p/dash/</source>
https://www.transifex.com/projects/p/pacglobal/</source>
<translation>Fehlt eine Sprache oder ist unvollständig übersetzt? Hier können Sie helfen:
https://www.transifex.com/projects/p/dash/</translation>
https://www.transifex.com/projects/p/pacglobal/</translation>
</message>
<message>
<source>User Interface Theme:</source>
Expand Down Expand Up @@ -1806,7 +1806,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<translation>Fehlerhafte Zahlungsanforderung</translation>
</message>
<message>
<source>Cannot start dash: click-to-pay handler</source>
<source>Cannot start pac: click-to-pay handler</source>
<translation>PACGlobal kann nicht gestartet werden: click-to-pay handler</translation>
</message>
<message>
Expand Down
12 changes: 6 additions & 6 deletions src/qt/locale/dash_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,8 @@
</message>
<message>
<location line="+1"/>
<source>Request payments (generates QR codes and dash: URIs)</source>
<translation>Request payments (generates QR codes and dash: URIs)</translation>
<source>Request payments (generates QR codes and pac: URIs)</source>
<translation>Request payments (generates QR codes and pac: URIs)</translation>
</message>
<message>
<location line="+14"/>
Expand Down Expand Up @@ -1845,9 +1845,9 @@
<message>
<location line="+21"/>
<source>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/projects/p/dash/</source>
https://www.transifex.com/projects/p/pacglobal/</source>
<translation>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/projects/p/dash/</translation>
https://www.transifex.com/projects/p/pacglobal/</translation>
</message>
<message>
<location line="+19"/>
Expand Down Expand Up @@ -2310,8 +2310,8 @@ https://www.transifex.com/projects/p/dash/</translation>
</message>
<message>
<location line="-402"/>
<source>Cannot start dash: click-to-pay handler</source>
<translation>Cannot start dash: click-to-pay handler</translation>
<source>Cannot start pac: click-to-pay handler</source>
<translation>Cannot start pac: click-to-pay handler</translation>
</message>
<message>
<location line="+103"/>
Expand Down
10 changes: 5 additions & 5 deletions src/qt/locale/dash_es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
<translation>&amp;Recibir</translation>
</message>
<message>
<source>Request payments (generates QR codes and dash: URIs)</source>
<source>Request payments (generates QR codes and pac: URIs)</source>
<translation>Solicitar pagos (genera códigos QR y URIs de PACGlobal)</translation>
</message>
<message>
Expand Down Expand Up @@ -1459,9 +1459,9 @@
</message>
<message>
<source>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/projects/p/dash/</source>
https://www.transifex.com/projects/p/pacglobal/</source>
<translation>¿Idioma no disponible o traducción incompleta? Contribuye a la traducción aquí:
https://www.transifex.com/projects/p/dash/</translation>
https://www.transifex.com/projects/p/pacglobal/</translation>
</message>
<message>
<source>User Interface Theme:</source>
Expand Down Expand Up @@ -1804,8 +1804,8 @@ https://www.transifex.com/projects/p/dash/</translation>
<translation>Error en solicitud de pago</translation>
</message>
<message>
<source>Cannot start dash: click-to-pay handler</source>
<translation>No se pudo iniciar dash: manejador de pago-por-clic</translation>
<source>Cannot start pac: click-to-pay handler</source>
<translation>No se pudo iniciar pac: manejador de pago-por-clic</translation>
</message>
<message>
<source>URI handling</source>
Expand Down
8 changes: 4 additions & 4 deletions src/qt/locale/dash_fi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
<translation>&amp;Vastaanota</translation>
</message>
<message>
<source>Request payments (generates QR codes and dash: URIs)</source>
<source>Request payments (generates QR codes and pac: URIs)</source>
<translation>Pyydä maksuja (Luo QR koodit ja PACGlobal: URIt)</translation>
</message>
<message>
Expand Down Expand Up @@ -1459,9 +1459,9 @@
</message>
<message>
<source>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/projects/p/dash/</source>
https://www.transifex.com/projects/p/pacglobal/</source>
<translation>Puuttuuko sopiva kieli tai käännös on kesken? Auta käännöstyössä täällä:
https://www.transifex.com/projects/p/dash/</translation>
https://www.transifex.com/projects/p/pacglobal/</translation>
</message>
<message>
<source>User Interface Theme:</source>
Expand Down Expand Up @@ -1804,7 +1804,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<translation>Maksupyyntövirhe</translation>
</message>
<message>
<source>Cannot start dash: click-to-pay handler</source>
<source>Cannot start pac: click-to-pay handler</source>
<translation>Ei voi käynnistää PACGlobalia: click-to-pay handler</translation>
</message>
<message>
Expand Down
8 changes: 4 additions & 4 deletions src/qt/locale/dash_fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
<translation>&amp;Recevoir</translation>
</message>
<message>
<source>Request payments (generates QR codes and dash: URIs)</source>
<source>Request payments (generates QR codes and pac: URIs)</source>
<translation>Demande de paiements (génère des QR-codes et des URIs PACGlobal)</translation>
</message>
<message>
Expand Down Expand Up @@ -1459,9 +1459,9 @@
</message>
<message>
<source>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/projects/p/dash/</source>
https://www.transifex.com/projects/p/pacglobal/</source>
<translation>Langage manquant ou traduction incomplète ? Participez aux traductions ici :
https://www.transifex.com/projects/p/dash/</translation>
https://www.transifex.com/projects/p/pacglobal/</translation>
</message>
<message>
<source>User Interface Theme:</source>
Expand Down Expand Up @@ -1804,7 +1804,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<translation>Erreur de demande de paiement</translation>
</message>
<message>
<source>Cannot start dash: click-to-pay handler</source>
<source>Cannot start pac: click-to-pay handler</source>
<translation>Impossible de démarrer le gestionnaire PACGlobal click-to-pay</translation>
</message>
<message>
Expand Down
Loading

0 comments on commit d1656a9

Please sign in to comment.