Skip to content

Commit 3d2cea6

Browse files
hebastoknst
authored andcommitted
Merge bitcoin-core/gui#311: Peers Window rename 'Peer id' to 'Peer'
657b33e qt: add translator comments for peers table columns (Jarol Rodriguez) 73a91c6 gui: rename "Peer Id" to "Peer" in tab column and details area (Jon Atack) Pull request description: Picking up bitcoin-core/gui#290 **Original PR Description:** - renames the peers tab column header from `Peer Id` to `Peer` to allow resizing the column more tightly (this will be particularly useful after dashpay#256) and does the same for the peer details area. While here, we also add Qt translator comments for the Peer Table columns. | Master | PR | | ----------- | ----------- | | ![Screen Shot 2021-05-03 at 1 23 05 AM](https://user-images.githubusercontent.com/23396902/116843818-20a14b00-abaf-11eb-913e-ddff11cda5cd.png) | ![Screen Shot 2021-05-05 at 4 08 45 AM](https://user-images.githubusercontent.com/23396902/117112825-a2cc7380-ad57-11eb-939b-1aceb4214ad1.png) | ACKs for top commit: jonatack: utACK 657b33e hebasto: re-ACK 657b33e Tree-SHA512: f50116f7ca8719cadf1f95f45e3594b3b92bde9c43eb954f3e963ed10629dd9406efdb5e96aa1f750a926e24a96321d824ed3780bd9cd748774e0b85fd0c9535
1 parent dc498be commit 3d2cea6

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed

src/qt/peertablemodel.h

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,28 @@ public Q_SLOTS:
8383

8484
private:
8585
interfaces::Node& m_node;
86-
const QStringList columns{tr("Peer Id"), tr("Address"), tr("Network"), tr("Ping"), tr("Sent"), tr("Received"), tr("User Agent")};
86+
const QStringList columns{
87+
/*: Title of Peers Table column which contains a
88+
unique number used to identify a connection. */
89+
tr("Peer"),
90+
/*: Title of Peers Table column which contains the
91+
IP/Onion/I2P address of the connected peer. */
92+
tr("Address"),
93+
/*: Title of Peers Table column which states the network the peer
94+
connected through. */
95+
tr("Network"),
96+
/*: Title of Peers Table column which indicates the current latency
97+
of the connection with the peer. */
98+
tr("Ping"),
99+
/*: Title of Peers Table column which indicates the total amount of
100+
network information we have sent to the peer. */
101+
tr("Sent"),
102+
/*: Title of Peers Table column which indicates the total amount of
103+
network information we have received from the peer. */
104+
tr("Received"),
105+
/*: Title of Peers Table column which contains the peer's
106+
User Agent string. */
107+
tr("User Agent")};
87108
std::unique_ptr<PeerTablePriv> priv;
88109
QTimer *timer;
89110
};

src/qt/rpcconsole.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,7 @@ void RPCConsole::updateDetailWidget()
12271227
const CNodeCombinedStats *stats = clientModel->getPeerTableModel()->getNodeStats(selected_rows.first().row());
12281228
// update the detail ui with latest node information
12291229
QString peerAddrDetails(QString::fromStdString(stats->nodeStats.m_addr_name) + " ");
1230-
peerAddrDetails += tr("(peer id: %1)").arg(QString::number(stats->nodeStats.nodeid));
1230+
peerAddrDetails += tr("(peer: %1)").arg(QString::number(stats->nodeStats.nodeid));
12311231
if (!stats->nodeStats.addrLocal.empty())
12321232
peerAddrDetails += "<br />" + tr("via %1").arg(QString::fromStdString(stats->nodeStats.addrLocal));
12331233
ui->peerHeading->setText(peerAddrDetails);

0 commit comments

Comments
 (0)