diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:14:15 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:14:29 +0000 |
| commit | 89c5c381b7e8e29da361e1bf647010ad94e5fea0 (patch) | |
| tree | f13719abe0887bba94b23de542a20f78c50495ab /src/qt | |
| parent | ff4be740b56a733beb5c7978b56c6602fae51a2e (diff) | |
| parent | 5951d9fe3224b11ba9ae45df4fe44804ec0efd83 (diff) | |
| download | bitcoin-89c5c381b7e8e29da361e1bf647010ad94e5fea0.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/askpassphrasedialog.cpp | 2 | ||||
| -rw-r--r-- | src/qt/bitcoin.cpp | 2 | ||||
| -rw-r--r-- | src/qt/guiutil.h | 2 | ||||
| -rw-r--r-- | src/qt/sendcoinsdialog.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index 31e4040d1d..e96f41941c 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -158,7 +158,7 @@ void AskPassphraseDialog::accept() if(model->changePassphrase(oldpass, newpass1)) { QMessageBox::information(this, tr("Wallet encrypted"), - tr("Wallet passphrase was succesfully changed.")); + tr("Wallet passphrase was successfully changed.")); QDialog::accept(); // Success } else diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 58070d4057..ddf7aa95a5 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -141,7 +141,7 @@ std::string _(const char* psz) static void handleRunawayException(std::exception *e) { PrintExceptionContinue(e, "Runaway exception"); - QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occured. Bitcoin can no longer continue safely and will quit.") + QString("\n\n") + QString::fromStdString(strMiscWarning)); + QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Bitcoin can no longer continue safely and will quit.") + QString("\n\n") + QString::fromStdString(strMiscWarning)); exit(1); } diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index 0c78b3ccb0..de305639d5 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -29,7 +29,7 @@ public: static void setupAddressWidget(QLineEdit *widget, QWidget *parent); static void setupAmountWidget(QLineEdit *widget, QWidget *parent); - // Parse "bitcoin:" URI into recipient object, return true on succesful parsing + // Parse "bitcoin:" URI into recipient object, return true on successful parsing // See Bitcoin URI definition discussion here: https://bitcointalk.org/index.php?topic=33490.0 static bool parseBitcoinURI(const QUrl &, SendCoinsRecipient *out); static bool parseBitcoinURI(QString uri, SendCoinsRecipient *out); diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 33a18e4d66..f8f0d5f8a6 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -121,7 +121,7 @@ void SendCoinsDialog::on_sendButton_clicked() { case WalletModel::InvalidAddress: QMessageBox::warning(this, tr("Send Coins"), - tr("The recepient address is not valid, please recheck."), + tr("The recipient address is not valid, please recheck."), QMessageBox::Ok, QMessageBox::Ok); break; case WalletModel::InvalidAmount: |