Skip to content
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

Backport string changes after string freeze #5973

Closed
Pentarctagon opened this issue Jul 21, 2021 · 52 comments
Closed

Backport string changes after string freeze #5973

Pentarctagon opened this issue Jul 21, 2021 · 52 comments
Assignees
@Pentarctagon @kabachuha
Labels
Backport A reminder of a bugfix that was added to master that needs to be duplicated on the stable branch. Translations Issues with translations, translation tooling, the translations engine, or code that uses it.

Comments

@Pentarctagon
Copy link
Member

Backport 1541a31 to 1.16.1.
@Pentarctagon Pentarctagon added the Backport A reminder of a bugfix that was added to master that needs to be duplicated on the stable branch. label Jul 21, 2021
@Pentarctagon Pentarctagon self-assigned this Jul 21, 2021
@stevecotton
Copy link
Contributor

stevecotton commented Jul 24, 2021 •
edited
Loading

Backport #5979 (Already merged in master, 18a2345 .)

@stevecotton
Copy link
Contributor

stevecotton commented Jul 25, 2021 •
edited
Loading

Backport #5985 (Already merged in master, a0ae4a7 .)

@stevecotton
Copy link
Contributor

stevecotton commented Jul 26, 2021 •
edited by Wedge009
Loading

Backport #5987, if it merges Back-ported

@kabachuha
Copy link
Member

Backport d445cb3 to 1.16.1.

@kabachuha
Copy link
Member

Backport 3de79c1

kabachuha added a commit that referenced this issue Jul 31, 2021
@kabachuha
Fixed boars' attack descriptions being started with capital letters
c098140 
Attack descriptions start with a lowercase letter in mainline Wesnoth. Should be backported to 1.16.1 with #5973 after the string freeze ends.
@kabachuha
Copy link
Member

Backport c098140

@Pentarctagon Pentarctagon added the Translations Issues with translations, translation tooling, the translations engine, or code that uses it. label Aug 12, 2021
@Pentarctagon Pentarctagon changed the title Backport typo fix after string freeze Backport string changes after string freeze Aug 12, 2021
@Pentarctagon
Copy link
Member Author

cbd0d6b

@Pentarctagon
Copy link
Member Author

04bc431

@kabachuha
Copy link
Member

Also backport 536d6a2 as it allows the usage of unit names in the text of HttT without workarounds in some languages.

P.S. if you don't mind I'll pin this issue as it has almost left the first page of issues on my screen and it's important for any string changes that have been intended to be in 1.16 (1.16.1 after the unfreeze).

@kabachuha kabachuha pinned this issue Aug 21, 2021
@Wedge009
Copy link
Member

Wedge009 commented Sep 5, 2021 •
edited
Loading

71ebeb8 Back-ported

@Wedge009
Copy link
Member

Wedge009 commented Sep 5, 2021 •
edited
Loading

Back-port #6060 + #6061. (Already merged in master, 60e52a6 + 5ba9620 .) Back-ported

PS Good idea to pin this task.

@Wedge009
Copy link
Member

Wedge009 commented Sep 7, 2021 •
edited
Loading

#6067 (Already merged in master, 9cd5503 .) Back-ported

This was referenced Sep 9, 2021
Closed
Closed
@Wedge009
Copy link
Member

Wedge009 commented Sep 11, 2021 •
edited
Loading

#6073 Back-ported

@Wedge009
Copy link
Member

Wedge009 commented Sep 15, 2021 •
edited
Loading

#6084 (Already merged in master, 3fcba6a .) Back-ported

@stevecotton
Copy link
Contributor

stevecotton commented Sep 15, 2021 •
edited
Loading

#6085 (Already merged in master, f8a4162 .)

@Wedge009
Copy link
Member

Wedge009 commented Sep 16, 2021 •
edited
Loading

#6091 (Already merged in master, 20fd6d8 .) Back-ported

Note: that SHA1 needs 8 digits to be unique.

@Wedge009
Copy link
Member

Wedge009 commented Sep 17, 2021 •
edited
Loading

#6095 (Already merged in master, 2a1a53f .) Back-ported

@Wedge009
Copy link
Member

Wedge009 commented Sep 17, 2021 •
edited
Loading

#6101 (Already merged in master, b5fa99c.) Back-ported

@Wedge009
Copy link
Member

Wedge009 commented Sep 20, 2021 •
edited
Loading

#6108 (Already merged in master, 1b48ace .) Back-ported

@Wedge009
Copy link
Member

