[qt] Fix misleading translation #7218

pull MarcoFalke wants to merge 2 commits into bitcoin:master from MarcoFalke:MarcoFalke-2015-trivial7 changing 3 files +3 −3

MarcoFalke commented at 12:06 PM on December 16, 2015: member

The first commit fixes #7035 (comment)

The second commit was on my list to fix before 0.12 but I somehow forgot it. People complain about this at transifex.
torcontrol debug: Change to a blanket message that covers both cases fa8c8d7fa6
jonasschnelli added the label GUI on Dec 16, 2015
[qt] Fix misleading translation fa5769e95a
in src/qt/locale/bitcoin_en.ts:None in fac178d1f8 outdated
```
1152 | @@ -1153,7 +1153,7 @@
1153 |      </message>
1154 |      <message>
1155 |          <location line="+1"/>
1156 | -        <source>Reset all settings changes made over the GUI</source>
```
jonasschnelli commented at 12:25 PM on December 16, 2015:

Is the former (current) not more clear what -resetguisettings does?

paveljanik commented at 1:04 PM on December 16, 2015:

What about

Reset all settings changed in the GUI

jonasschnelli commented at 1:05 PM on December 16, 2015:

Reset all settings changed in the GUI

Yes. This would be better IMO.

MarcoFalke commented at 2:46 PM on December 16, 2015:

Force pushed.
MarcoFalke force-pushed on Dec 16, 2015
jonasschnelli commented at 2:54 PM on December 16, 2015: contributor

ACK fa5769e95a44427e1ed7d63795d4ff60985f0059 (no backport because of transiflex).
MarcoFalke commented at 2:58 PM on December 16, 2015: member

no backport

No opinion on this but this could be merged into 0.12 without rebase. Is there a translation update before the final release?
jonasschnelli commented at 3:05 PM on December 16, 2015: contributor

No opinion on this but this could be merged into 0.12 without rebase. Is there a translation update before the final release?

According to @laanwj, string freezing was done in 2015-12-01 (http://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-September/011182.html). People already translated 0.12er strings (https://www.transifex.com/bitcoin/bitcoin/qt-translation-012x/).
laanwj commented at 12:59 PM on December 17, 2015: member

Will pull translation from transifex a few times before the final 0.12 release, but it's too late to change strings.

in src/torcontrol.cpp:None in fa5769e95a

 617 | @@ -618,7 +618,7 @@ void TorController::disconnected_cb(TorControlConnection& conn)
 618 |      if (!reconnect)
 619 |          return;
 620 |  
 621 | -    LogPrint("tor", "tor: Disconnected from Tor control port %s, trying to reconnect\n", target);
 622 | +    LogPrint("tor", "tor: Not connected to Tor control port %s, trying to reconnect\n", target);

laanwj commented at 1:01 PM on December 17, 2015:

I'm confused. Didn't this get in in a previous change?

MarcoFalke commented at 1:03 PM on December 17, 2015:

#7035 (comment)

laanwj commented at 1:27 PM on December 17, 2015:

Oh I thought he fixed that...

MarcoFalke commented at 7:34 AM on December 18, 2015: member

Ok then, let's not do a backport.
jonasschnelli merged this on Dec 22, 2015
jonasschnelli closed this on Dec 22, 2015
jonasschnelli referenced this in commit a1c185be54 on Dec 22, 2015
MarcoFalke deleted the branch on Dec 22, 2015
zkbot referenced this in commit 45faa928ec on Mar 26, 2017
codablock referenced this in commit 2a4beff0a8 on Sep 5, 2017
UdjinM6 referenced this in commit 690cb58f80 on Sep 7, 2017
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#7035 torcontrol: only output disconnect if -debug=tor