From bd26fee10bb2697340caf5e3f48922df0323f88e Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 31 Jul 2014 16:56:14 +0200 Subject: [PATCH] qt: Update some messages after suggestions by translators - *cannot* is more common, thus preferred to *can not* - Use *Watch-only* instead of *Watchonly* as one word --- src/qt/forms/overviewpage.ui | 2 +- src/qt/intro.cpp | 2 +- src/qt/locale/bitcoin_en.ts | 46 ++++++++++++++++++------------------ src/qt/paymentserver.cpp | 6 ++--- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index 8784da5f..c195afee 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -89,7 +89,7 @@ - Watchonly: + Watch-only: Qt::AlignCenter diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 3e99e941..13c260b7 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -182,7 +182,7 @@ void Intro::pickDataDirectory() break; } catch(fs::filesystem_error &e) { QMessageBox::critical(0, tr("Bitcoin"), - tr("Error: Specified data directory \"%1\" can not be created.").arg(dataDir)); + tr("Error: Specified data directory \"%1\" cannot be created.").arg(dataDir)); /* fall through, back to choosing screen */ } } diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 6739ef00..96f76851 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -1164,8 +1164,8 @@ Address: %4 - Error: Specified data directory "%1" can not be created. - Error: Specified data directory "%1" can not be created. + Error: Specified data directory "%1" cannot be created. + @@ -1501,7 +1501,7 @@ Address: %4 - Watchonly: + Watch-only: @@ -1599,17 +1599,7 @@ Address: %4 - - URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters. - URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters. - - - - Payment request file can not be read! This can be caused by an invalid payment request file. - - - - + Payment request rejected @@ -1636,12 +1626,7 @@ Address: %4 - - Payment request can not be parsed! - - - - + @@ -1661,12 +1646,22 @@ Address: %4 - + + URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters. + + + + Payment request file handling - + + Payment request file cannot be read! This can be caused by an invalid payment request file. + + + + Unverified payment requests to custom payment scripts are unsupported. @@ -1681,7 +1676,12 @@ Address: %4 - + + Payment request cannot be parsed! + + + + Bad response from server %1 diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 7c0c95c4..76fd2733 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -424,7 +424,7 @@ void PaymentServer::handleURIOrFile(const QString& s) } else emit message(tr("URI handling"), - tr("URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters."), + tr("URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters."), CClientUIInterface::ICON_WARNING); return; @@ -438,7 +438,7 @@ void PaymentServer::handleURIOrFile(const QString& s) if (!readPaymentRequest(s, request)) { emit message(tr("Payment request file handling"), - tr("Payment request file can not be read! This can be caused by an invalid payment request file."), + tr("Payment request file cannot be read! This can be caused by an invalid payment request file."), CClientUIInterface::ICON_WARNING); } else if (processPaymentRequest(request, recipient)) @@ -663,7 +663,7 @@ void PaymentServer::netRequestFinished(QNetworkReply* reply) { qWarning() << "PaymentServer::netRequestFinished : Error parsing payment request"; emit message(tr("Payment request error"), - tr("Payment request can not be parsed!"), + tr("Payment request cannot be parsed!"), CClientUIInterface::MSG_ERROR); } else if (processPaymentRequest(request, recipient))