From: Wladimir J. van der Laan <laanwj@gmail.com>
Date: Sat, 14 Apr 2012 06:47:50 +0000 (-0700)
Subject: Merge pull request #1089 from laanwj/2012_04_translationupdate
X-Git-Tag: v0.4.0-unstable~129^2~78
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=46ba858817dd1a9cbb69b11f4603e8f8f74c4c44;hp=3fddc8effca227707773b5655c4cae4acb8396a6;p=novacoin.git

Merge pull request #1089 from laanwj/2012_04_translationupdate

Update translations for bitcoin core
---

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 844cd30..10028b5 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -552,7 +552,7 @@ void BitcoinGUI::setNumBlocks(int count)
     }
 
     // Set icon state: spinning if catching up, tick otherwise
-    if(secs < 90*60)
+    if(secs < 90*60 && count >= nTotalBlocks)
     {
         tooltip = tr("Up to date") + QString(".\n") + tooltip;
         labelBlocksIcon->setPixmap(QIcon(":/icons/synced").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 34d3032..8233e42 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -276,7 +276,8 @@ DisplayOptionsPage::DisplayOptionsPage(QWidget *parent):
 
     layout->addLayout(unit_hbox);
 
-    display_addresses = new QCheckBox(tr("Display addresses in transaction list"), this);
+    display_addresses = new QCheckBox(tr("&Display addresses in transaction list"), this);
+    display_addresses->setToolTip(tr("Whether to show Bitcoin addresses in the transaction list"));
     layout->addWidget(display_addresses);
 
     layout->addStretch();