Skip to content

[trivial] Misc cleanup and translations#6870

Merged
laanwj merged 4 commits intobitcoin:masterfrom
maflcko:MarcoFalke-2015-trivial3
Oct 29, 2015
Merged

[trivial] Misc cleanup and translations#6870
laanwj merged 4 commits intobitcoin:masterfrom
maflcko:MarcoFalke-2015-trivial3

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Oct 22, 2015

Also, some Init(Error|Warning)s are no longer translated. This might be controversial and I will address feedback accordingly.

btcdrak
btcdrak reviewed Oct 22, 2015
View reviewed changes
src/init.cpp
Copy link
Contributor

@btcdrak btcdrak Oct 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member Author

@maflcko maflcko Oct 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

After this commit you get:

$ src/bitcoind -regtest 
Error: Initializing networking failed

or

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

Copy link
Contributor

@btcdrak btcdrak Oct 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Understood. Looks fine.

@sandakersmann
Copy link
Contributor

sandakersmann commented Oct 22, 2015

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
Copy link
Member

fanquake commented Oct 22, 2015

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
Copy link
Contributor

dcousens commented Oct 23, 2015

ACK

@jmcorgan
Copy link
Contributor

jmcorgan commented Oct 23, 2015

The config.guess file is from an external source and will get overwritten the next time @theuni pulls a new one.

MarcoFalke added 2 commits October 23, 2015 08:35
[trivial] rpcnet: fix typo
bf68191
[trivial] Latest config.guess
6782f58 
upstream commit 1e80063123b47b97d25dfeded8dd92a19dafab66
@maflcko maflcko force-pushed the MarcoFalke-2015-trivial3 branch from 9dc8671 to 684ce60 Compare October 23, 2015 06:35
laanwj
laanwj reviewed Oct 26, 2015
View reviewed changes
src/init.cpp Outdated
Copy link
Member

@laanwj laanwj Oct 26, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Member Author

@maflcko maflcko Oct 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@laanwj Fixed

@maflcko maflcko force-pushed the MarcoFalke-2015-trivial3 branch from 684ce60 to c824b12 Compare October 28, 2015 21:00
Init: Cleanup error and warning strings
040c0ea 
Also update doc/translation_strings_policy.md
@maflcko maflcko force-pushed the MarcoFalke-2015-trivial3 branch from c824b12 to 040c0ea Compare October 28, 2015 21:17
@laanwj laanwj merged commit 040c0ea into bitcoin:master Oct 29, 2015
laanwj added a commit that referenced this pull request Oct 29, 2015
@laanwj
Merge pull request #6870
b2ce2c1 
040c0ea Init: Cleanup error and warning strings (MarcoFalke)
6782f58 [trivial] Latest config.guess (MarcoFalke)
bf68191 [trivial] rpcnet: fix typo (MarcoFalke)
95f4291 [trivial] Rewrite help text for feature enabled by default (MarcoFalke)
@maflcko maflcko deleted the MarcoFalke-2015-trivial3 branch October 29, 2015 15:46
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Nov 18, 2015
@luke-jr
[trivial] rpcnet: fix typo
cb312dc 
Github-Pull: bitcoin#6870
Rebased-From: bf68191
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Dec 8, 2015
@luke-jr
[trivial] rpcnet: fix typo
e8d9550 
Github-Pull: bitcoin#6870
Rebased-From: bf68191
@str4d str4d mentioned this pull request May 19, 2017
Open
@hebasto hebasto mentioned this pull request Feb 3, 2019
Closed
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@maflcko @sandakersmann @fanquake @dcousens @jmcorgan @laanwj @btcdrak