New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[qt] Fix misleading translation #7218

Merged
merged 2 commits into from Dec 22, 2015

Conversation

Projects
None yet
4 participants
@MarcoFalke
Member

MarcoFalke commented Dec 16, 2015

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.

@jonasschnelli jonasschnelli added the GUI label Dec 16, 2015

@@ -1153,7 +1153,7 @@
</message>
<message>
<location line="+1"/>
<source>Reset all settings changes made over the GUI</source>

This comment has been minimized.

@jonasschnelli

jonasschnelli Dec 16, 2015

Member

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

@jonasschnelli

jonasschnelli Dec 16, 2015

Member

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

This comment has been minimized.

@paveljanik

paveljanik Dec 16, 2015

Contributor

What about

Reset all settings changed in the GUI

@paveljanik

paveljanik Dec 16, 2015

Contributor

What about

Reset all settings changed in the GUI

This comment has been minimized.

@jonasschnelli

jonasschnelli Dec 16, 2015

Member

Reset all settings changed in the GUI

Yes. This would be better IMO.

@jonasschnelli

jonasschnelli Dec 16, 2015

Member

Reset all settings changed in the GUI

Yes. This would be better IMO.

This comment has been minimized.

@MarcoFalke

MarcoFalke Dec 16, 2015

Member

Force pushed.

@MarcoFalke

MarcoFalke Dec 16, 2015

Member

Force pushed.

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Dec 16, 2015

Member

ACK fa5769e (no backport because of transiflex).

Member

jonasschnelli commented Dec 16, 2015

ACK fa5769e (no backport because of transiflex).

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Dec 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?

Member

MarcoFalke commented Dec 16, 2015

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

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Dec 16, 2015

Member

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/).

Member

jonasschnelli commented Dec 16, 2015

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

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Dec 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.

Member

laanwj commented Dec 17, 2015

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

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

This comment has been minimized.

@laanwj

laanwj Dec 17, 2015

Member

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

@laanwj

laanwj Dec 17, 2015

Member

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

This comment has been minimized.

@MarcoFalke
@MarcoFalke

This comment has been minimized.

@laanwj

laanwj Dec 17, 2015

Member

Oh I thought he fixed that...

@laanwj

laanwj Dec 17, 2015

Member

Oh I thought he fixed that...

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Dec 18, 2015

Member

Ok then, let's not do a backport.

Member

MarcoFalke commented Dec 18, 2015

Ok then, let's not do a backport.

@jonasschnelli jonasschnelli merged commit fa5769e into bitcoin:master Dec 22, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

jonasschnelli added a commit that referenced this pull request Dec 22, 2015

Merge pull request #7218
fa5769e [qt] Fix misleading translation (MarcoFalke)
fa8c8d7 torcontrol debug: Change to a blanket message that covers both cases (MarcoFalke)

@MarcoFalke MarcoFalke deleted the MarcoFalke:MarcoFalke-2015-trivial7 branch Dec 22, 2015

codablock added a commit to codablock/dash that referenced this pull request Sep 5, 2017

Merge pull request #7218
fa5769e [qt] Fix misleading translation (MarcoFalke)
fa8c8d7 torcontrol debug: Change to a blanket message that covers both cases (MarcoFalke)

UdjinM6 added a commit to dashpay/dash that referenced this pull request Sep 7, 2017

Backport Bitcoin Qt/Gui changes up to 0.14.x part 1 (#1614)
* Merge pull request #7154

a3c3ddb [Qt] add InMempool() info to transaction details (Jonas Schnelli)

* Merge pull request #7218

fa5769e [qt] Fix misleading translation (MarcoFalke)
fa8c8d7 torcontrol debug: Change to a blanket message that covers both cases (MarcoFalke)

* Merge pull request #7255

6fd0a07 Remove hardcoded fee from CoinControl ToolTip (fanquake)
5fdf32d Replace some instances of formatWithUnit with formatHtmlWithUnit (fanquake)

* Merge pull request #7263

a5a0831 Double semicolon cleanup. (21E14)

* Merge pull request #7334

fa989fb [qt] coincontrol workaround is still needed in qt5.4 (fixed in qt5.5) (MarcoFalke)

* Merge pull request #7329

9d263bd Typo fixes in comments (Chris Wheeler)

* Merge #7396: [Qt] Add option to increase/decrease font size in the console window

43abb02 [Qt] Add a new chevron/arrow icon for the console prompt line (Jonas Schnelli)
56c9e66 [Qt] keep scroll position in GUI console after changing font size (Jonas Schnelli)
3a3a927 [Qt] Add option to increase/decrease font size in the console window (Jonas Schnelli)

* Merge #7628: QT: Add 'copy full transaction details' option

b51ed40 QT: Add 'copy full transaction details' option (Eric Shaw)

* Merge #7668: Fix history deletion bug after font size change

21e45a0 Fix history deletion bug after font change (Andrew C)

* Copy/Move font size related icons into theme folders

* Use formatTxDate for date/time in TxPlainTextRole
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment