Skip to content

Commit

Permalink
Merge #6122: chore: translations 2024-07
Browse files Browse the repository at this point in the history
85762dc 60%+: bg, ro, vi (UdjinM6)
2d0e68d 80%+: ar, de, es, fi, fr, it, ja, ko, nl, pl, pt, ru, sk, th, tr, zh_CN, zh_TW (UdjinM6)
f7992b0 en (UdjinM6)
49fc976 dashstrings (UdjinM6)
c8333a5 chore: replace remaining `...` with `…` in translated strings (UdjinM6)
ac2e9ea qt: Extract translations correctly from UTF-8 formatted source (Hennadii Stepanov)

Pull request description:

  ## Issue being fixed or feature implemented
  Mostly regular translation updates but with 2 additional fixes:
  - ac2e9ea is a backport, without it `make translate` fails to update `dashstrings.cpp` properly (but I couldn't figure out which PR it belongs to 🤷‍♂️ )
  - c8333a5 is needed to make it easier to replace all `...` with `…` in `*.ts` files locally to avoid annoying translators (`...` and `…` are visually the same in transifex interface)

  ## What was done?

  ## How Has This Been Tested?

  ## Breaking Changes

  ## Checklist:
  - [x] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  PastaPastaPasta:
    utACK 85762dc

Tree-SHA512: c3624d8e5b26b0fd4d488e6988e81000d05bdc66f9e126b5d3fe3c1f6bceaa846ee81dfc7c0d18613b0ac682a94e0b17007e86724e7cc02d9cfce87b22ce6916
  • Loading branch information
PastaPastaPasta committed Jul 23, 2024
2 parents d0be2ce + 85762dc commit 9e0dc0a
Show file tree
Hide file tree
Showing 25 changed files with 7,432 additions and 8,527 deletions.
2 changes: 1 addition & 1 deletion share/qt/extract_strings_qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def parse_po(text):
print('Cannot extract strings: xgettext utility is not installed or not configured.',file=sys.stderr)
print('Please install package "gettext" and re-run \'./configure\'.',file=sys.stderr)
sys.exit(1)
child = Popen([XGETTEXT,'--output=-','-n','--keyword=_'] + files, stdout=PIPE)
child = Popen([XGETTEXT,'--output=-','--from-code=utf-8','-n','--keyword=_'] + files, stdout=PIPE)
(out, err) = child.communicate()

messages = parse_po(out.decode('utf-8'))
Expand Down
14 changes: 7 additions & 7 deletions src/coinjoin/client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ bilingual_str CCoinJoinClientSession::GetStatus(bool fWaitForBlock) const
return strAutoDenomResult;
case POOL_STATE_SIGNING:
if (nStatusMessageProgress % 70 <= 40)
return _("Found enough users, signing ...");
return _("Found enough users, signing");
else if (nStatusMessageProgress % 70 <= 50)
strSuffix = ".";
else if (nStatusMessageProgress % 70 <= 60)
Expand All @@ -330,7 +330,7 @@ bilingual_str CCoinJoinClientSession::GetStatus(bool fWaitForBlock) const
strSuffix = "...";
return strprintf(_("Found enough users, signing ( waiting %s )"), strSuffix);
case POOL_STATE_ERROR:
return strprintf(_("%s request incomplete:"), gCoinJoinName) + strLastMessage + Untranslated(" ") + _("Will retry...");
return strprintf(_("%s request incomplete:"), gCoinJoinName) + strLastMessage + Untranslated(" ") + _("Will retry");
default:
return strprintf(_("Unknown state: id = %u"), nState);
}
Expand Down Expand Up @@ -807,7 +807,7 @@ bool CCoinJoinClientSession::DoAutomaticDenominating(CChainState& active_chainst
}

if (GetEntriesCount() > 0) {
strAutoDenomResult = _("Mixing in progress...");
strAutoDenomResult = _("Mixing in progress");
return false;
}

Expand Down Expand Up @@ -912,7 +912,7 @@ bool CCoinJoinClientSession::DoAutomaticDenominating(CChainState& active_chainst
}

if (nSessionID) {
strAutoDenomResult = _("Mixing in progress...");
strAutoDenomResult = _("Mixing in progress");
return false;
}

Expand Down Expand Up @@ -1115,7 +1115,7 @@ bool CCoinJoinClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymized,
nTimeLastSuccessfulStep = GetTime();
WalletCJLogPrint(m_wallet, "CCoinJoinClientSession::JoinExistingQueue -- pending connection (from queue): nSessionDenom: %d (%s), addr=%s\n",
nSessionDenom, CoinJoin::DenominationToString(nSessionDenom), dmn->pdmnState->addr.ToString());
strAutoDenomResult = _("Trying to connect...");
strAutoDenomResult = _("Trying to connect");
return true;
}
strAutoDenomResult = _("Failed to find mixing queue to join");
Expand Down Expand Up @@ -1196,7 +1196,7 @@ bool CCoinJoinClientSession::StartNewQueue(CAmount nBalanceNeedsAnonymized, CCon
nTimeLastSuccessfulStep = GetTime();
WalletCJLogPrint(m_wallet, "CCoinJoinClientSession::StartNewQueue -- pending connection, nSessionDenom: %d (%s), addr=%s\n",
nSessionDenom, CoinJoin::DenominationToString(nSessionDenom), dmn->pdmnState->addr.ToString());
strAutoDenomResult = _("Trying to connect...");
strAutoDenomResult = _("Trying to connect");
return true;
}
strAutoDenomResult = _("Failed to start a new mixing queue");
Expand Down Expand Up @@ -1231,7 +1231,7 @@ void CCoinJoinClientManager::ProcessPendingDsaRequest(CConnman& connman)
LOCK(cs_deqsessions);
for (auto& session : deqSessions) {
if (session.ProcessPendingDsaRequest(connman)) {
strAutoDenomResult = _("Mixing in progress...");
strAutoDenomResult = _("Mixing in progress");
}
}
}
Expand Down
96 changes: 75 additions & 21 deletions src/qt/dashstrings.cpp

Large diffs are not rendered by default.

Loading

0 comments on commit 9e0dc0a

Please sign in to comment.