diff options
| author | Gavin Andresen <[email protected]> | 2012-05-19 05:45:50 -0700 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2012-05-19 05:45:50 -0700 |
| commit | 23e5c5b11a746be74430eae103fd2cd866ce6bea (patch) | |
| tree | aa60f1eae07cf2d28a6b5357c38087710aa176a5 /src/init.cpp | |
| parent | Merge pull request #1362 from laanwj/2012_05_debugwindowicon2 (diff) | |
| parent | change strings to Bitcoin (uppercase), where it is used as a noun and update ... (diff) | |
| download | discoin-23e5c5b11a746be74430eae103fd2cd866ce6bea.tar.xz discoin-23e5c5b11a746be74430eae103fd2cd866ce6bea.zip | |
Merge pull request #1289 from Diapolo/Bitcoin_as_noun
change strings to Bitcoin (uppercase), where it is used as a noun and up...
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp index b027a53d8..829600a4f 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -162,7 +162,6 @@ bool static InitError(const std::string &str) { ThreadSafeMessageBox(str, _("Bitcoin"), wxOK | wxMODAL); return false; - } bool static InitWarning(const std::string &str) @@ -352,7 +351,7 @@ bool AppInit2() return false; } - // Make sure only a single bitcoin process is using the data directory. + // Make sure only a single Bitcoin process is using the data directory. boost::filesystem::path pathLockFile = GetDataDir() / ".lock"; FILE* file = fopen(pathLockFile.string().c_str(), "a"); // empty lock file; created if it doesn't exist. if (file) fclose(file); @@ -365,7 +364,7 @@ bool AppInit2() // Load data files // if (fDaemon) - fprintf(stdout, "bitcoin server starting\n"); + fprintf(stdout, "Bitcoin server starting\n"); int64 nStart; InitMessage(_("Loading addresses...")); @@ -498,7 +497,7 @@ bool AppInit2() // Add wallet transactions that aren't already in a block to mapTransactions pwalletMain->ReacceptWalletTransactions(); - // Note: Bitcoin-QT stores several settings in the wallet, so we want + // Note: Bitcoin-Qt stores several settings in the wallet, so we want // to load the wallet BEFORE parsing command-line arguments, so // the command-line/bitcoin.conf settings override GUI setting. |