Skip to content

Commit ff0ee87

Browse files
author
Philip Kaufmann
committed
change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string
1 parent d6615a5 commit ff0ee87

File tree

12 files changed

+30
-31
lines changed

12 files changed

+30
-31
lines changed

‎src/base58.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ class CBase58Data
252252
bool operator> (const CBase58Data& b58) const { return CompareTo(b58) > 0; }
253253
};
254254

255-
/** base58-encoded bitcoin addresses.
255+
/** base58-encoded Bitcoin addresses.
256256
* Public-key-hash-addresses have version 0 (or 111 testnet).
257257
* The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key.
258258
* Script-hash-addresses have version 5 (or 196 testnet).

‎src/bitcoinrpc.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -418,10 +418,10 @@ Value stop(const Array& params, bool fHelp)
418418
if (fHelp || params.size() != 0)
419419
throw runtime_error(
420420
"stop\n"
421-
"Stop bitcoin server.");
421+
"Stop Bitcoin server.");
422422
// Shutdown will take long enough that the response should get back
423423
QueueShutdown();
424-
return "bitcoin server stopping";
424+
return "Bitcoin server stopping";
425425
}
426426

427427

@@ -562,7 +562,7 @@ Value getnewaddress(const Array& params, bool fHelp)
562562
if (fHelp || params.size() > 1)
563563
throw runtime_error(
564564
"getnewaddress [account]\n"
565-
"Returns a new bitcoin address for receiving payments. "
565+
"Returns a new Bitcoin address for receiving payments. "
566566
"If [account] is specified (recommended), it is added to the address book "
567567
"so payments received with the address will be credited to [account].");
568568

@@ -629,7 +629,7 @@ Value getaccountaddress(const Array& params, bool fHelp)
629629
if (fHelp || params.size() != 1)
630630
throw runtime_error(
631631
"getaccountaddress <account>\n"
632-
"Returns the current bitcoin address for receiving payments to this account.");
632+
"Returns the current Bitcoin address for receiving payments to this account.");
633633

634634
// Parse the account first so we don't generate a key if there's an error
635635
string strAccount = AccountFromValue(params[0]);
@@ -652,7 +652,7 @@ Value setaccount(const Array& params, bool fHelp)
652652

653653
CBitcoinAddress address(params[0].get_str());
654654
if (!address.IsValid())
655-
throw JSONRPCError(-5, "Invalid bitcoin address");
655+
throw JSONRPCError(-5, "Invalid Bitcoin address");
656656

657657

658658
string strAccount;
@@ -682,7 +682,7 @@ Value getaccount(const Array& params, bool fHelp)
682682

683683
CBitcoinAddress address(params[0].get_str());
684684
if (!address.IsValid())
685-
throw JSONRPCError(-5, "Invalid bitcoin address");
685+
throw JSONRPCError(-5, "Invalid Bitcoin address");
686686

687687
string strAccount;
688688
map<CBitcoinAddress, string>::iterator mi = pwalletMain->mapAddressBook.find(address);
@@ -743,7 +743,7 @@ Value sendtoaddress(const Array& params, bool fHelp)
743743

744744
CBitcoinAddress address(params[0].get_str());
745745
if (!address.IsValid())
746-
throw JSONRPCError(-5, "Invalid bitcoin address");
746+
throw JSONRPCError(-5, "Invalid Bitcoin address");
747747

748748
// Amount
749749
int64 nAmount = AmountFromValue(params[1]);
@@ -841,7 +841,7 @@ Value getreceivedbyaddress(const Array& params, bool fHelp)
841841
CBitcoinAddress address = CBitcoinAddress(params[0].get_str());
842842
CScript scriptPubKey;
843843
if (!address.IsValid())
844-
throw JSONRPCError(-5, "Invalid bitcoin address");
844+
throw JSONRPCError(-5, "Invalid Bitcoin address");
845845
scriptPubKey.SetBitcoinAddress(address);
846846
if (!IsMine(*pwalletMain,scriptPubKey))
847847
return (double)0.0;
@@ -1067,7 +1067,7 @@ Value sendfrom(const Array& params, bool fHelp)
10671067
string strAccount = AccountFromValue(params[0]);
10681068
CBitcoinAddress address(params[1].get_str());
10691069
if (!address.IsValid())
1070-
throw JSONRPCError(-5, "Invalid bitcoin address");
1070+
throw JSONRPCError(-5, "Invalid Bitcoin address");
10711071
int64 nAmount = AmountFromValue(params[2]);
10721072
int nMinDepth = 1;
10731073
if (params.size() > 3)
@@ -1128,7 +1128,7 @@ Value sendmany(const Array& params, bool fHelp)
11281128
{
11291129
CBitcoinAddress address(s.name_);
11301130
if (!address.IsValid())
1131-
throw JSONRPCError(-5, string("Invalid bitcoin address:")+s.name_);
1131+
throw JSONRPCError(-5, string("Invalid Bitcoin address:")+s.name_);
11321132

11331133
if (setAddress.count(address))
11341134
throw JSONRPCError(-8, string("Invalid parameter, duplicated address: ")+s.name_);
@@ -1172,7 +1172,7 @@ Value addmultisigaddress(const Array& params, bool fHelp)
11721172
{
11731173
string msg = "addmultisigaddress <nrequired> <'[\"key\",\"key\"]'> [account]\n"
11741174
"Add a nrequired-to-sign multisignature address to the wallet\"\n"
1175-
"each key is a bitcoin address or hex-encoded public key\n"
1175+
"each key is a Bitcoin address or hex-encoded public key\n"
11761176
"If [account] is specified, assign address to [account].";
11771177
throw runtime_error(msg);
11781178
}
@@ -1196,7 +1196,7 @@ Value addmultisigaddress(const Array& params, bool fHelp)
11961196
{
11971197
const std::string& ks = keys[i].get_str();
11981198

1199-
// Case 1: bitcoin address and we have full public key:
1199+
// Case 1: Bitcoin address and we have full public key:
12001200
CBitcoinAddress address(ks);
12011201
if (address.IsValid())
12021202
{
@@ -1933,7 +1933,7 @@ Value encryptwallet(const Array& params, bool fHelp)
19331933
// slack space in .dat files; that is bad if the old data is
19341934
// unencrypted private keys. So:
19351935
QueueShutdown();
1936-
return "wallet encrypted; bitcoin server stopping, restart to run with encrypted wallet";
1936+
return "wallet encrypted; Bitcoin server stopping, restart to run with encrypted wallet";
19371937
}
19381938

19391939

‎src/init.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ bool static InitError(const std::string &str)
162162
{
163163
ThreadSafeMessageBox(str, _("Bitcoin"), wxOK | wxMODAL);
164164
return false;
165-
166165
}
167166

168167
bool static InitWarning(const std::string &str)
@@ -352,7 +351,7 @@ bool AppInit2()
352351
return false;
353352
}
354353

355-
// Make sure only a single bitcoin process is using the data directory.
354+
// Make sure only a single Bitcoin process is using the data directory.
356355
boost::filesystem::path pathLockFile = GetDataDir() / ".lock";
357356
FILE* file = fopen(pathLockFile.string().c_str(), "a"); // empty lock file; created if it doesn't exist.
358357
if (file) fclose(file);
@@ -365,7 +364,7 @@ bool AppInit2()
365364
// Load data files
366365
//
367366
if (fDaemon)
368-
fprintf(stdout, "bitcoin server starting\n");
367+
fprintf(stdout, "Bitcoin server starting\n");
369368
int64 nStart;
370369

371370
InitMessage(_("Loading addresses..."));
@@ -498,7 +497,7 @@ bool AppInit2()
498497
// Add wallet transactions that aren't already in a block to mapTransactions
499498
pwalletMain->ReacceptWalletTransactions();
500499

501-
// Note: Bitcoin-QT stores several settings in the wallet, so we want
500+
// Note: Bitcoin-Qt stores several settings in the wallet, so we want
502501
// to load the wallet BEFORE parsing command-line arguments, so
503502
// the command-line/bitcoin.conf settings override GUI setting.
504503

‎src/qt/bitcoingui.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ void BitcoinGUI::createActions()
207207
tabGroup->addAction(receiveCoinsAction);
208208

209209
sendCoinsAction = new QAction(QIcon(":/icons/send"), tr("&Send coins"), this);
210-
sendCoinsAction->setToolTip(tr("Send coins to a bitcoin address"));
210+
sendCoinsAction->setToolTip(tr("Send coins to a Bitcoin address"));
211211
sendCoinsAction->setCheckable(true);
212212
sendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2));
213213
tabGroup->addAction(sendCoinsAction);
@@ -243,7 +243,7 @@ void BitcoinGUI::createActions()
243243
aboutQtAction->setToolTip(tr("Show information about Qt"));
244244
aboutQtAction->setMenuRole(QAction::AboutQtRole);
245245
optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this);
246-
optionsAction->setToolTip(tr("Modify configuration options for bitcoin"));
246+
optionsAction->setToolTip(tr("Modify configuration options for Bitcoin"));
247247
optionsAction->setMenuRole(QAction::PreferencesRole);
248248
toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("Show/Hide &Bitcoin"), this);
249249
toggleHideAction->setToolTip(tr("Show or hide the Bitcoin window"));
@@ -426,15 +426,15 @@ void BitcoinGUI::createTrayIcon()
426426
trayIconMenu->addAction(quitAction);
427427
#endif
428428

429-
notificator = new Notificator(tr("bitcoin-qt"), trayIcon);
429+
notificator = new Notificator(qApp->applicationName(), trayIcon);
430430
}
431431

432432
#ifndef Q_WS_MAC
433433
void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason)
434434
{
435435
if(reason == QSystemTrayIcon::Trigger)
436436
{
437-
// Click on system tray icon triggers "show/hide bitcoin"
437+
// Click on system tray icon triggers "show/hide Bitcoin"
438438
toggleHideAction->trigger();
439439
}
440440
}

‎src/qt/editaddressdialog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void EditAddressDialog::accept()
9393
break;
9494
case AddressTableModel::INVALID_ADDRESS:
9595
QMessageBox::warning(this, windowTitle(),
96-
tr("The entered address \"%1\" is not a valid bitcoin address.").arg(ui->addressEdit->text()),
96+
tr("The entered address \"%1\" is not a valid Bitcoin address.").arg(ui->addressEdit->text()),
9797
QMessageBox::Ok, QMessageBox::Ok);
9898
return;
9999
case AddressTableModel::WALLET_UNLOCK_FAILURE:

‎src/qt/guiutil.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace GUIUtil
2222
QString dateTimeStr(const QDateTime &datetime);
2323
QString dateTimeStr(qint64 nTime);
2424

25-
// Render bitcoin addresses in monospace font
25+
// Render Bitcoin addresses in monospace font
2626
QFont bitcoinAddressFont();
2727

2828
// Set up widgets for address and amounts

‎src/qt/optionsmodel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void OptionsModel::Init()
2424
nTransactionFee = settings.value("nTransactionFee").toLongLong();
2525
language = settings.value("language", "").toString();
2626

27-
// These are shared with core bitcoin; we want
27+
// These are shared with core Bitcoin; we want
2828
// command-line options to override the GUI settings:
2929
if (settings.contains("fUseUPnP"))
3030
SoftSetBoolArg("-upnp", settings.value("fUseUPnP").toBool());

‎src/qt/optionsmodel.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include <QAbstractListModel>
55

6-
/** Interface from QT to configuration data structure for bitcoin client.
7-
To QT, the options are presented as a list with the different options
6+
/** Interface from Qt to configuration data structure for Bitcoin client.
7+
To Qt, the options are presented as a list with the different options
88
laid out vertically.
99
This can be changed to a tree once the settings become sufficiently
1010
complex.

‎src/qt/rpcconsole.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Ui {
88
}
99
class ClientModel;
1010

11-
/** Local bitcoin RPC console. */
11+
/** Local Bitcoin RPC console. */
1212
class RPCConsole: public QDialog
1313
{
1414
Q_OBJECT

‎src/rpcdump.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Value dumpprivkey(const Array& params, bool fHelp)
8888
string strAddress = params[0].get_str();
8989
CBitcoinAddress address;
9090
if (!address.SetString(strAddress))
91-
throw JSONRPCError(-5, "Invalid bitcoin address");
91+
throw JSONRPCError(-5, "Invalid Bitcoin address");
9292
CSecret vchSecret;
9393
bool fCompressed;
9494
if (!pwalletMain->GetSecret(address, vchSecret, fCompressed))

0 commit comments

Comments
 (0)