Skip to content

Commit f8176b7

Browse files
laanwjlaanwj
committed
Merge bitcoin/bitcoin#21836: scripted-diff: Replace three dots with ellipsis in the UI strings
d66f283 scripted-diff: Replace three dots with ellipsis in the UI strings (Hennadii Stepanov) Pull request description: This PR is split from #21463. The change was suggested on [Transifex.com](https://www.transifex.com/bitcoin/bitcoin/), and it does not touch `LogPrint` and `LogPrintf` calls. The only comment on #21463 [was](bitcoin/bitcoin@9030e4b#r597220100): > Mind that these messages also end up in the log. In principle the log is already UTF-8 (as are all strings and text in bitcoind). But, just noting, that it might make browsing the log a less pleasant experience on systems with misconfigured locale like some BSDs by default. ACKs for top commit: laanwj: ACK d66f283 Tree-SHA512: 5ab1cb3160f3f996f1ad7d7486662da3eb7f06a857f4a1874963ce10caed5b86b0ad6151b1b9ebeb2b8aa5f0c85efad3b768ea9cafe5db86f78f88912b756d1e
2 parents 1a60c54 + d66f283 commit f8176b7

19 files changed

+58
-58
lines changed

‎src/banman.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
BanMan::BanMan(fs::path ban_file, CClientUIInterface* client_interface, int64_t default_ban_time)
1616
: m_client_interface(client_interface), m_ban_db(std::move(ban_file)), m_default_ban_time(default_ban_time)
1717
{
18-
if (m_client_interface) m_client_interface->InitMessage(_("Loading banlist...").translated);
18+
if (m_client_interface) m_client_interface->InitMessage(_("Loading banlist…").translated);
1919

2020
int64_t n_start = GetTimeMillis();
2121
m_is_dirty = false;

‎src/init.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,7 +1346,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
13461346
};
13471347
bilingual_str strLoadError;
13481348

1349-
uiInterface.InitMessage(_("Loading block index...").translated);
1349+
uiInterface.InitMessage(_("Loading block index…").translated);
13501350

13511351
do {
13521352
const int64_t load_block_index_start_time = GetTimeMillis();
@@ -1479,7 +1479,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
14791479

14801480
for (CChainState* chainstate : chainman.GetAll()) {
14811481
if (!is_coinsview_empty(chainstate)) {
1482-
uiInterface.InitMessage(_("Verifying blocks...").translated);
1482+
uiInterface.InitMessage(_("Verifying blocks…").translated);
14831483
if (fHavePruned && args.GetArg("-checkblocks", DEFAULT_CHECKBLOCKS) > MIN_BLOCKS_TO_KEEP) {
14841484
LogPrintf("Prune: pruned datadir may not have more than %d blocks; only checking available blocks\n",
14851485
MIN_BLOCKS_TO_KEEP);
@@ -1579,7 +1579,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
15791579
if (!fReindex) {
15801580
LOCK(cs_main);
15811581
for (CChainState* chainstate : chainman.GetAll()) {
1582-
uiInterface.InitMessage(_("Pruning blockstore...").translated);
1582+
uiInterface.InitMessage(_("Pruning blockstore…").translated);
15831583
chainstate->PruneAndFlush();
15841584
}
15851585
}

‎src/net.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2467,7 +2467,7 @@ bool CConnman::Start(CScheduler& scheduler, const Options& connOptions)
24672467
}
24682468

24692469
if (clientInterface) {
2470-
clientInterface->InitMessage(_("Loading P2P addresses...").translated);
2470+
clientInterface->InitMessage(_("Loading P2P addresses…").translated);
24712471
}
24722472
// Load addresses from peers.dat
24732473
int64_t nStart = GetTimeMillis();
@@ -2491,7 +2491,7 @@ bool CConnman::Start(CScheduler& scheduler, const Options& connOptions)
24912491
LogPrintf("%i block-relay-only anchors will be tried for connections.\n", m_anchors.size());
24922492
}
24932493

2494-
uiInterface.InitMessage(_("Starting network threads...").translated);
2494+
uiInterface.InitMessage(_("Starting network threads…").translated);
24952495

24962496
fAddressesInitialized = true;
24972497

‎src/qt/bitcoin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ int GuiMain(int argc, char* argv[])
633633
if (app.baseInitialize()) {
634634
app.requestInitialize();
635635
#if defined(Q_OS_WIN)
636-
WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("%1 didn't yet exit safely...").arg(PACKAGE_NAME), (HWND)app.getMainWinId());
636+
WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("%1 didn't yet exit safely…").arg(PACKAGE_NAME), (HWND)app.getMainWinId());
637637
#endif
638638
app.exec();
639639
app.requestShutdown();

‎src/qt/bitcoingui.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -308,27 +308,27 @@ void BitcoinGUI::createActions()
308308
aboutQtAction = new QAction(tr("About &Qt"), this);
309309
aboutQtAction->setStatusTip(tr("Show information about Qt"));
310310
aboutQtAction->setMenuRole(QAction::AboutQtRole);
311-
optionsAction = new QAction(tr("&Options..."), this);
311+
optionsAction = new QAction(tr("&Options…"), this);
312312
optionsAction->setStatusTip(tr("Modify configuration options for %1").arg(PACKAGE_NAME));
313313
optionsAction->setMenuRole(QAction::PreferencesRole);
314314
optionsAction->setEnabled(false);
315315
toggleHideAction = new QAction(tr("&Show / Hide"), this);
316316
toggleHideAction->setStatusTip(tr("Show or hide the main Window"));
317317

318-
encryptWalletAction = new QAction(tr("&Encrypt Wallet..."), this);
318+
encryptWalletAction = new QAction(tr("&Encrypt Wallet…"), this);
319319
encryptWalletAction->setStatusTip(tr("Encrypt the private keys that belong to your wallet"));
320320
encryptWalletAction->setCheckable(true);
321-
backupWalletAction = new QAction(tr("&Backup Wallet..."), this);
321+
backupWalletAction = new QAction(tr("&Backup Wallet…"), this);
322322
backupWalletAction->setStatusTip(tr("Backup wallet to another location"));
323-
changePassphraseAction = new QAction(tr("&Change Passphrase..."), this);
323+
changePassphraseAction = new QAction(tr("&Change Passphrase…"), this);
324324
changePassphraseAction->setStatusTip(tr("Change the passphrase used for wallet encryption"));
325-
signMessageAction = new QAction(tr("Sign &message..."), this);
325+
signMessageAction = new QAction(tr("Sign &message…"), this);
326326
signMessageAction->setStatusTip(tr("Sign messages with your Bitcoin addresses to prove you own them"));
327-
verifyMessageAction = new QAction(tr("&Verify message..."), this);
327+
verifyMessageAction = new QAction(tr("&Verify message…"), this);
328328
verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Bitcoin addresses"));
329-
m_load_psbt_action = new QAction(tr("&Load PSBT from file..."), this);
329+
m_load_psbt_action = new QAction(tr("&Load PSBT from file…"), this);
330330
m_load_psbt_action->setStatusTip(tr("Load Partially Signed Bitcoin Transaction"));
331-
m_load_psbt_clipboard_action = new QAction(tr("Load PSBT from clipboard..."), this);
331+
m_load_psbt_clipboard_action = new QAction(tr("Load PSBT from clipboard…"), this);
332332
m_load_psbt_clipboard_action->setStatusTip(tr("Load Partially Signed Bitcoin Transaction from clipboard"));
333333

334334
openRPCConsoleAction = new QAction(tr("Node window"), this);
@@ -342,22 +342,22 @@ void BitcoinGUI::createActions()
342342
usedReceivingAddressesAction = new QAction(tr("&Receiving addresses"), this);
343343
usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels"));
344344

345-
openAction = new QAction(tr("Open &URI..."), this);
345+
openAction = new QAction(tr("Open &URI…"), this);
346346
openAction->setStatusTip(tr("Open a bitcoin: URI"));
347347

348348
m_open_wallet_action = new QAction(tr("Open Wallet"), this);
349349
m_open_wallet_action->setEnabled(false);
350350
m_open_wallet_action->setStatusTip(tr("Open a wallet"));
351351
m_open_wallet_menu = new QMenu(this);
352352

353-
m_close_wallet_action = new QAction(tr("Close Wallet..."), this);
353+
m_close_wallet_action = new QAction(tr("Close Wallet…"), this);
354354
m_close_wallet_action->setStatusTip(tr("Close wallet"));
355355

356-
m_create_wallet_action = new QAction(tr("Create Wallet..."), this);
356+
m_create_wallet_action = new QAction(tr("Create Wallet…"), this);
357357
m_create_wallet_action->setEnabled(false);
358358
m_create_wallet_action->setStatusTip(tr("Create a new wallet"));
359359

360-
m_close_all_wallets_action = new QAction(tr("Close All Wallets..."), this);
360+
m_close_all_wallets_action = new QAction(tr("Close All Wallets…"), this);
361361
m_close_all_wallets_action->setStatusTip(tr("Close all wallets"));
362362

363363
showHelpMessageAction = new QAction(tr("&Command-line options"), this);
@@ -944,7 +944,7 @@ void BitcoinGUI::updateHeadersSyncProgressLabel()
944944
int headersTipHeight = clientModel->getHeaderTipHeight();
945945
int estHeadersLeft = (GetTime() - headersTipTime) / Params().GetConsensus().nPowTargetSpacing;
946946
if (estHeadersLeft > HEADER_HEIGHT_DELTA_SYNC)
947-
progressBarLabel->setText(tr("Syncing Headers (%1%)...").arg(QString::number(100.0 / (headersTipHeight+estHeadersLeft)*headersTipHeight, 'f', 1)));
947+
progressBarLabel->setText(tr("Syncing Headers (%1%)…").arg(QString::number(100.0 / (headersTipHeight+estHeadersLeft)*headersTipHeight, 'f', 1)));
948948
}
949949

