full version filenames#220
Closed
einalex wants to merge 1 commit intosyscoin:masterfrom
einalex:consistent-filenames
Closed
full version filenames#220einalex wants to merge 1 commit intosyscoin:masterfrom einalex:consistent-filenames
einalex wants to merge 1 commit intosyscoin:masterfrom
einalex:consistent-filenames
Conversation
|
utACK |
Member
|
@einalex we generally merge from dev-3.x but I will approve this one |
sidhujag
approved these changes
Jun 21, 2018
|
@sidhujag dev-3.x was in the state prior to your merge into master for 3.0.5 that's why I created it against master. Can you in the future also merge master into dev-3.x after each version release? |
Member
|
Dev-3.x is always up-to-date with master after a release, we generally merge to dev-3.x first then to master. I think we should rebase this to dev-3.x so it remains in sync with master. |
Member
|
Please rebase with dev-3.x |
|
We can cherry-pick this in -
git remote add einalex https://github.com/einalex/syscoin.git
git fetch einalex
git cherry-pick a862b7d
…On Thu, Jun 21, 2018 at 10:15 AM, sidhujag ***@***.***> wrote:
Please rebase with dev-3.x
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#220 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAi4UDrV18XzVBIU03EtFEQEiH43B6HCks5t-9S1gaJpZM4Uqp0z>
.
|
Member
|
pulled in with 05a6ec5 |
sidhujag
pushed a commit
that referenced
this pull request
Mar 16, 2021
88df300 qt: Do not translate file extensions (Hennadii Stepanov) Pull request description: File extensions are untranslatable by their nature. ACKs for top commit: laanwj: Concept and code review ACK 88df300 Talkless: tACK 88df300, tested on Debian Sid with Qt 5.15.2. Tested all filters except for .psbt. jarolrod: re-ACK 88df300 Tree-SHA512: 104d383543edcee8fb825f98d3b6669a7aaae2c74b6602f9bc407bf1c88be121ec535f2f9be87afa6ca775dc79865165f620553f6f6ab1d31a3f9ea93f7f9593
sidhujag
pushed a commit
that referenced
this pull request
May 27, 2021
…lator comments 8b77133 qt: Replace disambiguation strings with translator comments (Hennadii Stepanov) Pull request description: Since bitcoin#21694 is merged, translator comments is the right way to pass context to translators. This PR fixes changes were made: - in #220 before bitcoin#21694 - in bitcoin#21694 on testing purpose - in #125 Closes #288. ACKs for top commit: jarolrod: ACK 8b77133 Tree-SHA512: 466ade35f4969a41fbf3196780b1ae9fa810bab5d2f09077f8631604636cc63b24a901c719f6b5797366d2aa307993d0aa419ce35200c8d0a741a3d81cad3e6b
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request makes three little changes that give us X.X.X.X style version numbers across the project including in generated files.
This allows us to unmistakeably identify files and programs.
This also makes it easier to automatically handle bundled binaries.