From 08344c735feddc8d6cbeb63b18f3fc1fd4544170 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Thu, 2 Aug 2012 10:09:29 +0200 Subject: [PATCH 1/3] fix further spelling errors / remove a tab in the source --- src/init.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/init.cpp b/src/init.cpp index 4d016956e66..b3c49f3a63a 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -256,7 +256,7 @@ bool AppInit2(int argc, char* argv[]) // Remove tabs strUsage.erase(std::remove(strUsage.begin(), strUsage.end(), '\t'), strUsage.end()); #if defined(QT_GUI) && defined(WIN32) - // On windows, show a message box, as there is no stderr + // On Windows, show a message box, as there is no stderr wxMessageBox(strUsage, "Usage"); #else fprintf(stderr, "%s", strUsage.c_str()); From 5ebc1680062f6e6fc6352c4c8ccb1f746f6a280e Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Fri, 8 Jun 2012 16:36:40 +0000 Subject: [PATCH 2/3] Bugfix: Make USE_UPNP=- work with makefile.{linux-mingw,mingw,osx} too --- src/makefile.linux-mingw | 5 ++++- src/makefile.mingw | 5 ++++- src/makefile.osx | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index fa46d080bb1..41dbf2a9fc0 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -53,7 +53,10 @@ HEADERS = \ wallet.h -ifdef USE_UPNP +ifndef USE_UPNP + override USE_UPNP = - +endif +ifneq (${USE_UPNP}, -) LIBPATHS += -L"$(DEPSDIR)/miniupnpc" LIBS += -l miniupnpc -l iphlpapi DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP) diff --git a/src/makefile.mingw b/src/makefile.mingw index 5e9a4427f14..75d3992f8ae 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -49,7 +49,10 @@ HEADERS = \ util.h \ wallet.h -ifdef USE_UPNP +ifndef USE_UPNP + override USE_UPNP = - +endif +ifneq (${USE_UPNP}, -) INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw" LIBPATHS += -L"C:\miniupnpc-1.6-mgw" LIBS += -l miniupnpc -l iphlpapi diff --git a/src/makefile.osx b/src/makefile.osx index cbd51b049f0..5e9236fd739 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -91,7 +91,10 @@ OBJS= \ obj/util.o \ obj/wallet.o -ifdef USE_UPNP +ifndef USE_UPNP + override USE_UPNP = - +endif +ifneq (${USE_UPNP}, -) DEFS += -DUSE_UPNP=$(USE_UPNP) ifdef STATIC LIBS += $(DEPSDIR)/lib/libminiupnpc.a From a259baa9557af63cca220802ee45be4f4b54ac90 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Sun, 13 May 2012 15:41:00 +0200 Subject: [PATCH 3/3] update some strings used as warning messages in sendcoinsdialog.cpp --- src/qt/sendcoinsdialog.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index b27efc24b7b..2a2c6062fa4 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -125,28 +125,28 @@ void SendCoinsDialog::on_sendButton_clicked() break; case WalletModel::AmountExceedsBalance: QMessageBox::warning(this, tr("Send Coins"), - tr("Amount exceeds your balance"), + tr("The amount exceeds your balance."), QMessageBox::Ok, QMessageBox::Ok); break; case WalletModel::AmountWithFeeExceedsBalance: QMessageBox::warning(this, tr("Send Coins"), - tr("Total exceeds your balance when the %1 transaction fee is included"). + tr("The total exceeds your balance when the %1 transaction fee is included."). arg(BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, sendstatus.fee)), QMessageBox::Ok, QMessageBox::Ok); break; case WalletModel::DuplicateAddress: QMessageBox::warning(this, tr("Send Coins"), - tr("Duplicate address found, can only send to each address once in one send operation"), + tr("Duplicate address found, can only send to each address once per send operation."), QMessageBox::Ok, QMessageBox::Ok); break; case WalletModel::TransactionCreationFailed: QMessageBox::warning(this, tr("Send Coins"), - tr("Error: Transaction creation failed "), + tr("Error: Transaction creation failed."), QMessageBox::Ok, QMessageBox::Ok); break; case WalletModel::TransactionCommitFailed: QMessageBox::warning(this, tr("Send Coins"), - tr("Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."), + tr("Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."), QMessageBox::Ok, QMessageBox::Ok); break; case WalletModel::Aborted: // User aborted, nothing to do