Skip to content

[qt] Fix misleading translation #7218

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.

Sign up for GitHub

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

Jump to bottom
Merged
jonasschnelli merged 2 commits into from
Dec 22, 2015
Merged

[qt] Fix misleading translation #7218

jonasschnelli merged 2 commits into from
Dec 22, 2015

Conversation

@maflcko
Copy link
Member

@maflcko maflcko 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 reviewed Dec 16, 2015
View reviewed changes
src/qt/locale/bitcoin_en.ts
Copy link
Contributor

@jonasschnelli jonasschnelli Dec 16, 2015

Choose a reason for hiding this comment

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

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

Copy link
Contributor

@paveljanik paveljanik Dec 16, 2015

Choose a reason for hiding this comment

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

What about

Reset all settings changed in the GUI

Copy link
Contributor

@jonasschnelli jonasschnelli Dec 16, 2015

Choose a reason for hiding this comment

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

Reset all settings changed in the GUI

Yes. This would be better IMO.

Copy link
Member Author

@maflcko maflcko Dec 16, 2015

Choose a reason for hiding this comment

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

Force pushed.

@maflcko maflcko force-pushed the MarcoFalke-2015-trivial7 branch from fac178d to fa5769e Compare December 16, 2015 14:45
@jonasschnelli
Copy link
Contributor

jonasschnelli commented Dec 16, 2015

ACK fa5769e (no backport because of transiflex).

@maflcko
Copy link
Member Author

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

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

laanwj
laanwj reviewed Dec 17, 2015
View reviewed changes
src/torcontrol.cpp
Copy link
Member

@laanwj laanwj Dec 17, 2015

Choose a reason for hiding this comment

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

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

Copy link
Member Author

@maflcko maflcko Dec 17, 2015

Choose a reason for hiding this comment

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

#7035 (comment)

Copy link
Member

@laanwj laanwj Dec 17, 2015

Choose a reason for hiding this comment

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

Oh I thought he fixed that...

@maflcko
Copy link
Member Author

maflcko commented Dec 18, 2015

Ok then, let's not do a backport.

@jonasschnelli jonasschnelli merged commit fa5769e into bitcoin:master Dec 22, 2015
jonasschnelli added a commit that referenced this pull request Dec 22, 2015
@jonasschnelli
Merge pull request #7218
a1c185b 
fa5769e [qt] Fix misleading translation (MarcoFalke)
fa8c8d7 torcontrol debug: Change to a blanket message that covers both cases (MarcoFalke)
@maflcko maflcko deleted the MarcoFalke-2015-trivial7 branch December 22, 2015 13:07
@str4d str4d mentioned this pull request Mar 24, 2017
Merged
zkbot added a commit to zcash/zcash that referenced this pull request Mar 26, 2017
@zkbot
Auto merge of #2177 - str4d:2061-tor-ephemeral-hs, r=daira
45faa92 
Tor ephemeral hidden services

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6503 (included to reduce merge conflicts)
- bitcoin/bitcoin#6639
- bitcoin/bitcoin#6643
- bitcoin/bitcoin#7090
- bitcoin/bitcoin#7035
- bitcoin/bitcoin#7170
- bitcoin/bitcoin#7218 (non-QT part)
- bitcoin/bitcoin#7313
- bitcoin/bitcoin#7438
- bitcoin/bitcoin#7553
- bitcoin/bitcoin#7637
- bitcoin/bitcoin#7683
- bitcoin/bitcoin#7813
- bitcoin/bitcoin#7703
- bitcoin/bitcoin#8203
- bitcoin/bitcoin#9004
- bitcoin/bitcoin#9234
- bitcoin/bitcoin#9911 (partial)

Closes #2061.
codablock pushed a commit to codablock/dash that referenced this pull request Sep 5, 2017
@jonasschnelli @codablock
Merge pull request bitcoin#7218
2a4beff 
fa5769e [qt] Fix misleading translation (MarcoFalke)
fa8c8d7 torcontrol debug: Change to a blanket message that covers both cases (MarcoFalke)
UdjinM6 pushed a commit to dashpay/dash that referenced this pull request Sep 7, 2017
@codablock @UdjinM6
Backport Bitcoin Qt/Gui changes up to 0.14.x part 1 (#1614)
690cb58 
* Merge pull request bitcoin#7154

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

* Merge pull request bitcoin#7218

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

* Merge pull request bitcoin#7255

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

* Merge pull request bitcoin#7263

a5a0831 Double semicolon cleanup. (21E14)

* Merge pull request bitcoin#7334

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

* Merge pull request bitcoin#7329

9d263bd Typo fixes in comments (Chris Wheeler)

* Merge bitcoin#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 bitcoin#7628: QT: Add 'copy full transaction details' option

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

* Merge bitcoin#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
@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

GUI

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@maflcko @jonasschnelli @laanwj @paveljanik