950950
void BitcoinGUI::openOptionsDialogWithTab(OptionsDialog::Tab tab)
@@ -990,24 +990,24 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
990990
updateHeadersSyncProgressLabel();
991991
return;
992992
}
993-
progressBarLabel->setText(tr("Synchronizing with network..."));
993+
progressBarLabel->setText(tr("Synchronizing with network…"));
994994
updateHeadersSyncProgressLabel();
995995
break;
996996
case BlockSource::DISK:
997997
if (header) {
998-
progressBarLabel->setText(tr("Indexing blocks on disk..."));
998+
progressBarLabel->setText(tr("Indexing blocks on disk…"));
999999
} else {
1000-
progressBarLabel->setText(tr("Processing blocks on disk..."));
1000+
progressBarLabel->setText(tr("Processing blocks on disk…"));
10011001
}
10021002
break;
10031003
case BlockSource::REINDEX:
1004-
progressBarLabel->setText(tr("Reindexing blocks on disk..."));
1004+
progressBarLabel->setText(tr("Reindexing blocks on disk…"));
10051005
break;
10061006
case BlockSource::NONE:
10071007
if (header) {
10081008
return;
10091009
}
1010-
progressBarLabel->setText(tr("Connecting to peers..."));
1010+
progressBarLabel->setText(tr("Connecting to peers…"));
10111011
break;
10121012
}
10131013

@@ -1044,7 +1044,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
10441044
progressBar->setValue(nVerificationProgress * 1000000000.0 + 0.5);
10451045
progressBar->setVisible(true);
10461046

