Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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