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=-c;p=novacoin.git

Merge pull request #1089 from laanwj/2012_04_translationupdate

Update translations for bitcoin core
---

46ba858817dd1a9cbb69b11f4603e8f8f74c4c44
diff --combined src/qt/bitcoingui.cpp
index ba33d2b,844cd30..10028b5
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@@ -241,7 -241,7 +241,7 @@@ void BitcoinGUI::createActions(
      optionsAction->setToolTip(tr("Modify configuration options for bitcoin"));
      optionsAction->setMenuRole(QAction::PreferencesRole);
      toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("Show/Hide &Bitcoin"), this);
-     toggleHideAction->setToolTip(tr("Show or Hide the Bitcoin window"));
+     toggleHideAction->setToolTip(tr("Show or hide the Bitcoin window"));
      exportAction = new QAction(QIcon(":/icons/export"), tr("&Export..."), this);
      exportAction->setToolTip(tr("Export the data in the current tab to a file"));
      encryptWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Encrypt Wallet"), this);
@@@ -552,7 -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));