1047-
tooltip = tr("Catching up...") + QString("<br>") + tooltip;
1047+
tooltip = tr("Catching up…") + QString("<br>") + tooltip;
10481048
if(count != prevBlocks)
10491049
{
10501050
labelBlocksIcon->setPixmap(platformStyle->SingleColorIcon(QString(

‎src/qt/forms/modaloverlay.ui

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ QLabel { color: rgb(40,40,40); }</string>
219219
<item row="0" column="1">
220220
<widget class="QLabel" name="numberOfBlocksLeft">
221221
<property name="text">
222-
<string>Unknown...</string>
222+
<string>Unknown…</string>
223223
</property>
224224
</widget>
225225
</item>
@@ -245,7 +245,7 @@ QLabel { color: rgb(40,40,40); }</string>
245245
</sizepolicy>
246246
</property>
247247
<property name="text">
248-
<string>Unknown...</string>
248+
<string>Unknown…</string>
249249
</property>
250250
</widget>
251251
</item>
@@ -289,7 +289,7 @@ QLabel { color: rgb(40,40,40); }</string>
289289
<item row="4" column="1">
290290
<widget class="QLabel" name="progressIncreasePerH">
291291
<property name="text">
292-
<string>calculating...</string>
292+
<string>calculating…</string>
293293
</property>
294294
</widget>
295295
</item>
@@ -309,7 +309,7 @@ QLabel { color: rgb(40,40,40); }</string>
309309
<item row="5" column="1">
310310
<widget class="QLabel" name="expectedTimeLeft">
311311
<property name="text">
312-
<string>calculating...</string>
312+
<string>calculating…</string>
313313
</property>
314314
</widget>
315315
</item>

‎src/qt/forms/psbtoperationsdialog.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<item>
127127
<widget class="QPushButton" name="saveButton">
128128
<property name="text">
129-
<string>Save...</string>
129+
<string>Save…</string>
130130
</property>
131131
</widget>
132132
</item>

‎src/qt/forms/receiverequestdialog.ui

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Request payment to ...</string>
14+
<string>Request payment to …</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
1717
<property name="sizeConstraint">
@@ -65,7 +65,7 @@
6565
<item row="2" column="1" alignment="Qt::AlignTop">
6666
<widget class="QLabel" name="uri_content">
6767
<property name="text">
68-
<string notr="true">bitcoin:BC1...</string>
68+
<string notr="true">bitcoin:BC1…</string>
6969
</property>
7070
<property name="textFormat">
7171
<enum>Qt::RichText</enum>
@@ -97,7 +97,7 @@
9797
<item row="3" column="1" alignment="Qt::AlignTop">
9898
<widget class="QLabel" name="address_content">
9999
<property name="text">
100-
<string notr="true">bc1...</string>
100+
<string notr="true">bc1…</string>
101101
</property>
102102
<property name="textFormat">
103103
<enum>Qt::PlainText</enum>
@@ -257,7 +257,7 @@
257257
<item>
258258
<widget class="QPushButton" name="btnSaveAs">
259259
<property name="text">
260-
<string>&amp;Save Image...</string>
260+
<string>&amp;Save Image…</string>
261261
</property>
262262
<property name="autoDefault">
263263
<bool>false</bool>

‎src/qt/forms/sendcoinsdialog.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<string notr="true"/>
108108
</property>
109109
<property name="text">
110-
<string>Inputs...</string>
110+
<string>Inputs…</string>
111111
</property>
112112
<property name="autoDefault">
113113
<bool>false</bool>
@@ -738,7 +738,7 @@
738738
<item>
739739
<widget class="QPushButton" name="buttonChooseFee">
740740
<property name="text">
741-
<string>Choose...</string>
741+
<string>Choose…</string>
742742
</property>
743743
</widget>
744744
</item>
@@ -991,7 +991,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
991991
<item>
992992
<widget class="QLabel" name="labelSmartFee2">
993993
<property name="text">
994-
<string>(Smart fee not initialized yet. This usually takes a few blocks...)</string>
994+
<string>(Smart fee not initialized yet. This usually takes a few blocks…)</string>
995995
</property>
996996
</widget>
997997
</item>

‎src/qt/modaloverlay.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
149149
ui->numberOfBlocksLeft->setText(QString::number(bestHeaderHeight - count));
150150
} else {
151151
UpdateHeaderSyncLabel();
152-
ui->expectedTimeLeft->setText(tr("Unknown..."));
152+
ui->expectedTimeLeft->setText(tr("Unknown…"));
153153
}
154154
}
155155

156156
void ModalOverlay::UpdateHeaderSyncLabel() {
157157
int est_headers_left = bestHeaderDate.secsTo(QDateTime::currentDateTime()) / Params().GetConsensus().nPowTargetSpacing;
158-
ui->numberOfBlocksLeft->setText(tr("Unknown. Syncing Headers (%1, %2%)...").arg(bestHeaderHeight).arg(QString::number(100.0 / (bestHeaderHeight + est_headers_left) * bestHeaderHeight, 'f', 1)));
158+
ui->numberOfBlocksLeft->setText(tr("Unknown. Syncing Headers (%1, %2%)…").arg(bestHeaderHeight).arg(QString::number(100.0 / (bestHeaderHeight + est_headers_left) * bestHeaderHeight, 'f', 1)));
159159
}
160160

161161
void ModalOverlay::toggleVisibility()

0 commit comments

Comments
 (0)