[trivial] Misc cleanup and translations #6870

pull MarcoFalke wants to merge 4 commits into bitcoin:master from MarcoFalke:MarcoFalke-2015-trivial3 changing 5 files +18 −19

MarcoFalke commented at 5:07 PM on October 22, 2015: member

Also, some Init(Error|Warning)s are no longer translated. This might be controversial and I will address feedback accordingly.
[trivial] Rewrite help text for feature enabled by default
c.f #6748
95f4291185

in src/init.cpp:None in 9dc8671490 outdated

 689 | @@ -690,13 +690,13 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 690 |  #endif
 691 |  
 692 |      if (!SetupNetworking())
 693 | -        return InitError("Error: Initializing networking failed");
 694 | +        return InitError("Initializing networking failed");

btcdrak commented at 5:37 PM on October 22, 2015:

I'm not sure I agree removing the error prefix is a good idea.

MarcoFalke commented at 5:45 PM on October 22, 2015:

Otherwise it's an Error: Error: overkill...

After this commit you get:

$ src/bitcoind -regtest 
Error: Initializing networking failed

screenshot from 2015-10-22 19-42-54

btcdrak commented at 6:56 PM on October 22, 2015:

Understood. Looks fine.

sandakersmann commented at 6:32 PM on October 22, 2015: contributor

Can you also change the phrase "The Bitcoin Core Developers" to "The Bitcoin Core developers" in init.cpp, so we have consistent use of the phrase with the lower case letter in the code? See line 497 :)
fanquake commented at 11:45 PM on October 22, 2015: member

Not sure we need another commit to config.guess to pull in a typo change? It'll get pulled in when we update it again in a few months time. However if it is going to be merged, please fix the commit message, as there are no changes to config.sub
dcousens commented at 12:24 AM on October 23, 2015: contributor

ACK
jmcorgan commented at 4:37 AM on October 23, 2015: contributor

The config.guess file is from an external source and will get overwritten the next time @theuni pulls a new one.
[trivial] rpcnet: fix typo bf681918d7

[trivial] Latest config.guess

upstream commit 1e80063123b47b97d25dfeded8dd92a19dafab66

6782f58368

MarcoFalke force-pushed on Oct 23, 2015

in src/init.cpp:None in 684ce60f11 outdated

 845 | @@ -846,7 +846,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 846 |      int64_t nMempoolSizeLimit = GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
 847 |      int64_t nMempoolDescendantSizeLimit = GetArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT) * 1000;
 848 |      if (nMempoolSizeLimit < 0 || nMempoolSizeLimit < nMempoolDescendantSizeLimit * 40)
 849 | -        return InitError(strprintf(_("Error: -maxmempool must be at least %d MB"), GetArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT) / 25));
 850 | +        return InitError(strprintf("-maxmempool must be at least %d MB", GetArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT) / 25));

laanwj commented at 7:26 AM on October 26, 2015:

I think errors relating directly to user options should be kept translated. The point of https://github.com/bitcoin/bitcoin/blob/master/doc/translation_strings_policy.md#do-not-translate-internal-errors is to not translate overly technical internal errors, but errors caused directly by invalid input are not those.

MarcoFalke commented at 10:22 PM on October 28, 2015:

@laanwj Fixed

MarcoFalke force-pushed on Oct 28, 2015
Init: Cleanup error and warning strings
Also update doc/translation_strings_policy.md
040c0ea093
MarcoFalke force-pushed on Oct 28, 2015
laanwj merged this on Oct 29, 2015
laanwj closed this on Oct 29, 2015
laanwj referenced this in commit b2ce2c1f0f on Oct 29, 2015
MarcoFalke deleted the branch on Oct 29, 2015
luke-jr referenced this in commit cb312dcd76 on Nov 18, 2015
luke-jr referenced this in commit e8d9550f54 on Dec 8, 2015
MarcoFalke locked this on Sep 8, 2021

Contributors