gui: improve connection type translations and translator comments

bitcoin-core · Apr 25, 2021 · d04ebda · d04ebda
1 parent 1c46329
commit d04ebda
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -666,10 +666,12 @@ QString ConnectionTypeToQString(ConnectionType conn_type, bool prepend_direction
 {
  QString prefix;
  if (prepend_direction) {
+ //: Connection direction. Also used in CONNECTION_TYPE_DOC and PeerTableModel::data().
  prefix = (conn_type == ConnectionType::INBOUND) ? QObject::tr("Inbound") : QObject::tr("Outbound") + " ";
  }
  switch (conn_type) {
  case ConnectionType::INBOUND: return prefix;
+ //: The connection types (Full Relay, Block Relay, Manual, Feeler, Address Fetch) are also used in CONNECTION_TYPE_DOC.
  case ConnectionType::OUTBOUND_FULL_RELAY: return prefix + QObject::tr("Full Relay");
  case ConnectionType::BLOCK_RELAY: return prefix + QObject::tr("Block Relay");
  case ConnectionType::MANUAL: return prefix + QObject::tr("Manual");

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -462,15 +462,17 @@ RPCConsole::RPCConsole(interfaces::Node& node, const PlatformStyle *_platformSty
 
  constexpr QChar nonbreaking_hyphen(8209);
  const std::vector<QString> CONNECTION_TYPE_DOC{
- tr("Inbound: initiated by peer"),
- tr("Outbound Full Relay: default"),
- tr("Outbound Block Relay: does not relay transactions or addresses"),
- tr("Outbound Manual: added using RPC %1 or %2/%3 configuration options")
+ //: The connection direction (Inbound/Outbound) is also used in ConnectionTypeToQString() and PeerTableModel::data().
+ //: The connection types (Full Relay, Block Relay, Manual, Feeler, Address Fetch) are also used in ConnectionTypeToQString().
+ tr("Inbound") + ": " + tr("initiated by peer"),
+ tr("Outbound") + " " + tr("Full Relay") + ": " + tr("default"),
+ tr("Outbound") + " " + tr("Block Relay") + ": " + tr("does not relay transactions or addresses"),
+ tr("Outbound") + " " + tr("Manual") + ": " + tr("added using RPC %1 or %2/%3 configuration options")
  .arg("addnode")
  .arg(QString(nonbreaking_hyphen) + "addnode")
  .arg(QString(nonbreaking_hyphen) + "connect"),
- tr("Outbound Feeler: short-lived, for testing addresses"),
- tr("Outbound Address Fetch: short-lived, for soliciting addresses")};
+ tr("Outbound") + " " + tr("Feeler") + ": " + tr("short-lived, for testing addresses"),
+ tr("Outbound") + " " + tr("Address Fetch") + ": " + tr("short-lived, for soliciting addresses")};
  const QString list{"<ul><li>" + Join(CONNECTION_TYPE_DOC, QString("</li><li>")) + "</li></ul>"};
  ui->peerConnectionTypeLabel->setToolTip(ui->peerConnectionTypeLabel->toolTip().arg(list));
  const QString hb_list{"<ul><li>\""