diff --git a/CHANGELOG.md b/CHANGELOG.md index 78446361..49c50b1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,5 @@ -The much awaited V8 iteration of Scala. This release has the following changes: +A point release for V8, this release has the following changes: -* Diardi V2: Allowing elected members of the community to participate in consensus and help protect the network - * Separate [proof-of-work](https://github.com/scala-network/felidae) for Diardi miners -* Better emission curve with eroding block rewards -* Upstream merge to XMR version v0.18.2.2 "Fluorine Fermi" - * New CLSAG transaction format - * View tags for faster wallet scans - * A lot of bug fixes and more +* Fixes for wallet fee and open alias issues +* Added checkpoints for testnet +* Some other minor bug fixes diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp index 481a97fb..4c0a84c5 100644 --- a/src/common/dns_utils.cpp +++ b/src/common/dns_utils.cpp @@ -396,8 +396,8 @@ namespace dns_utils { //----------------------------------------------------------------------- // TODO: parse the string in a less stupid way, probably with regex std::string address_from_txt_record(const std::string &s) { - // make sure the txt record has "oa1:xmr" and find it - auto pos = s.find("oa1:xmr"); + // make sure the txt record has "oa1:xla" and find it + auto pos = s.find("oa1:xla"); if (pos == std::string::npos) return {}; // search from there to find "recipient_address=" @@ -409,12 +409,12 @@ std::string address_from_txt_record(const std::string &s) { auto pos2 = s.find(";", pos); if (pos2 != std::string::npos) { // length of address == 95, we can at least validate that much here - if (pos2 - pos == 95) { - return s.substr(pos, 95); + if (pos2 - pos == 97) { + return s.substr(pos, 97); } else if (pos2 - pos == - 106) // length of address == 106 --> integrated address + 109) // length of address == 106 --> integrated address { - return s.substr(pos, 106); + return s.substr(pos, 109); } } return {}; @@ -481,7 +481,7 @@ std::string get_account_address_as_str_from_url( // attempt to get address from dns query auto addresses = addresses_from_url(url, dnssec_valid); if (addresses.empty()) { - LOG_ERROR("wrong address: " << url); + LOG_ERROR("wrong address for UD: " << url); return {}; } return dns_confirm(url, addresses, dnssec_valid); diff --git a/src/common/dns_utils.h b/src/common/dns_utils.h index 991b393d..b5c4cae9 100644 --- a/src/common/dns_utils.h +++ b/src/common/dns_utils.h @@ -133,7 +133,7 @@ class DNSResolver { * @brief Gets a DNS address from OpenAlias format * * If the address looks good, but contains one @ symbol, replace that with a . - * e.g. donate@getscala.org becomes donate.getscala.org + * e.g. donate@scalaproject.io becomes donate.scalaproject.io * * @param oa_addr OpenAlias address * diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 6d6508c9..ff9c6ce8 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -3079,8 +3079,7 @@ simple_wallet::simple_wallet() m_cmd_binder.set_handler( "donate", boost::bind(&simple_wallet::on_command, this, &simple_wallet::donate, _1), - tr(USAGE_DONATE), - tr("Donate to the development team (donate.getscala.org).")); + tr(USAGE_DONATE), tr("Donate to the Scala team.")); m_cmd_binder.set_handler( "sign_transfer", boost::bind(&simple_wallet::on_command, this, @@ -7750,7 +7749,7 @@ bool simple_wallet::donate(const std::vector &args_) { local_args.push_back(payment_id_str); if (m_wallet->nettype() == cryptonote::MAINNET) message_writer() << (boost::format(tr("Donating %s %s to The scala Project " - "(donate.getscala.org or %s).")) % + "(donate.scalaproject.io or %s).")) % amount_str % cryptonote::get_unit( cryptonote::get_default_decimal_point()) % diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index acb89643..717f0926 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -59,10 +59,11 @@ #undef scala_DEFAULT_LOG_CATEGORY #define scala_DEFAULT_LOG_CATEGORY "wallet.simplewallet" -// Hardcode scala's donation address (see #1447) +// Hardcode scala's donation address constexpr const char scala_DONATION_ADDR[] = - "888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwM" - "VgN5S9cQUiyoogDavup3H"; + "SvkzckfVpUSWuSG4VS4WCL9KMTh39krgk6SLwVGLkZufh83ET8JjZ3yidaoURyHgLFDhFZEPPY" + "12cHqYyS" + "VoV2x62XvMtJii5"; /*! * \namespace cryptonote diff --git a/src/version.cpp.in b/src/version.cpp.in index 555bdcdf..44f00bc1 100644 --- a/src/version.cpp.in +++ b/src/version.cpp.in @@ -1,5 +1,5 @@ #define DEF_scala_VERSION_TAG "@VERSIONTAG@" -#define DEF_scala_VERSION "8.0.0" +#define DEF_scala_VERSION "8.0.1" #define DEF_scala_RELEASE_NAME "Menger" #define DEF_scala_VERSION_FULL DEF_scala_VERSION "-" DEF_scala_VERSION_TAG #define DEF_scala_VERSION_IS_RELEASE @VERSION_IS_RELEASE@ diff --git a/tests/unit_tests/address_from_url.cpp b/tests/unit_tests/address_from_url.cpp index 4b19711a..d9f8be21 100644 --- a/tests/unit_tests/address_from_url.cpp +++ b/tests/unit_tests/address_from_url.cpp @@ -38,9 +38,9 @@ TEST(AddressFromTXT, Success) { - std::string addr = "46BeWrHpwXmHDpDEUmZBWZfoQpdc6HaERCNmx1pEYL2rAcuwufPN9rXHHtyUA4QVy66qeFQkn6sfK8aHYjA3jk3o1Bv16em"; + std::string addr = "SvkzckfVpUSWuSG4VS4WCL9KMTh39krgk6SLwVGLkZufh83ET8JjZ3yidaoURyHgLFDhFZEPPY12cHqYySVoV2x62XvMtJii5"; - std::string txtr = "oa1:xmr"; + std::string txtr = "oa1:xla"; txtr += " recipient_address="; txtr += addr; txtr += ";"; @@ -59,7 +59,7 @@ TEST(AddressFromTXT, Success) EXPECT_STREQ(addr.c_str(), res.c_str()); - std::string txtr3 = "foobar oa1:xmr tx_description=\"Donation for scala Development Fund\"; "; + std::string txtr3 = "foobar oa1:xla tx_description=\"Donation for scala Development Fund\"; "; txtr3 += "recipient_address="; txtr3 += addr; txtr3 += "; foobar"; @@ -71,7 +71,7 @@ TEST(AddressFromTXT, Success) TEST(AddressFromTXT, Failure) { - std::string txtr = "oa1:xmr recipient_address=not a real address"; + std::string txtr = "oa1:xla recipient_address=not a real address"; std::string res = tools::dns_utils::address_from_txt_record(txtr); @@ -89,7 +89,7 @@ TEST(AddressFromURL, Success) bool dnssec_result = false; - std::vector addresses = tools::dns_utils::addresses_from_url("donate.getscala.org", dnssec_result); + std::vector addresses = tools::dns_utils::addresses_from_url("donate.scalaproject.io", dnssec_result); EXPECT_EQ(1, addresses.size()); if (addresses.size() == 1) diff --git a/tests/unit_tests/dns_resolver.cpp b/tests/unit_tests/dns_resolver.cpp index 79182f72..20de1ef8 100644 --- a/tests/unit_tests/dns_resolver.cpp +++ b/tests/unit_tests/dns_resolver.cpp @@ -141,22 +141,22 @@ TEST(DNSResolver, GetTXTRecord) { bool avail, valid; - std::vector records = tools::DNSResolver::instance().get_txt_record("donate.getscala.org", avail, valid); + std::vector records = tools::DNSResolver::instance().get_txt_record("donate.scalaproject.io", avail, valid); EXPECT_NE(0, records.size()); for (auto& rec : records) { - std::cout << "TXT record for donate.getscala.org: " << rec << std::endl; + std::cout << "TXT record for donate.scalaproject.io: " << rec << std::endl; } // replace first @ with . std::string addr = tools::DNSResolver::instance().get_dns_format_from_oa_address("donate@getscala.org"); - EXPECT_STREQ("donate.getscala.org", addr.c_str()); + EXPECT_STREQ("donate.scalaproject.io", addr.c_str()); // no change - addr = tools::DNSResolver::instance().get_dns_format_from_oa_address("donate.getscala.org"); - EXPECT_STREQ("donate.getscala.org", addr.c_str()); + addr = tools::DNSResolver::instance().get_dns_format_from_oa_address("donate.scalaproject.io"); + EXPECT_STREQ("donate.scalaproject.io", addr.c_str()); } TEST(DNSResolver, Localhost) diff --git a/translations/monero.ts b/translations/monero.ts index f1e18fba..d836c9ee 100644 --- a/translations/monero.ts +++ b/translations/monero.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_ar.ts b/translations/scala_ar.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_ar.ts +++ b/translations/scala_ar.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_bg.ts b/translations/scala_bg.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_bg.ts +++ b/translations/scala_bg.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_bn.ts b/translations/scala_bn.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_bn.ts +++ b/translations/scala_bn.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_cat.ts b/translations/scala_cat.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_cat.ts +++ b/translations/scala_cat.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_cs.ts b/translations/scala_cs.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_cs.ts +++ b/translations/scala_cs.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_da.ts b/translations/scala_da.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_da.ts +++ b/translations/scala_da.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_de.ts b/translations/scala_de.ts index e1f5b1e1..aba8d029 100644 --- a/translations/scala_de.ts +++ b/translations/scala_de.ts @@ -1634,8 +1634,8 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). - Spende <Betrag> ans Entwicklerteam (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). + Spende <Betrag> ans Entwicklerteam (donate.scalaproject.io). @@ -4525,7 +4525,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_el.ts b/translations/scala_el.ts index 6373cf49..3023d6d4 100644 --- a/translations/scala_el.ts +++ b/translations/scala_el.ts @@ -1628,7 +1628,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4521,7 +4521,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_eo.ts b/translations/scala_eo.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_eo.ts +++ b/translations/scala_eo.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_es.ts b/translations/scala_es.ts index b2bd929d..f68f482b 100644 --- a/translations/scala_es.ts +++ b/translations/scala_es.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_fa.ts b/translations/scala_fa.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_fa.ts +++ b/translations/scala_fa.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_fi.ts b/translations/scala_fi.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_fi.ts +++ b/translations/scala_fi.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_fr.ts b/translations/scala_fr.ts index c0b9757f..b93f6be6 100644 --- a/translations/scala_fr.ts +++ b/translations/scala_fr.ts @@ -2609,8 +2609,8 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). - Donner <montant> à l'équipe de développement (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). + Donner <montant> à l'équipe de développement (donate.scalaproject.io). @@ -4485,8 +4485,8 @@ Entrée %llu/%llu (%s): montant=%s - Donating %s %s to The scala Project (donate.getscala.org or %s). - Don de %s %s à The scala Project (donate.getscala.org ou %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). + Don de %s %s à The scala Project (donate.scalaproject.io ou %s). diff --git a/translations/scala_ga.ts b/translations/scala_ga.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_ga.ts +++ b/translations/scala_ga.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_he.ts b/translations/scala_he.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_he.ts +++ b/translations/scala_he.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_hi.ts b/translations/scala_hi.ts index 48e4778c..ee7b9a07 100644 --- a/translations/scala_hi.ts +++ b/translations/scala_hi.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_hr.ts b/translations/scala_hr.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_hr.ts +++ b/translations/scala_hr.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_hu.ts b/translations/scala_hu.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_hu.ts +++ b/translations/scala_hu.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_id.ts b/translations/scala_id.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_id.ts +++ b/translations/scala_id.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_is.ts b/translations/scala_is.ts index cd421dbe..594e5a29 100644 --- a/translations/scala_is.ts +++ b/translations/scala_is.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_it.ts b/translations/scala_it.ts index 32059273..fa7c60ab 100644 --- a/translations/scala_it.ts +++ b/translations/scala_it.ts @@ -1030,8 +1030,8 @@ - Donating %s %s to The scala Project (donate.getscala.org or %s). - Donare %s %s a The scala Project (donate.getscala.org o %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). + Donare %s %s a The scala Project (donate.scalaproject.io o %s). @@ -1618,8 +1618,8 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). - Dona <amount> al team di sviluppo (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). + Dona <amount> al team di sviluppo (donate.scalaproject.io). diff --git a/translations/scala_ja.ts b/translations/scala_ja.ts index 887f849a..23f2b622 100644 --- a/translations/scala_ja.ts +++ b/translations/scala_ja.ts @@ -1673,7 +1673,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -2411,7 +2411,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_kmr.ts b/translations/scala_kmr.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_kmr.ts +++ b/translations/scala_kmr.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_ko.ts b/translations/scala_ko.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_ko.ts +++ b/translations/scala_ko.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_lt.ts b/translations/scala_lt.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_lt.ts +++ b/translations/scala_lt.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_nb_NO.ts b/translations/scala_nb_NO.ts index 3c7676d5..6d206fe3 100644 --- a/translations/scala_nb_NO.ts +++ b/translations/scala_nb_NO.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_ne.ts b/translations/scala_ne.ts index 792ea3dc..1f56b58c 100644 --- a/translations/scala_ne.ts +++ b/translations/scala_ne.ts @@ -1628,7 +1628,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4521,7 +4521,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_nl.ts b/translations/scala_nl.ts index 61586531..038fc94b 100644 --- a/translations/scala_nl.ts +++ b/translations/scala_nl.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_pl.ts b/translations/scala_pl.ts index 31c844ac..f500f061 100644 --- a/translations/scala_pl.ts +++ b/translations/scala_pl.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_prt.ts b/translations/scala_prt.ts index 3dd8ff3d..1744fedc 100644 --- a/translations/scala_prt.ts +++ b/translations/scala_prt.ts @@ -1628,7 +1628,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4521,7 +4521,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_pt-br.ts b/translations/scala_pt-br.ts index 67f52cb8..e13e6409 100644 --- a/translations/scala_pt-br.ts +++ b/translations/scala_pt-br.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_pt-pt.ts b/translations/scala_pt-pt.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_pt-pt.ts +++ b/translations/scala_pt-pt.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_ro.ts b/translations/scala_ro.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_ro.ts +++ b/translations/scala_ro.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_ru.ts b/translations/scala_ru.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_ru.ts +++ b/translations/scala_ru.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_sk.ts b/translations/scala_sk.ts index 1b9d6ffc..281b21cf 100644 --- a/translations/scala_sk.ts +++ b/translations/scala_sk.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_sl.ts b/translations/scala_sl.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_sl.ts +++ b/translations/scala_sl.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_sr.ts b/translations/scala_sr.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_sr.ts +++ b/translations/scala_sr.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_sv.ts b/translations/scala_sv.ts index 90a957c3..9580b043 100644 --- a/translations/scala_sv.ts +++ b/translations/scala_sv.ts @@ -1679,8 +1679,8 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). - Donera <belopp> till utvecklingsteamet (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). + Donera <belopp> till utvecklingsteamet (donate.scalaproject.io). @@ -2430,7 +2430,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_tr.ts b/translations/scala_tr.ts index 338910aa..502a2e26 100644 --- a/translations/scala_tr.ts +++ b/translations/scala_tr.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_uk.ts b/translations/scala_uk.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_uk.ts +++ b/translations/scala_uk.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_ur.ts b/translations/scala_ur.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_ur.ts +++ b/translations/scala_ur.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_zh-cn.ts b/translations/scala_zh-cn.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_zh-cn.ts +++ b/translations/scala_zh-cn.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_zh-tw.ts b/translations/scala_zh-tw.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_zh-tw.ts +++ b/translations/scala_zh-tw.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_zu.ts b/translations/scala_zu.ts index 012ace05..26c92da0 100644 --- a/translations/scala_zu.ts +++ b/translations/scala_zu.ts @@ -1628,7 +1628,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4521,7 +4521,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s). diff --git a/translations/scala_zu.ts.ts b/translations/scala_zu.ts.ts index f1e18fba..d836c9ee 100644 --- a/translations/scala_zu.ts.ts +++ b/translations/scala_zu.ts.ts @@ -1634,7 +1634,7 @@ Amount, Spent("T"|"F"), "frozen"|"locked" - Donate <amount> to the development team (donate.getscala.org). + Donate <amount> to the development team (donate.scalaproject.io). @@ -4506,7 +4506,7 @@ This transaction (including %s change) will unlock on block %llu, in approximate - Donating %s %s to The scala Project (donate.getscala.org or %s). + Donating %s %s to The scala Project (donate.scalaproject.io or %s).