From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Mon, 2 Apr 2012 14:08:14 +0000 (-0700)
Subject: Merge pull request #1022 from Diapolo/fix#1020
X-Git-Tag: v0.4.0-unstable~129^2~117
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=d3f220b2c28e2656ff719984b8a39856c8d33bb1;hp=b5271c8861d6527b66c8470eafc6f92ae6af8cac;p=novacoin.git

Merge pull request #1022 from Diapolo/fix#1020

fix for #1020
---

diff --git a/contrib/gitian-downloader/linux-download-config b/contrib/gitian-downloader/linux-download-config
index 36f5f68..9a570a1 100644
--- a/contrib/gitian-downloader/linux-download-config
+++ b/contrib/gitian-downloader/linux-download-config
@@ -17,7 +17,7 @@ signers:
     key: devrandom
   D762373D24904A3E42F33B08B9A408E71DAAC974:
     weight: 40
-    name: Sipa
+    name: "Pieter Wuille"
     key: sipa
   77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
     weight: 40
diff --git a/contrib/gitian-downloader/sipa-key.pgp b/contrib/gitian-downloader/sipa-key.pgp
index 086c9eb..a52a5de 100644
Binary files a/contrib/gitian-downloader/sipa-key.pgp and b/contrib/gitian-downloader/sipa-key.pgp differ
diff --git a/contrib/gitian-downloader/win32-download-config b/contrib/gitian-downloader/win32-download-config
index b1e1c73..3974d61 100644
--- a/contrib/gitian-downloader/win32-download-config
+++ b/contrib/gitian-downloader/win32-download-config
@@ -17,7 +17,7 @@ signers:
     key: devrandom
   D762373D24904A3E42F33B08B9A408E71DAAC974:
     weight: 40
-    name: Sipa
+    name: "Pieter Wuille"
     key: sipa
   77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
     weight: 40
diff --git a/share/setup.nsi b/share/setup.nsi
index cc19daf..4dc2ad5 100644
--- a/share/setup.nsi
+++ b/share/setup.nsi
@@ -51,7 +51,7 @@ CRCCheck on
 XPStyle on
 BrandingText " "
 ShowInstDetails show
-VIProductVersion 0.6.0.6
+VIProductVersion 0.6.0.99
 VIAddVersionKey ProductName Bitcoin
 VIAddVersionKey ProductVersion "${VERSION}"
 VIAddVersionKey CompanyName "${COMPANY}"
diff --git a/src/bignum.h b/src/bignum.h
index c7c2ff1..95e2197 100644
--- a/src/bignum.h
+++ b/src/bignum.h
@@ -47,7 +47,7 @@ public:
 };
 
 
-/** C++ wrapper for BIGNUM (OpenSSl bignum) */
+/** C++ wrapper for BIGNUM (OpenSSL bignum) */
 class CBigNum : public BIGNUM
 {
 public:
diff --git a/src/main.h b/src/main.h
index 18d5dbd..16159e1 100644
--- a/src/main.h
+++ b/src/main.h
@@ -26,7 +26,7 @@ class CInv;
 class CRequestTracker;
 class CNode;
 
-static const int CLIENT_VERSION = 60006;
+static const int CLIENT_VERSION = 60099;
 static const bool VERSION_IS_BETA = true;
 extern const std::string CLIENT_NAME;
 
diff --git a/src/netbase.h b/src/netbase.h
index b5f9d5f..43189c3 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -81,7 +81,7 @@ class CNetAddr
             )
 };
 
-/** A combnation of a network address (CNetAddr) and a (TCP) port */
+/** A combination of a network address (CNetAddr) and a (TCP) port */
 class CService : public CNetAddr
 {
     protected:
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 7bce128..9169631 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -376,7 +376,7 @@ void BitcoinGUI::createTrayIcon()
     trayIcon = new QSystemTrayIcon(this);
     trayIconMenu = new QMenu(this);
     trayIcon->setContextMenu(trayIconMenu);
-    trayIcon->setToolTip("Bitcoin client");
+    trayIcon->setToolTip(tr("Bitcoin client"));
     trayIcon->setIcon(QIcon(":/icons/toolbar"));
     connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
             this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason)));