Wedge009 commented Sep 23, 2021 •
edited
Loading

da3eac4 Back-ported

@Wedge009
Copy link
Member

Wedge009 commented Sep 28, 2021 •
edited
Loading

#6129 #6136 (Already merged in master.)

@Wedge009
Copy link
Member

Wedge009 commented Oct 4, 2021 •
edited
Loading

#6143 (Already merged in master.)

@Wedge009
Copy link
Member

Wedge009 commented Oct 6, 2021 •
edited
Loading

#6170 (Already merged in master.) Back-ported

@nemaara
Copy link
Contributor

nemaara commented Oct 7, 2021 •
edited by Wedge009
Loading

#6168 (Already merged in master.)

@max-torch
Copy link
Contributor

max-torch commented Oct 8, 2021 •
edited
Loading

#6177 currently appending approval from reviewers.

@Wedge009
Copy link
Member

Wedge009 commented Oct 8, 2021 •
edited
Loading

#6178 (Already merged in master.)

@Wedge009
Copy link
Member

Wedge009 commented Oct 8, 2021

#6179

Wedge009 added a commit that referenced this issue Oct 9, 2021
@Wedge009
Remove changes not actually in 1.16 branch just yet.
374104d 
Those changes are in master but not in 1.16 due to the string freeze (pending #5973).
Unfortunately these changes are already published in places like Steam...

[ci skip]
@nemaara
Copy link
Contributor

nemaara commented Oct 11, 2021

#6117 (already merged)

@max-torch
Copy link
Contributor

#6182

@Wedge009
Copy link
Member

Wedge009 commented Oct 18, 2021 •
edited
Loading

96756a7 Back-ported

@Wedge009
Copy link
Member

Wedge009 commented Oct 22, 2021 •
edited
Loading

3ff8afa Back-ported

@stevecotton
Copy link
Contributor

stevecotton commented Oct 24, 2021 •
edited
Loading

#6224 (which is just po hints, no string changes, d1bd599 + 77cb1de )

@Wedge009
Copy link
Member

Wedge009 commented Oct 29, 2021 •
edited
Loading

#6189 Back-ported

@Wedge009 Wedge009 mentioned this issue Oct 29, 2021
Closed
@Wedge009
Copy link
Member

Wedge009 commented Nov 1, 2021 •
edited
Loading

#6248 (merged in master but will need editing for 1.16) Back-ported

@nemaara
Copy link
Contributor

nemaara commented Nov 3, 2021

#6208 (already merged)

@nemaara
Copy link
Contributor

nemaara commented Nov 3, 2021

#6192 (already merged)

@nemaara
Copy link
Contributor

nemaara commented Nov 3, 2021

#6207 (already merged)

@nemaara
Copy link
Contributor

nemaara commented Nov 3, 2021

#6200 (already merged)

@Wedge009
Copy link
Member

Wedge009 commented Nov 10, 2021 •
edited by Pentarctagon
Loading

I think I've back-ported all my own commits. Some of you may already be taking care of yours as well as I write this. Can you advise if you're not able to do so? I or someone else can back-port them in your stead.

@Pentarctagon

@stevecotton

@kabachuha

These are PRs by contributors who don't have push access (or at least I don't think they do). I'll back-port these soon.

@Pentarctagon
Copy link
Member Author

I will be able to do mine.

@stevecotton
Copy link
Contributor

Did mine.

@kabachuha
Copy link
Member

I'll do mine today.

@kabachuha kabachuha self-assigned this Nov 10, 2021
@kabachuha
Copy link
Member

Backported my part in f99f5fa, 33344f7, 2ee66b1 and 565ba53.

@Wedge009
Copy link
Member

Thanks, everyone. Out of the ones recorded here, looks like just Pent's to go. There are few outstanding PRs listed here as well but they haven't been merged so I suppose we'll back-port those as suitable.

@Pentarctagon
Copy link
Member Author

Mine are completed.

@Wedge009
Copy link
Member

Hooray!

@Wedge009 Wedge009 unpinned this issue Nov 10, 2021
@Wedge009 Wedge009 mentioned this issue Feb 21, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@Pentarctagon Pentarctagon

@kabachuha kabachuha

Labels
Backport A reminder of a bugfix that was added to master that needs to be duplicated on the stable branch. Translations Issues with translations, translation tooling, the translations engine, or code that uses it.
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
6 participants
@stevecotton @Pentarctagon @nemaara @Wedge009 @kabachuha @max-torch